AyeCode / invoicing

includes/admin/class-getpaid-admin.php

Indentation +603 added lines, -603 removed lines

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

Spacing +278 added lines, -278 removed lines

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

includes/admin/views/wizard-introduction.php

Spacing +39 added lines, -39 removed lines

@@ -4,78 +4,78 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class="card shadow-sm my-5">
 
     <h1 class="h4 card-header bg-white border-bottom-0 pt-4 pb-1">
-        <?php esc_html_e( 'Welcome to the GetPaid Setup Wizard!', 'invoicing' ); ?>
+        <?php esc_html_e('Welcome to the GetPaid Setup Wizard!', 'invoicing'); ?>
     </h1>
 
     <div class="card-body text-muted ">
-        <p><?php _e( 'Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing' ); ?></p>
+        <p><?php _e('Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing'); ?></p>
         <hr class="mt-4 pt-3 pb-0" />
-        <p class="small"><?php _e( 'This quick setup wizard will help you <b>configure the basic settings</b>. It’s <b>completely optional</b> and shouldn’t take longer than <b>five minutes</b>.', 'invoicing' ); ?></p>
+        <p class="small"><?php _e('This quick setup wizard will help you <b>configure the basic settings</b>. It’s <b>completely optional</b> and shouldn’t take longer than <b>five minutes</b>.', 'invoicing'); ?></p>
     </div>
 
     <div class="card-footer mb-0 bg-white gp-setup-actions step border-top-0">
         <a
-            href="<?php echo esc_url( $next_url ); ?>"
-            class="btn btn-primary button-next"><?php esc_html_e( "Let's go!", 'invoicing' ); ?></a>
+            href="<?php echo esc_url($next_url); ?>"
+            class="btn btn-primary button-next"><?php esc_html_e("Let's go!", 'invoicing'); ?></a>
         <a
-            href="<?php echo esc_url( admin_url() ); ?>"
-            class="btn btn-link d-block mt-2 "><?php esc_html_e( 'Not right now', 'invoicing' ); ?></a>
+            href="<?php echo esc_url(admin_url()); ?>"
+            class="btn btn-link d-block mt-2 "><?php esc_html_e('Not right now', 'invoicing'); ?></a>
     </div>
 </div>
 
 <div class="card shadow-sm my-5 overflow-hidden">
     <h1 class="h4 card-header bg-white border-bottom-0  pt-4 pb-1">
-        <?php esc_html_e( 'GetPaid Features & Addons!', 'invoicing' ); ?>
+        <?php esc_html_e('GetPaid Features & Addons!', 'invoicing'); ?>
     </h1>
 
     <div class="card-body text-muted overflow-hidden">
-		<p><?php _e( 'Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing' ); ?></p>
+		<p><?php _e('Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing'); ?></p>
 		<hr>
 
 		<div class="row row-cols-2 text-left">
 			<div class="col mt-3">
 				<div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/buy.svg' );?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/buy.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php _e( 'GetPaid via Buy Now Buttons', 'invoicing' );?></h6>
-                        <small><?php _e( 'Sell via buy now buttons anywhere on your site', 'invoicing' );?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Buy Now Buttons', 'invoicing'); ?></h6>
+                        <small><?php _e('Sell via buy now buttons anywhere on your site', 'invoicing'); ?></small>
                     </div>
                 </div>
 			</div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/report.svg' );?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/report.svg'); ?>" class="mr-3" alt="...">
                         <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php _e( 'GetPaid via payment form', 'invoicing' );?></h6>
-                        <small><?php _e( 'Payment forms are conversion-optimized checkout forms', 'invoicing' );?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via payment form', 'invoicing'); ?></h6>
+                        <small><?php _e('Payment forms are conversion-optimized checkout forms', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/invoices.svg' );?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/invoices.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Invoice','invoicing');?></h6>
-                        <small><?php _e('Create and send invoices for just about anything from the WordPress dashboard','invoicing');?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Invoice', 'invoicing'); ?></h6>
+                        <small><?php _e('Create and send invoices for just about anything from the WordPress dashboard', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/payment.svg' );?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/payment.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php _e('Affordable payment gateways','invoicing');?></h6>
-                        <small><?php _e('On average our gateways are over 66% cheaper than our competition','invoicing');?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php _e('Affordable payment gateways', 'invoicing'); ?></h6>
+                        <small><?php _e('On average our gateways are over 66% cheaper than our competition', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
@@ -86,51 +86,51 @@ 
 	<div class="mt-5">
 		<a
             href="https://wpgetpaid.com/features-list/"
-			class="btn btn-primary"><?php esc_html_e( 'View All Features!', 'invoicing' ); ?></a>
+			class="btn btn-primary"><?php esc_html_e('View All Features!', 'invoicing'); ?></a>
 	</div>
 
 	<div class="mt-5 mx-n4 py-4" style="background:#eafaf6;">
-		<h4 class="mt-0 font-weight-bold text-dark mb-4"><?php _e( 'More with Membership!' , 'invoicing' );?></h4>
+		<h4 class="mt-0 font-weight-bold text-dark mb-4"><?php _e('More with Membership!', 'invoicing'); ?></h4>
 		<div class="row row-cols-2 text-left px-5">
 
 			<div class="col">
 				<ul class="list-unstyled">
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'PDF Invoices' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Gravity Forms' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Contact form 7' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'AffiliateWP Integration' , 'invoicing' );?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('PDF Invoices', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Gravity Forms', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Contact form 7', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('AffiliateWP Integration', 'invoicing'); ?></li>
 				</ul>
 			</div>
 
 			<div class="col">
 				<ul class="list-unstyled">
-			    	<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Ninja forms' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Digital Downloads' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Wallet' , 'invoicing' );?></li>
+			    	<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Ninja forms', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Digital Downloads', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Wallet', 'invoicing'); ?></li>
 				</ul>
 			</div>
 		</div>
 
-		<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php _e('Membership Starts From','invoicing');?></h5>
-		<h1 class="mt-0 font-weight-bold text-dark mb-4 display-3"><?php esc_html_e( '$49', 'invoicing' ); ?></h1>
+		<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php _e('Membership Starts From', 'invoicing'); ?></h5>
+		<h1 class="mt-0 font-weight-bold text-dark mb-4 display-3"><?php esc_html_e('$49', 'invoicing'); ?></h1>
 
 		<div class="mt-2">
 			<a
                 href="https://wpgetpaid.com/downloads/membership/"
-				class="btn btn-primary"><?php esc_html_e( 'Buy Membership Now!', 'invoicing' ); ?></a>
+				class="btn btn-primary"><?php esc_html_e('Buy Membership Now!', 'invoicing'); ?></a>
 		</div>
 
 	</div>
 
     <div class="card-footer mb-0 bg-white gp-setup-actions step border-top-0">
         <a
-            href="<?php echo esc_url( $next_url ); ?>"
-            class="btn btn-outline-primary button-next"><?php esc_html_e( 'Launch the Setup Wizard!', 'invoicing' ); ?></a>
+            href="<?php echo esc_url($next_url); ?>"
+            class="btn btn-outline-primary button-next"><?php esc_html_e('Launch the Setup Wizard!', 'invoicing'); ?></a>
         <a
             href="https://docs.wpgetpaid.com/"
-            class="btn btn-outline-primary ml-4"><?php esc_html_e( 'Documentation', 'invoicing' ); ?></a>
+            class="btn btn-outline-primary ml-4"><?php esc_html_e('Documentation', 'invoicing'); ?></a>
         <a
-            href="<?php echo esc_url( admin_url() ); ?>"
-            class="btn btn-link d-block mt-2 "><?php esc_html_e( 'Not right now', 'invoicing' ); ?></a>
+            href="<?php echo esc_url(admin_url()); ?>"
+            class="btn btn-link d-block mt-2 "><?php esc_html_e('Not right now', 'invoicing'); ?></a>
     </div>
 </div>

includes/admin/views/html-tax-rates-edit.php

Spacing +20 added lines, -20 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $tax_rates  = GetPaid_Tax::get_all_tax_rates();
 $dummy_rate = array(
@@ -13,11 +13,11 @@ 
     'global'       => true,
     'rate'         => wpinv_get_default_tax_rate(),
     'reduced_rate' => 5,
-    'name'         => __( 'VAT', 'invoicing' ),
+    'name'         => __('VAT', 'invoicing'),
 );
 
 $reset_url = wp_nonce_url(
-    add_query_arg( 'getpaid-admin-action', 'reset_tax_rates' ),
+    add_query_arg('getpaid-admin-action', 'reset_tax_rates'),
     'getpaid-nonce',
     'getpaid-nonce'
 );
@@ -25,34 +25,34 @@ 
 ?>
 <div class="table-responsive">
     <table id="wpinv_tax_rates" class="widefat fixed table">
-        <caption><?php echo esc_html_e( 'Enter tax rates for specific regions.', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('Enter tax rates for specific regions.', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'Country', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'Optionally limit this tax rate to a specific country.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('Country', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('Optionally limit this tax rate to a specific country.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'State', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'Separate state codes using a comma or leave blank to apply country wide.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('State', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('Separate state codes using a comma or leave blank to apply country wide.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'Standard Rate %', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The tax rate (percentage) to charge on items that use the "Standard rate" tax class.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('Standard Rate %', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The tax rate (percentage) to charge on items that use the "Standard rate" tax class.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'Reduced Rate %', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The tax rate (percentage) to charge on items that use the "Reduced rate" tax class.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('Reduced Rate %', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The tax rate (percentage) to charge on items that use the "Reduced rate" tax class.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php _e( 'Tax Name', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The name of this tax, e.g VAT.', 'invoicing' ), 'position-static' ); ?>
+                    <?php _e('Tax Name', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The name of this tax, e.g VAT.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top" style="width:32px">&nbsp;</th>
@@ -61,19 +61,19 @@ 
         </thead>
 
         <tbody>
-            <?php array_walk( $tax_rates, 'wpinv_tax_rate_callback' ); ?>
+            <?php array_walk($tax_rates, 'wpinv_tax_rate_callback'); ?>
         </tbody>
 
         <tfoot>
             <tr class="table-light">
                 <td colspan="6" class="border-top">
 
-                    <button type="button" class="button button-secondary wpinv_add_tax_rate" aria-label="<?php esc_attr_e( 'Add Tax Rate', 'invoicing' ); ?>">
-                        <span><?php _e( 'Add Tax Rate', 'invoicing' ); ?></span>
+                    <button type="button" class="button button-secondary wpinv_add_tax_rate" aria-label="<?php esc_attr_e('Add Tax Rate', 'invoicing'); ?>">
+                        <span><?php _e('Add Tax Rate', 'invoicing'); ?></span>
                     </button>
 
-                    <a href="<?php echo esc_url( $reset_url ); ?>" class="button button-secondary wpinv_reset_tax_rates" aria-label="<?php esc_attr_e( 'Reset Tax Rates', 'invoicing' ); ?>">
-                        <span><?php _e( 'Reset Tax Rates', 'invoicing' ); ?></span>
+                    <a href="<?php echo esc_url($reset_url); ?>" class="button button-secondary wpinv_reset_tax_rates" aria-label="<?php esc_attr_e('Reset Tax Rates', 'invoicing'); ?>">
+                        <span><?php _e('Reset Tax Rates', 'invoicing'); ?></span>
                     </a>
                 </td>
             </tr>
@@ -82,6 +82,6 @@ 
 </div>
 
 <script type="text/html" id="tmpl-wpinv-tax-rate-row">
-    <?php echo wpinv_tax_rate_callback( $dummy_rate, 0, false ); ?>
+    <?php echo wpinv_tax_rate_callback($dummy_rate, 0, false); ?>
 </script>
 

includes/admin/register-settings.php

Indentation +301 added lines, -301 removed lines

@@ -195,13 +195,13 @@ 
     $name       = isset( $option['name'] ) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+    $is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
-		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
-	}
+    if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
+        $tip   = wpinv_clean( $option['desc'] );
+        $name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
+        unset( $option['desc'] );
+    }
 
     // Loop through all tabs.
     add_settings_field(
@@ -228,9 +228,9 @@ 
             'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
             'onchange'    => isset( $option['onchange'] )   ? $option['onchange']     : '',
             'custom'      => isset( $option['custom'] )     ? $option['custom']       : '',
-			'default_content' => isset( $option['default_content'] )     ? $option['default_content']       : '',
-			'class'       => isset( $option['class'] )     ? $option['class']         : '',
-			'style'       => isset( $option['style'] )     ? $option['style']         : '',
+            'default_content' => isset( $option['default_content'] )     ? $option['default_content']       : '',
+            'class'       => isset( $option['class'] )     ? $option['class']         : '',
+            'style'       => isset( $option['style'] )     ? $option['style']         : '',
             'cols'        => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
             'rows'        => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
@@ -244,7 +244,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+    return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
 }
 
 /**
@@ -263,18 +263,18 @@ 
  */
 function wpinv_settings_sanitize( $input = array() ) {
 
-	$wpinv_options = wpinv_get_options();
-	$raw_referrer  = wp_get_raw_referer();
+    $wpinv_options = wpinv_get_options();
+    $raw_referrer  = wp_get_raw_referer();
 
     if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+        return array_merge( $wpinv_options, $input );
     }
 
     wp_parse_str( $raw_referrer, $referrer );
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
-	}
+    if ( in_array( 'gp-setup', $referrer ) ) {
+        return array_merge( $wpinv_options, $input );
+    }
 
     $settings = wpinv_get_registered_settings();
     $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
@@ -296,10 +296,10 @@ 
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
 
-		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+        // Key specific filter.
+        $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
@@ -342,14 +342,14 @@ 
 
     foreach ( $new_rates as $rate ) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
-		$tax_rates[]     = $rate;
+        $rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
+        $rate['name']    = sanitize_text_field( $rate['name'] );
+        $rate['state']   = sanitize_text_field( $rate['state'] );
+        $rate['country'] = sanitize_text_field( $rate['country'] );
+        $rate['global']  = empty( $rate['state'] );
+        $tax_rates[]     = $rate;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rates', $tax_rates );
 
@@ -362,11 +362,11 @@ 
     $tabs['general']  = __( 'General', 'invoicing' );
     $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
     $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['emails']   = __( 'Emails', 'invoicing' );
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
-	}
+    if ( count( getpaid_get_integration_settings() ) > 0 ) {
+        $tabs['integrations'] = __( 'Integrations', 'invoicing' );
+    }
 
     $tabs['privacy']  = __( 'Privacy', 'invoicing' );
     $tabs['misc']     = __( 'Misc', 'invoicing' );
@@ -405,14 +405,14 @@ 
         ) ),
         'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
             'main'  => __( 'Tax Settings', 'invoicing' ),
-			'rates' => __( 'Tax Rates', 'invoicing' ),
-			'vat'   => __( 'EU VAT Settings', 'invoicing' )
+            'rates' => __( 'Tax Rates', 'invoicing' ),
+            'vat'   => __( 'EU VAT Settings', 'invoicing' )
         ) ),
         'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
             'main' => __( 'Email Settings', 'invoicing' ),
-		) ),
+        ) ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+        'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
 
         'privacy' => apply_filters( 'wpinv_settings_sections_privacy', array(
             'main' => __( 'Privacy policy', 'invoicing' ),
@@ -432,48 +432,48 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if( $default_label !== NULL && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+    if ( !empty( $args['desc'] ) ) {
         echo wp_kses_post( $args['desc'] );
     }
 }
 
 function wpinv_hidden_callback( $args ) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	}
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    }
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
 
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    $html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
     
-	echo $html;
+    echo $html;
 }
 
 /**
@@ -481,12 +481,12 @@ 
  */
 function wpinv_checkbox_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    $id  = esc_attr( $args['id'] );
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
-	?>
+    getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+    ?>
 		<fieldset>
 			<label>
 				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox">
@@ -498,75 +498,75 @@ 
 
 function wpinv_multicheck_callback( $args ) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+    if ( ! empty( $args['options'] ) ) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+        $std     = isset( $args['std'] ) ? $args['std'] : array();
+        $value   = wpinv_get_option( $args['id'], $std );
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
         foreach( $args['options'] as $key => $option ):
-			$sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
-			if ( in_array( $sanitize_key, $value ) ) { 
-				$enabled = $sanitize_key;
-			} else { 
-				$enabled = NULL; 
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            $sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
+            if ( in_array( $sanitize_key, $value ) ) { 
+                $enabled = $sanitize_key;
+            } else { 
+                $enabled = NULL; 
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false);
+    $value   = wpinv_get_option( $args['id'], false);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
             
-			if( empty( $value ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = NULL;
-			}
-
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
-
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-						$content_dir = WP_CONTENT_DIR;
-
-						if ( function_exists( 'wp_normalize_path' ) ) {
-							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
-						}
-
-						$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo $option . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if( empty( $value ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = NULL;
+            }
+
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                    echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                    $card = strtolower( str_replace( ' ', '', $option ) );
+
+                    if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                        $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                        $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                        $content_dir = WP_CONTENT_DIR;
+
+                        if ( function_exists( 'wp_normalize_path' ) ) {
+                            // Replaces backslashes with forward slashes for Windows systems
+                            $image = wp_normalize_path( $image );
+                            $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                        $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                    echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo $option . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 /**
@@ -574,9 +574,9 @@ 
  */
 function wpinv_radio_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	?>
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    ?>
 		<fieldset>
 			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
 				<?php foreach( $args['options'] as $key => $option ) : ?>
@@ -590,7 +590,7 @@ 
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+    getpaid_settings_description_callback( $args );
 }
 
 /**
@@ -598,10 +598,10 @@ 
  */
 function getpaid_settings_description_callback( $args ) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = wp_kses_post( $args['desc'] );
-		echo "<p class='description'>$description</p>";
-	}
+    if ( ! empty( $args['desc'] ) ) {
+        $description = wp_kses_post( $args['desc'] );
+        echo "<p class='description'>$description</p>";
+    }
 
 }
 
@@ -610,7 +610,7 @@ 
  */
 function wpinv_gateways_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -624,22 +624,22 @@ 
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+    echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    foreach ( $args['options'] as $key => $option ) :
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             $selected = selected( $key, $args['selected'], false );
         } else {
             $selected = selected( $key, $value, false );
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 /**
@@ -650,29 +650,29 @@ 
  */
 function wpinv_settings_attrs_helper( $args ) {
 
-	$value        = isset( $args['std'] ) ? $args['std'] : '';
-	$id           = esc_attr( $args['id'] );
-	$placeholder  = esc_attr( $args['placeholder'] );
+    $value        = isset( $args['std'] ) ? $args['std'] : '';
+    $id           = esc_attr( $args['id'] );
+    $placeholder  = esc_attr( $args['placeholder'] );
 
-	if ( ! empty( $args['faux'] ) ) {
-		$args['readonly'] = true;
-		$name             = '';
-	} else {
-		$value  = wpinv_get_option( $args['id'], $value );
-		$name   = "wpinv_settings[$id]";
-	}
+    if ( ! empty( $args['faux'] ) ) {
+        $args['readonly'] = true;
+        $name             = '';
+    } else {
+        $value  = wpinv_get_option( $args['id'], $value );
+        $name   = "wpinv_settings[$id]";
+    }
 
-	$value    = is_scalar( $value ) ? esc_attr( $value ) : '';
-	$class    = esc_attr( $args['class'] );
-	$style    = esc_attr( $args['style'] );
-	$readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
+    $value    = is_scalar( $value ) ? esc_attr( $value ) : '';
+    $class    = esc_attr( $args['class'] );
+    $style    = esc_attr( $args['style'] );
+    $readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
 
-	$onchange = '';
+    $onchange = '';
     if ( ! empty( $args['onchange'] ) ) {
         $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
-	}
+    }
 
-	return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
+    return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
 }
 
 /**
@@ -680,11 +680,11 @@ 
  */
 function wpinv_text_callback( $args ) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
+    $desc = wp_kses_post( $args['desc'] );
+    $desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr = wpinv_settings_attrs_helper( $args );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="text" <?php echo $attr; ?>>
 			<?php echo $desc; ?>
@@ -698,14 +698,14 @@ 
  */
 function wpinv_number_callback( $args ) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
-	$max  = intval( $args['max'] );
-	$min  = intval( $args['min'] );
-	$step = floatval( $args['step'] );
+    $desc = wp_kses_post( $args['desc'] );
+    $desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr = wpinv_settings_attrs_helper( $args );
+    $max  = intval( $args['max'] );
+    $min  = intval( $args['min'] );
+    $step = floatval( $args['step'] );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="number" step="<?php echo $step; ?>" max="<?php echo $max; ?>" min="<?php echo $min; ?>" <?php echo $attr; ?>>
 			<?php echo $desc; ?>
@@ -717,36 +717,36 @@ 
 function wpinv_textarea_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    $html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_password_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_missing_callback($args) {
-	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . $args['id'] . '</strong>'
-	);
+    printf(
+        __( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . $args['id'] . '</strong>'
+    );
 }
 
 /**
@@ -754,14 +754,14 @@ 
  */
 function wpinv_select_callback( $args ) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr   = wpinv_settings_attrs_helper( $args );
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+    $desc   = wp_kses_post( $args['desc'] );
+    $desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr   = wpinv_settings_attrs_helper( $args );
+    $value  = isset( $args['std'] ) ? $args['std'] : '';
+    $value  = wpinv_get_option( $args['id'], $value );
+    $rand   = uniqid( 'random_id' );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<select <?php echo $attr; ?> data-allow-clear="true">
 				<?php foreach ( $args['options'] as $option => $name ) : ?>
@@ -794,104 +794,104 @@ 
 function wpinv_color_select_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wp_version;
+    global $wp_version;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 	
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
-		$value = $std;
-	}
+    if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+        $value = $std;
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	$html = '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
-		$html .= ob_get_clean();
-	} else {
-		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    $html = '<div class="getpaid-settings-editor-input">';
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        ob_start();
+        wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+        $html .= ob_get_clean();
+    } else {
+        $html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_upload_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_callback( $args ) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
+    $std         = isset( $args['std'] ) ? $args['std'] : '';
+    $value       = wpinv_get_option( $args['id'], $std );
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_country_states_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 /**
@@ -899,7 +899,7 @@ 
  */
 function wpinv_tax_rates_callback() {
 	
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -914,17 +914,17 @@ 
  * Displays a tax rate' edit row.
  */
 function wpinv_tax_rate_callback( $tax_rate, $key, $echo = true ) {
-	ob_start();
+    ob_start();
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+    $key                      = sanitize_key( $key );
+    $tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
+    include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
 
-	if ( $echo ) {
-		echo ob_get_clean();
-	} else {
-		return ob_get_clean(); 
-	}
+    if ( $echo ) {
+        echo ob_get_clean();
+    } else {
+        return ob_get_clean(); 
+    }
 
 }
 
@@ -952,14 +952,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<tr>
@@ -969,14 +969,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<tr>
@@ -986,14 +986,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 
@@ -1004,14 +1004,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e( 'Run', 'invoicing' );?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e( 'Run', 'invoicing' );?></a>
                 </td>
             </tr>
 
@@ -1022,8 +1022,8 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
-					?>" class="button button-primary"><?php _e( 'Launch', 'invoicing' );?></a>
+                        echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
+                    ?>" class="button button-primary"><?php _e( 'Launch', 'invoicing' );?></a>
                 </td>
             </tr>
 
@@ -1037,19 +1037,19 @@ 
 
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_raw_html_callback( $args ) {
-	echo $args['desc'];
+    echo $args['desc'];
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 
@@ -1073,15 +1073,15 @@ 
  */
 function wpinv_get_merge_tags_help_text( $subscription = false ) {
 
-	$url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
-	$link = sprintf(
-		'<strong><a href="%s" target="_blank">%s</a></strong>',
-		$url,
-		esc_html__( 'View available merge tags.', 'wpinv-quotes' )
-	);
+    $url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
+    $link = sprintf(
+        '<strong><a href="%s" target="_blank">%s</a></strong>',
+        $url,
+        esc_html__( 'View available merge tags.', 'wpinv-quotes' )
+    );
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+    $description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
 
-	return "$description $link";
+    return "$description $link";
 
 }

Spacing +375 added lines, -375 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves all default settings.
@@ -16,13 +16,13 @@ 
 function wpinv_get_settings() {
     $defaults = array();
 
-    foreach ( array_values( wpinv_get_registered_settings() ) as $tab_settings ) {
+    foreach (array_values(wpinv_get_registered_settings()) as $tab_settings) {
 
-        foreach ( array_values( $tab_settings ) as $section_settings ) {
+        foreach (array_values($tab_settings) as $section_settings) {
 
-            foreach ( $section_settings as $key => $setting ) {
-                if ( isset( $setting['std'] ) ) {
-                    $defaults[ $key ] = $setting['std'];
+            foreach ($section_settings as $key => $setting) {
+                if (isset($setting['std'])) {
+                    $defaults[$key] = $setting['std'];
                 }
             }
 
@@ -43,12 +43,12 @@ 
     global $wpinv_options;
 
     // Try fetching the saved options.
-    if ( empty( $wpinv_options ) ) {
-        $wpinv_options = get_option( 'wpinv_settings' );
+    if (empty($wpinv_options)) {
+        $wpinv_options = get_option('wpinv_settings');
     }
 
     // If that fails, don't fetch the default settings to prevent a loop.
-    if ( ! is_array( $wpinv_options ) ) {
+    if (!is_array($wpinv_options)) {
         $wpinv_options = array();
     }
 
@@ -62,13 +62,13 @@ 
  * @param mixed $default The default value to use if the setting has not been set.
  * @return mixed
  */
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
 
     $options = wpinv_get_options();
-    $value   = isset( $options[ $key ] ) ? $options[ $key ] : $default;
-    $value   = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value   = isset($options[$key]) ? $options[$key] : $default;
+    $value   = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
 /**
@@ -77,11 +77,11 @@ 
  * @param array $options the new options.
  * @return bool
  */
-function wpinv_update_options( $options ) {
+function wpinv_update_options($options) {
     global $wpinv_options;
 
     // update the option.
-    if ( is_array( $options ) && update_option( 'wpinv_settings', $options ) ) {
+    if (is_array($options) && update_option('wpinv_settings', $options)) {
         $wpinv_options = $options;
         return true;
     }
@@ -96,24 +96,24 @@ 
  * @param mixed $value The setting value.
  * @return bool
  */
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
 
     // If no key, exit.
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // Maybe delete the option instead.
-    if ( is_null( $value ) ) {
-        return wpinv_delete_option( $key );
+    if (is_null($value)) {
+        return wpinv_delete_option($key);
     }
 
     // Prepare the new options.
     $options         = wpinv_get_options();
-    $options[ $key ] = apply_filters( 'wpinv_update_option', $value, $key );
+    $options[$key] = apply_filters('wpinv_update_option', $value, $key);
 
     // Save the new options.
-    return wpinv_update_options( $options );
+    return wpinv_update_options($options);
 
 }
 
@@ -123,18 +123,18 @@ 
  * @param string $key the setting key.
  * @return bool
  */
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
 
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     $options = wpinv_get_options();
 
-    if ( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
-        return wpinv_update_options( $options );
+    if (isset($options[$key])) {
+        unset($options[$key]);
+        return wpinv_update_options($options);
     }
 
     return true;
@@ -148,14 +148,14 @@ 
 function wpinv_register_settings() {
 
     // Loop through all tabs.
-    foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
+    foreach (wpinv_get_registered_settings() as $tab => $sections) {
 
         // In each tab, loop through sections.
-        foreach ( $sections as $section => $settings ) {
+        foreach ($sections as $section => $settings) {
 
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
@@ -168,9 +168,9 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
-                if ( ! empty( $option['id'] ) ) {
-                    wpinv_register_settings_option( $tab, $section, $option );
+            foreach ($settings as $option) {
+                if (!empty($option['id'])) {
+                    wpinv_register_settings_option($tab, $section, $option);
                 }
             }
 
@@ -178,9 +178,9 @@ 
     }
 
     // Creates our settings in the options table.
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 /**
  * Register a single settings option.
@@ -190,49 +190,49 @@ 
  * @param string $option
  * 
  */
-function wpinv_register_settings_option( $tab, $section, $option ) {
+function wpinv_register_settings_option($tab, $section, $option) {
 
-    $name       = isset( $option['name'] ) ? $option['name'] : '';
+    $name       = isset($option['name']) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+	$is_wizzard = is_admin() && isset($_GET['page']) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
+	if (isset($option['desc']) && (!$is_wizzard && !empty($option['help-tip']))) {
+		$tip   = wpinv_clean($option['desc']);
 		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
+		unset($option['desc']);
 	}
 
     // Loop through all tabs.
     add_settings_field(
         'wpinv_settings[' . $option['id'] . ']',
         $name,
-        function_exists( $cb ) ? $cb : 'wpinv_missing_callback',
+        function_exists($cb) ? $cb : 'wpinv_missing_callback',
         $section,
         $section,
         array(
             'section'     => $section,
-            'id'          => isset( $option['id'] )          ? $option['id']          : uniqid( 'wpinv-' ),
-            'desc'        => isset( $option['desc'] )        ? $option['desc']        : '',
+            'id'          => isset($option['id']) ? $option['id'] : uniqid('wpinv-'),
+            'desc'        => isset($option['desc']) ? $option['desc'] : '',
             'name'        => $name,
-            'size'        => isset( $option['size'] )        ? $option['size']        : null,
-            'options'     => isset( $option['options'] )     ? $option['options']     : '',
-            'selected'    => isset( $option['selected'] )    ? $option['selected']    : null,
-            'std'         => isset( $option['std'] )         ? $option['std']         : '',
-            'min'         => isset( $option['min'] )         ? $option['min']         : 0,
-            'max'         => isset( $option['max'] )         ? $option['max']         : 999999,
-            'step'        => isset( $option['step'] )        ? $option['step']        : 1,
-            'placeholder' => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-            'allow_blank' => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-            'readonly'    => isset( $option['readonly'] )    ? $option['readonly']    : false,
-            'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
-            'onchange'    => isset( $option['onchange'] )   ? $option['onchange']     : '',
-            'custom'      => isset( $option['custom'] )     ? $option['custom']       : '',
-			'default_content' => isset( $option['default_content'] )     ? $option['default_content']       : '',
-			'class'       => isset( $option['class'] )     ? $option['class']         : '',
-			'style'       => isset( $option['style'] )     ? $option['style']         : '',
-            'cols'        => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
-            'rows'        => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
+            'size'        => isset($option['size']) ? $option['size'] : null,
+            'options'     => isset($option['options']) ? $option['options'] : '',
+            'selected'    => isset($option['selected']) ? $option['selected'] : null,
+            'std'         => isset($option['std']) ? $option['std'] : '',
+            'min'         => isset($option['min']) ? $option['min'] : 0,
+            'max'         => isset($option['max']) ? $option['max'] : 999999,
+            'step'        => isset($option['step']) ? $option['step'] : 1,
+            'placeholder' => isset($option['placeholder']) ? $option['placeholder'] : null,
+            'allow_blank' => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+            'readonly'    => isset($option['readonly']) ? $option['readonly'] : false,
+            'faux'        => isset($option['faux']) ? $option['faux'] : false,
+            'onchange'    => isset($option['onchange']) ? $option['onchange'] : '',
+            'custom'      => isset($option['custom']) ? $option['custom'] : '',
+			'default_content' => isset($option['default_content']) ? $option['default_content'] : '',
+			'class'       => isset($option['class']) ? $option['class'] : '',
+			'style'       => isset($option['style']) ? $option['style'] : '',
+            'cols'        => isset($option['cols']) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
+            'rows'        => isset($option['rows']) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
     );
 
@@ -244,7 +244,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+	return array_filter(apply_filters('wpinv_registered_settings', wpinv_get_data('admin-settings')));
 }
 
 /**
@@ -253,7 +253,7 @@ 
  * @return array
  */
 function getpaid_get_integration_settings() {
-    return apply_filters( 'getpaid_integration_settings', array() );
+    return apply_filters('getpaid_integration_settings', array());
 }
 
 /**
@@ -261,126 +261,126 @@ 
  * 
  * @return array
  */
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
 
 	$wpinv_options = wpinv_get_options();
 	$raw_referrer  = wp_get_raw_referer();
 
-    if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+    if (empty($raw_referrer)) {
+		return array_merge($wpinv_options, $input);
     }
 
-    wp_parse_str( $raw_referrer, $referrer );
+    wp_parse_str($raw_referrer, $referrer);
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+	if (in_array('gp-setup', $referrer)) {
+		return array_merge($wpinv_options, $input);
 	}
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
 
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][$section][ $key ]['type'] ) ? $settings[ $tab ][$section][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$section][$key]['type']) ? $settings[$tab][$section][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[$key] = apply_filters( "wpinv_settings_sanitize_$type", $value, $key );
+            $input[$key] = apply_filters("wpinv_settings_sanitize_$type", $value, $key);
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+		$input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
 
 		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+		$input[$key] = apply_filters("wpinv_settings_sanitize_$key", $input[$key]);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = isset( $settings[ $tab ] ) ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = isset($settings[$tab]) ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings   = array_merge( $main_settings, $section_settings );
+    $found_settings   = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( ! isset( $input[ $key ] ) && isset( $wpinv_options[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (!isset($input[$key]) && isset($wpinv_options[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
-add_filter( 'wpinv_settings_sanitize_text', 'trim', 10, 1 );
-add_filter( 'wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount' );
+add_filter('wpinv_settings_sanitize_text', 'trim', 10, 1);
+add_filter('wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-    $new_rates = ! empty( $_POST['tax_rates'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rates'] ) ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? wp_kses_post_deep(array_values($_POST['tax_rates'])) : array();
     $tax_rates = array();
 
-    foreach ( $new_rates as $rate ) {
+    foreach ($new_rates as $rate) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
+		$rate['rate']    = wpinv_sanitize_amount($rate['rate']);
+		$rate['name']    = sanitize_text_field($rate['name']);
+		$rate['state']   = sanitize_text_field($rate['state']);
+		$rate['country'] = sanitize_text_field($rate['country']);
+		$rate['global']  = empty($rate['state']);
 		$tax_rates[]     = $rate;
 
 	}
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+	$tabs['emails'] = __('Emails', 'invoicing');
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
+	if (count(getpaid_get_integration_settings()) > 0) {
+		$tabs['integrations'] = __('Integrations', 'invoicing');
 	}
 
-    $tabs['privacy']  = __( 'Privacy', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
+    $tabs['privacy']  = __('Privacy', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
 
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
     }
 
     return $tabs;
@@ -389,89 +389,89 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
     $sections = array(
-        'general' => apply_filters( 'wpinv_settings_sections_general', array(
-            'main' => __( 'General Settings', 'invoicing' ),
-            'page_section' => __( 'Page Settings', 'invoicing' ),
-            'currency_section' => __( 'Currency Settings', 'invoicing' ),
-            'labels' => __( 'Label Texts', 'invoicing' ),
-        ) ),
-        'gateways' => apply_filters( 'wpinv_settings_sections_gateways', array(
-            'main' => __( 'Gateway Settings', 'invoicing' ),
-        ) ),
-        'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
-            'main'  => __( 'Tax Settings', 'invoicing' ),
-			'rates' => __( 'Tax Rates', 'invoicing' ),
-			'vat'   => __( 'EU VAT Settings', 'invoicing' )
-        ) ),
-        'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
-            'main' => __( 'Email Settings', 'invoicing' ),
-		) ),
-
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
-
-        'privacy' => apply_filters( 'wpinv_settings_sections_privacy', array(
-            'main' => __( 'Privacy policy', 'invoicing' ),
-        ) ),
-        'misc' => apply_filters( 'wpinv_settings_sections_misc', array(
-            'main' => __( 'Miscellaneous', 'invoicing' ),
-            'custom-css' => __( 'Custom CSS', 'invoicing' ),
-        ) ),
-        'tools' => apply_filters( 'wpinv_settings_sections_tools', array(
-            'main' => __( 'Diagnostic Tools', 'invoicing' ),
-        ) ),
+        'general' => apply_filters('wpinv_settings_sections_general', array(
+            'main' => __('General Settings', 'invoicing'),
+            'page_section' => __('Page Settings', 'invoicing'),
+            'currency_section' => __('Currency Settings', 'invoicing'),
+            'labels' => __('Label Texts', 'invoicing'),
+        )),
+        'gateways' => apply_filters('wpinv_settings_sections_gateways', array(
+            'main' => __('Gateway Settings', 'invoicing'),
+        )),
+        'taxes' => apply_filters('wpinv_settings_sections_taxes', array(
+            'main'  => __('Tax Settings', 'invoicing'),
+			'rates' => __('Tax Rates', 'invoicing'),
+			'vat'   => __('EU VAT Settings', 'invoicing')
+        )),
+        'emails' => apply_filters('wpinv_settings_sections_emails', array(
+            'main' => __('Email Settings', 'invoicing'),
+		)),
+
+		'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'label', 'id'),
+
+        'privacy' => apply_filters('wpinv_settings_sections_privacy', array(
+            'main' => __('Privacy policy', 'invoicing'),
+        )),
+        'misc' => apply_filters('wpinv_settings_sections_misc', array(
+            'main' => __('Miscellaneous', 'invoicing'),
+            'custom-css' => __('Custom CSS', 'invoicing'),
+        )),
+        'tools' => apply_filters('wpinv_settings_sections_tools', array(
+            'main' => __('Diagnostic Tools', 'invoicing'),
+        )),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
+function wpinv_get_pages($with_slug = false, $default_label = NULL) {
 	$pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== NULL && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
-        echo wp_kses_post( $args['desc'] );
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
+        echo wp_kses_post($args['desc']);
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$name  = '';
+		$name = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key($args['id']) . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '" />';
     
 	echo $html;
 }
@@ -479,59 +479,59 @@ 
 /**
  * Displays a checkbox settings callback.
  */
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
+	$id  = esc_attr($args['id']);
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+	getpaid_hidden_field("wpinv_settings[$id]", '0');
 	?>
 		<fieldset>
 			<label>
-				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox">
-				<?php echo wp_kses_post( $args['desc'] ); ?>
+				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked(empty($std), false); ?> value="1" type="checkbox">
+				<?php echo wp_kses_post($args['desc']); ?>
 			</label>
 		</fieldset>
 	<?php
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+	$sanitize_id = wpinv_sanitize_key($args['id']);
+	$class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+	if (!empty($args['options'])) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+		$std     = isset($args['std']) ? $args['std'] : array();
+		$value   = wpinv_get_option($args['id'], $std);
 
 		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
-        foreach( $args['options'] as $key => $option ):
-			$sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
-			if ( in_array( $sanitize_key, $value ) ) { 
+        foreach ($args['options'] as $key => $option):
+			$sanitize_key = esc_attr(wpinv_sanitize_key($key));
+			if (in_array($sanitize_key, $value)) { 
 				$enabled = $sanitize_key;
 			} else { 
 				$enabled = NULL; 
 			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($sanitize_key) . '" ' . checked($sanitize_key, $enabled, false) . '/>&nbsp;';
+			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post($option) . '</label></div>';
 		endforeach;
 		echo '</div>';
-		echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false);
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$value = wpinv_get_option($args['id'], false);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
             
-			if( empty( $value ) ) {
+			if (empty($value)) {
 				$enabled = $option;
 			} else {
 				$enabled = NULL;
@@ -539,67 +539,67 @@ 
 
 			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+					echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
+					$card = strtolower(str_replace(' ', '', $option));
 
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+					if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+						$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+						$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 						$content_dir = WP_CONTENT_DIR;
 
-						if ( function_exists( 'wp_normalize_path' ) ) {
+						if (function_exists('wp_normalize_path')) {
 							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
+							$image = wp_normalize_path($image);
+							$content_dir = wp_normalize_path($content_dir);
 						}
 
-						$image = str_replace( $content_dir, content_url(), $image );
+						$image = str_replace($content_dir, content_url(), $image);
 					}
 
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+					echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
 			echo $option . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
 /**
  * Displays a radio settings field.
  */
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
 	?>
 		<fieldset>
-			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
-				<?php foreach( $args['options'] as $key => $option ) : ?>
+			<ul id="wpinv-settings-<?php echo esc_attr($args['id']); ?>" style="margin-top: 0;">
+				<?php foreach ($args['options'] as $key => $option) : ?>
 					<li>
 						<label>
-							<input name="wpinv_settings[<?php echo esc_attr( $args['id'] ); ?>]" <?php checked( $std, $key ); ?> value="<?php echo esc_attr( $key ); ?>" type="radio">
-							<?php echo wp_kses_post( $option ); ?>
+							<input name="wpinv_settings[<?php echo esc_attr($args['id']); ?>]" <?php checked($std, $key); ?> value="<?php echo esc_attr($key); ?>" type="radio">
+							<?php echo wp_kses_post($option); ?>
 						</label>
 					</li>
 				<?php endforeach; ?>
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+	getpaid_settings_description_callback($args);
 }
 
 /**
  * Displays a description if available.
  */
-function getpaid_settings_description_callback( $args ) {
+function getpaid_settings_description_callback($args) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = wp_kses_post( $args['desc'] );
+	if (!empty($args['desc'])) {
+		$description = wp_kses_post($args['desc']);
 		echo "<p class='description'>$description</p>";
 	}
 
@@ -615,31 +615,31 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-gateways-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-gateways-edit.php'; ?>
 
 	<?php
 }
 
 function wpinv_gateway_select_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+    $class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="' . $class . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            $selected = selected( $key, $args['selected'], false );
+	foreach ($args['options'] as $key => $option) :
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            $selected = selected($key, $args['selected'], false);
         } else {
-            $selected = selected( $key, $value, false );
+            $selected = selected($key, $value, false);
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+		echo '<option value="' . wpinv_sanitize_key($key) . '"' . $selected . '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
 /**
@@ -648,28 +648,28 @@ 
  * @param array $args
  * @return string
  */
-function wpinv_settings_attrs_helper( $args ) {
+function wpinv_settings_attrs_helper($args) {
 
-	$value        = isset( $args['std'] ) ? $args['std'] : '';
-	$id           = esc_attr( $args['id'] );
-	$placeholder  = esc_attr( $args['placeholder'] );
+	$value        = isset($args['std']) ? $args['std'] : '';
+	$id           = esc_attr($args['id']);
+	$placeholder  = esc_attr($args['placeholder']);
 
-	if ( ! empty( $args['faux'] ) ) {
+	if (!empty($args['faux'])) {
 		$args['readonly'] = true;
 		$name             = '';
 	} else {
-		$value  = wpinv_get_option( $args['id'], $value );
+		$value  = wpinv_get_option($args['id'], $value);
 		$name   = "wpinv_settings[$id]";
 	}
 
-	$value    = is_scalar( $value ) ? esc_attr( $value ) : '';
-	$class    = esc_attr( $args['class'] );
-	$style    = esc_attr( $args['style'] );
-	$readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
+	$value    = is_scalar($value) ? esc_attr($value) : '';
+	$class    = esc_attr($args['class']);
+	$style    = esc_attr($args['style']);
+	$readonly = empty($args['readonly']) ? '' : 'readonly onclick="this.select()"';
 
 	$onchange = '';
-    if ( ! empty( $args['onchange'] ) ) {
-        $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $onchange = ' onchange="' . esc_attr($args['onchange']) . '"';
 	}
 
 	return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
@@ -678,11 +678,11 @@ 
 /**
  * Displays a text input settings callback.
  */
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
+	$desc = wp_kses_post($args['desc']);
+	$desc = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr = wpinv_settings_attrs_helper($args);
 
 	?>
 		<label style="width: 100%;">
@@ -696,14 +696,14 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_number_callback( $args ) {
+function wpinv_number_callback($args) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
-	$max  = intval( $args['max'] );
-	$min  = intval( $args['min'] );
-	$step = floatval( $args['step'] );
+	$desc = wp_kses_post($args['desc']);
+	$desc = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr = wpinv_settings_attrs_helper($args);
+	$max  = intval($args['max']);
+	$min  = intval($args['min']);
+	$step = floatval($args['step']);
 
 	?>
 		<label style="width: 100%;">
@@ -714,37 +714,37 @@ 
 
 }
 
-function wpinv_textarea_callback( $args ) {
+function wpinv_textarea_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $class = (isset($args['class']) && !is_null($args['class'])) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<textarea class="' . sanitize_html_class($class) . ' txtarea-' . sanitize_html_class($size) . ' wpi-' . esc_attr(sanitize_html_class($sanitize_id)) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="password" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
 function wpinv_missing_callback($args) {
 	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+		__('The callback function used for the %s setting is missing.', 'invoicing'),
 		'<strong>' . $args['id'] . '</strong>'
 	);
 }
@@ -752,35 +752,35 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_select_callback( $args ) {
+function wpinv_select_callback($args) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr   = wpinv_settings_attrs_helper( $args );
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+	$desc   = wp_kses_post($args['desc']);
+	$desc   = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr   = wpinv_settings_attrs_helper($args);
+	$value  = isset($args['std']) ? $args['std'] : '';
+	$value  = wpinv_get_option($args['id'], $value);
+	$rand   = uniqid('random_id');
 
 	?>
 		<label style="width: 100%;">
 			<select <?php echo $attr; ?> data-allow-clear="true">
-				<?php foreach ( $args['options'] as $option => $name ) : ?>
-					<option value="<?php echo esc_attr( $option ); ?>" <?php echo selected( $option, $value ); ?>><?php echo wpinv_clean( $name ); ?></option>
-				<?php endforeach;?>
+				<?php foreach ($args['options'] as $option => $name) : ?>
+					<option value="<?php echo esc_attr($option); ?>" <?php echo selected($option, $value); ?>><?php echo wpinv_clean($name); ?></option>
+				<?php endforeach; ?>
 			</select>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && is_numeric( $value ) ) : ?>
-				<a href="<?php echo get_edit_post_link( $value ); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php _e( 'Edit Page', 'invoicing' ) ?></a>
+			<?php if (substr($args['id'], -5) === '_page' && is_numeric($value)) : ?>
+				<a href="<?php echo get_edit_post_link($value); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php _e('Edit Page', 'invoicing') ?></a>
 			<?php endif; ?>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && ! empty( $args['default_content'] ) ) : ?>
-				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo $rand; ?>" class="button thickbox getpaid-page-setting-view-default"><?php _e( 'View Default Content', 'invoicing' ) ?></a>
+			<?php if (substr($args['id'], -5) === '_page' && !empty($args['default_content'])) : ?>
+				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo $rand; ?>" class="button thickbox getpaid-page-setting-view-default"><?php _e('View Default Content', 'invoicing') ?></a>
 				<div id='<?php echo $rand; ?>' style='display:none;'>
 					<div>
-						<h3><?php _e( 'Original Content', 'invoicing' ) ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo gepaid_trim_lines( wp_kses_post( $args['default_content'] ) ); ?></textarea>
-						<h3><?php _e( 'Current Content', 'invoicing' ) ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post( $value ); echo empty( $_post ) ? '' : gepaid_trim_lines( wp_kses_post( $_post->post_content ) ); ?></textarea>
+						<h3><?php _e('Original Content', 'invoicing') ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo gepaid_trim_lines(wp_kses_post($args['default_content'])); ?></textarea>
+						<h3><?php _e('Current Content', 'invoicing') ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post($value); echo empty($_post) ? '' : gepaid_trim_lines(wp_kses_post($_post->post_content)); ?></textarea>
 					</div>
 				</div>
 			<?php endif; ?>
@@ -791,88 +791,88 @@ 
 
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+	foreach ($args['options'] as $option => $color) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($color['label']) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wp_version;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 	
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+	if (!empty($args['allow_blank']) && empty($value)) {
 		$value = $std;
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
 	$html = '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+	if ($wp_version >= 3.3 && function_exists('wp_editor')) {
 		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+		wp_editor(stripslashes($value), 'wpinv_settings_' . esc_attr($args['id']), array('textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']', 'textarea_rows' => absint($rows), 'media_buttons' => false));
 		$html .= ob_get_clean();
 	} else {
-		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="text" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr(stripslashes($value)) . '"/>';
+	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __('Upload File', 'invoicing') . '"/></span>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$std         = isset($args['std']) ? $args['std'] : '';
+	$value       = wpinv_get_option($args['id'], $std);
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '" data-default-color="' . esc_attr($std) . '" />';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
 function wpinv_country_states_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -880,16 +880,16 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$class = empty($states) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"' . $class . 'data-placeholder="' . esc_html($placeholder) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+	foreach ($states as $option => $name) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($name) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -904,7 +904,7 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rates-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rates-edit.php'; ?>
 
 	<?php
 
@@ -913,14 +913,14 @@ 
 /**
  * Displays a tax rate' edit row.
  */
-function wpinv_tax_rate_callback( $tax_rate, $key, $echo = true ) {
+function wpinv_tax_rate_callback($tax_rate, $key, $echo = true) {
 	ob_start();
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+	$key                      = sanitize_key($key);
+	$tax_rate['reduced_rate'] = empty($tax_rate['reduced_rate']) ? 0 : $tax_rate['reduced_rate'];
+	include plugin_dir_path(__FILE__) . 'views/html-tax-rate-edit.php';
 
-	if ( $echo ) {
+	if ($echo) {
 		echo ob_get_clean();
 	} else {
 		return ob_get_clean(); 
@@ -933,136 +933,136 @@ 
     ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
-    <?php if ( $args['desc'] ) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+    <?php if ($args['desc']) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php _e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php _e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php _e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php _e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php _e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php _e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
 
         <tbody>
 			<tr>
-                <td><?php _e( 'Check Pages', 'invoicing' );?></td>
+                <td><?php _e('Check Pages', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Creates any missing GetPaid pages.', 'invoicing' ); ?></small>
+                    <small><?php _e('Creates any missing GetPaid pages.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php _e( 'Create Database Tables', 'invoicing' );?></td>
+                <td><?php _e('Create Database Tables', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Run this tool to create any missing database tables.', 'invoicing' ); ?></small>
+                    <small><?php _e('Run this tool to create any missing database tables.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_tables'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php _e( 'Migrate old invoices', 'invoicing' );?></td>
+                <td><?php _e('Migrate old invoices', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing' ); ?></small>
+                    <small><?php _e('If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+								add_query_arg('getpaid-admin-action', 'migrate_old_invoices'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php _e( 'Recalculate Discounts', 'invoicing' );?></td>
+                <td><?php _e('Recalculate Discounts', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing' ); ?></small>
+                    <small><?php _e('Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+								add_query_arg('getpaid-admin-action', 'recalculate_discounts'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e( 'Run', 'invoicing' );?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php _e( 'Set-up Wizard', 'invoicing' );?></td>
+                <td><?php _e('Set-up Wizard', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Launch the quick set-up wizard.', 'invoicing' ); ?></small>
+                    <small><?php _e('Launch the quick set-up wizard.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
-					?>" class="button button-primary"><?php _e( 'Launch', 'invoicing' );?></a>
+						echo esc_url(admin_url('index.php?page=gp-setup'));
+					?>" class="button button-primary"><?php _e('Launch', 'invoicing'); ?></a>
                 </td>
             </tr>
 
-			<?php do_action( 'wpinv_tools_row' ); ?>
+			<?php do_action('wpinv_tools_row'); ?>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
     echo ob_get_clean();
 }
 
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_raw_html_callback( $args ) {
+function wpinv_raw_html_callback($args) {
 	echo $args['desc'];
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return wpinv_get_capability();
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = !empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = !empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
     
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
 
 /**
  * Returns the merge tags help text.
@@ -1071,16 +1071,16 @@ 
  * 
  * @return string
  */
-function wpinv_get_merge_tags_help_text( $subscription = false ) {
+function wpinv_get_merge_tags_help_text($subscription = false) {
 
 	$url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
 	$link = sprintf(
 		'<strong><a href="%s" target="_blank">%s</a></strong>',
 		$url,
-		esc_html__( 'View available merge tags.', 'wpinv-quotes' )
+		esc_html__('View available merge tags.', 'wpinv-quotes')
 	);
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+	$description = esc_html__('The content of the email (Merge Tags and HTML are allowed).', 'invoicing');
 
 	return "$description $link";
 

includes/admin/html-admin-page-addons.php

Indentation +70 added lines, -70 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 add_ThickBox();
 ?>
@@ -14,18 +14,18 @@ 
 	<?php if ( $tabs ){ ?>
 		<nav class="nav-tab-wrapper wpi-nav-tab-wrapper">
 			<?php
-			foreach ( $tabs as $name => $label ) {
-				echo '<a href="' . esc_url( admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . esc_html( $label ) . '</a>';
-			}
-			do_action( 'wpi_addons_tabs' );
-			?>
+            foreach ( $tabs as $name => $label ) {
+                echo '<a href="' . esc_url( admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . esc_html( $label ) . '</a>';
+            }
+            do_action( 'wpi_addons_tabs' );
+            ?>
 		</nav>
 
 		<?php
 
-		if($current_tab == 'membership'){
+        if($current_tab == 'membership'){
 
-			?>
+            ?>
 
 			<div class="wpi-membership-tab-conatiner">
 				<div class="membership-content">
@@ -36,9 +36,9 @@ 
 					<h2><?php _e("Have a membership key?","invoicing");?></h2>
 					<p>
 						<?php
-						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
-						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108,12351));
-						?>
+                        $wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
+                        echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108,12351));
+                        ?>
 					</p>
 				<?php }?>
 
@@ -48,13 +48,13 @@ 
 							<div class="feature-list">
 								<ul>
 									<?php
-									$addon_obj = new WPInv_Admin_Addons();
-									if ($addons = $addon_obj->get_section_data( 'addons' ) ) {
-										foreach ( $addons as $addon ) {
-											echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
-										}
-									}
-									?>
+                                    $addon_obj = new WPInv_Admin_Addons();
+                                    if ($addons = $addon_obj->get_section_data( 'addons' ) ) {
+                                        foreach ( $addons as $addon ) {
+                                            echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
+                                        }
+                                    }
+                                    ?>
 									</ul>
 
 									<div class="feature-cta">
@@ -65,12 +65,12 @@ 
 									<h3><?php _e("Included Gateways:","invoicing");?></h3>
 									<ul>
 										<?php
-										if ($addons = $addon_obj->get_section_data( 'gateways' ) ) {
-											foreach ( $addons as $addon ) {
-												echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
-											}
-										}
-										?>
+                                        if ($addons = $addon_obj->get_section_data( 'gateways' ) ) {
+                                            foreach ( $addons as $addon ) {
+                                                echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
+                                            }
+                                        }
+                                        ?>
 								</ul>
 							</div>
 
@@ -81,8 +81,8 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image2.png', dirname(__FILE__) ) . '" > ';
-								?>
+                                    echo '<img src="' . plugins_url( 'images/t-image2.png', dirname(__FILE__) ) . '" > ';
+                                ?>
 							</div>
 							<div class="t-content">
 								<p>
@@ -101,8 +101,8 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image1.png', dirname(__FILE__) ) . '" > ';
-								?>
+                                    echo '<img src="' . plugins_url( 'images/t-image1.png', dirname(__FILE__) ) . '" > ';
+                                ?>
 							</div>
 							<div class="t-content">
 								<p>
@@ -126,21 +126,21 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
-			$installed_plugins = get_plugins();
+        }else{
+            $installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
-			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
-				//print_r($addons);
-				?>
+            if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
+                //print_r($addons);
+                ?>
 				<ul class="wpi-products"><?php foreach ( $addons as $addon ) :
                         if(965==$addon->info->id){continue;}// don't show quote add on
-						?><li class="wpi-product">
+                        ?><li class="wpi-product">
 								<div class="wpi-product-title">
 									<h3><?php
-										if ( ! empty( $addon->info->excerpt) ){
-											echo wpi_help_tip( $addon->info->excerpt );
-										}
-										echo esc_html( $addon->info->title ); ?></h3>
+                                        if ( ! empty( $addon->info->excerpt) ){
+                                            echo wpi_help_tip( $addon->info->excerpt );
+                                        }
+                                        echo esc_html( $addon->info->title ); ?></h3>
 								</div>
 
 								<span class="wpi-product-image">
@@ -148,32 +148,32 @@ 
 										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
 									<?php endif;
 
-									if ( 'stripe-payment-gateway' == $addon->info->slug ) {
-										$addon->info->slug = 'getpaid-stripe-payments';
-										$addon->info->link = 'https://wordpress.org/plugins/getpaid-stripe-payments/';
-									}
-
-									if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
-										echo '<a href="'.esc_url(admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug)).'&width=770&height=660&TB_iframe=true" class="thickbox" >';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
-										echo '</a>';
-									}elseif(isset($addon->info->link) && ( substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.com" ) ){
-										if(defined('WP_EASY_UPDATES_ACTIVE')){
-											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpgetpaid.com&TB_iframe=true');
-										}else{
-											// if installed show activation link
-											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
-												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
-												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
-											}
-										}
-										echo '<a href="'.esc_url($url).'" class="thickbox">';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
-										echo '</a>';
-									}
-
-									?>
+                                    if ( 'stripe-payment-gateway' == $addon->info->slug ) {
+                                        $addon->info->slug = 'getpaid-stripe-payments';
+                                        $addon->info->link = 'https://wordpress.org/plugins/getpaid-stripe-payments/';
+                                    }
+
+                                    if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
+                                        echo '<a href="'.esc_url(admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug)).'&width=770&height=660&TB_iframe=true" class="thickbox" >';
+                                        echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+                                        echo '</a>';
+                                    }elseif(isset($addon->info->link) && ( substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.com" ) ){
+                                        if(defined('WP_EASY_UPDATES_ACTIVE')){
+                                            $url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpgetpaid.com&TB_iframe=true');
+                                        }else{
+                                            // if installed show activation link
+                                            if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
+                                                $url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
+                                            }else{
+                                                $url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
+                                            }
+                                        }
+                                        echo '<a href="'.esc_url($url).'" class="thickbox">';
+                                        echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+                                        echo '</a>';
+                                    }
+
+                                    ?>
 
 								</span>
 
@@ -181,15 +181,15 @@ 
 								<span class="wpi-product-button">
 									<?php
                                     $addon_obj->output_button( $addon );
-									?>
+                                    ?>
 								</span>
 
 								<span class="wpi-price"><?php //print_r($addon); //echo wp_kses_post( $addon->price ); ?></span></li><?php endforeach; ?></ul>
 			<?php endif;
-		}
+        }
 
-	}
-	?>
+    }
+    ?>
 
 
 	<div class="clearfix" ></div>
@@ -208,8 +208,8 @@ 
 			<input class="wpeu-licence-key" type="text" placeholder="<?php _e("Enter your licence key",'invoicing');?>"> <button class="button-primary wpeu-licence-popup-button" ><?php _e("Install",'invoicing');?></button>
 			<br>
 			<?php
-			echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
-			?>
+            echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
+            ?>
 		</span>
 	</div>
 

Spacing +55 added lines, -55 removed lines

@@ -3,7 +3,7 @@ 
  * Admin View: Page - Addons
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 add_ThickBox();
@@ -11,19 +11,19 @@ 
 <div class="wrap wpi_addons_wrap">
 	<h1><?php echo get_admin_page_title(); ?></h1>
 
-	<?php if ( $tabs ){ ?>
+	<?php if ($tabs) { ?>
 		<nav class="nav-tab-wrapper wpi-nav-tab-wrapper">
 			<?php
-			foreach ( $tabs as $name => $label ) {
-				echo '<a href="' . esc_url( admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . esc_html( $label ) . '</a>';
+			foreach ($tabs as $name => $label) {
+				echo '<a href="' . esc_url(admin_url('admin.php?page=wpi-addons&tab=' . $name)) . '" class="nav-tab ' . ($current_tab == $name ? 'nav-tab-active' : '') . '">' . esc_html($label) . '</a>';
 			}
-			do_action( 'wpi_addons_tabs' );
+			do_action('wpi_addons_tabs');
 			?>
 		</nav>
 
 		<?php
 
-		if($current_tab == 'membership'){
+		if ($current_tab == 'membership') {
 
 			?>
 
@@ -32,42 +32,42 @@ 
 <!--
 				<h2>With our WPInvoicing Membership you get access to all our products!</h2>
 				<p><a class="button button-primary" href="https://wpinvoicing.com/downloads/membership/">View Memberships</a></p>-->
-				<?php if(defined('WP_EASY_UPDATES_ACTIVE')){?>
-					<h2><?php _e("Have a membership key?","invoicing");?></h2>
+				<?php if (defined('WP_EASY_UPDATES_ACTIVE')) {?>
+					<h2><?php _e("Have a membership key?", "invoicing"); ?></h2>
 					<p>
 						<?php
-						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
-						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108,12351));
+						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com', '1');
+						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership', array(95, 106, 108, 12351));
 						?>
 					</p>
 				<?php }?>
 
 				<div class="membership-cta-contet">
 					<div class="main-cta">
-							<h2><?php _e("Membership benefits Include:","invoicing");?></h2>
+							<h2><?php _e("Membership benefits Include:", "invoicing"); ?></h2>
 							<div class="feature-list">
 								<ul>
 									<?php
 									$addon_obj = new WPInv_Admin_Addons();
-									if ($addons = $addon_obj->get_section_data( 'addons' ) ) {
-										foreach ( $addons as $addon ) {
-											echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
+									if ($addons = $addon_obj->get_section_data('addons')) {
+										foreach ($addons as $addon) {
+											echo '<li><i class="far fa-check-circle fa-sm"></i> ' . esc_html($addon->info->title) . '</li>';
 										}
 									}
 									?>
 									</ul>
 
 									<div class="feature-cta">
-										<h3><?php _e("Membership Starts from","invoicing");?></h3>
+										<h3><?php _e("Membership Starts from", "invoicing"); ?></h3>
 										<h4>$99</h4>
-										<a href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php _e("Buy Membership","invoicing");?></a>
+										<a href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php _e("Buy Membership", "invoicing"); ?></a>
 									</div>
-									<h3><?php _e("Included Gateways:","invoicing");?></h3>
+									<h3><?php _e("Included Gateways:", "invoicing"); ?></h3>
 									<ul>
 										<?php
-										if ($addons = $addon_obj->get_section_data( 'gateways' ) ) {
-											foreach ( $addons as $addon ) {
-												echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
+										if ($addons = $addon_obj->get_section_data('gateways')) {
+											foreach ($addons as $addon) {
+												echo '<li><i class="far fa-check-circle fa-sm"></i> ' . esc_html($addon->info->title) . '</li>';
 											}
 										}
 										?>
@@ -81,7 +81,7 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image2.png', dirname(__FILE__) ) . '" > ';
+									echo '<img src="' . plugins_url('images/t-image2.png', dirname(__FILE__)) . '" > ';
 								?>
 							</div>
 							<div class="t-content">
@@ -101,7 +101,7 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image1.png', dirname(__FILE__) ) . '" > ';
+									echo '<img src="' . plugins_url('images/t-image1.png', dirname(__FILE__)) . '" > ';
 								?>
 							</div>
 							<div class="t-content">
@@ -117,8 +117,8 @@ 
 						</div>
 					</div>
 					<div class="member-footer">
-						<a class="footer-btn" href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php _e("Buy Membership","invoicing");?></a>
-						<a class="footer-link" href="post-new.php?post_type=wpi_invoice"><?php _e("Create Invoice","invoicing");?></a>
+						<a class="footer-btn" href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php _e("Buy Membership", "invoicing"); ?></a>
+						<a class="footer-link" href="post-new.php?post_type=wpi_invoice"><?php _e("Create Invoice", "invoicing"); ?></a>
 					</div>
 				</div>
 
@@ -126,50 +126,50 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
+		} else {
 			$installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
-			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
+			if ($addons = $addon_obj->get_section_data($current_tab)) :
 				//print_r($addons);
 				?>
-				<ul class="wpi-products"><?php foreach ( $addons as $addon ) :
-                        if(965==$addon->info->id){continue;}// don't show quote add on
+				<ul class="wpi-products"><?php foreach ($addons as $addon) :
+                        if (965 == $addon->info->id) {continue; }// don't show quote add on
 						?><li class="wpi-product">
 								<div class="wpi-product-title">
 									<h3><?php
-										if ( ! empty( $addon->info->excerpt) ){
-											echo wpi_help_tip( $addon->info->excerpt );
+										if (!empty($addon->info->excerpt)) {
+											echo wpi_help_tip($addon->info->excerpt);
 										}
-										echo esc_html( $addon->info->title ); ?></h3>
+										echo esc_html($addon->info->title); ?></h3>
 								</div>
 
 								<span class="wpi-product-image">
-									<?php if ( ! empty( $addon->info->thumbnail) ) : ?>
-										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
+									<?php if (!empty($addon->info->thumbnail)) : ?>
+										<img src="<?php echo esc_attr($addon->info->thumbnail); ?>"/>
 									<?php endif;
 
-									if ( 'stripe-payment-gateway' == $addon->info->slug ) {
+									if ('stripe-payment-gateway' == $addon->info->slug) {
 										$addon->info->slug = 'getpaid-stripe-payments';
 										$addon->info->link = 'https://wordpress.org/plugins/getpaid-stripe-payments/';
 									}
 
-									if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
-										echo '<a href="'.esc_url(admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug)).'&width=770&height=660&TB_iframe=true" class="thickbox" >';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+									if (isset($addon->info->link) && substr($addon->info->link, 0, 21) === "https://wordpress.org") {
+										echo '<a href="' . esc_url(admin_url('/plugin-install.php?tab=plugin-information&plugin=' . $addon->info->slug)) . '&width=770&height=660&TB_iframe=true" class="thickbox" >';
+										echo '<span class="wpi-product-info">' . __('More info', 'invoicing') . '</span>';
 										echo '</a>';
-									}elseif(isset($addon->info->link) && ( substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.com" ) ){
-										if(defined('WP_EASY_UPDATES_ACTIVE')){
-											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpgetpaid.com&TB_iframe=true');
-										}else{
+									}elseif (isset($addon->info->link) && (substr($addon->info->link, 0, 23) === "https://wpinvoicing.com" || substr($addon->info->link, 0, 21) === "https://wpgetpaid.com")) {
+										if (defined('WP_EASY_UPDATES_ACTIVE')) {
+											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin=' . $addon->info->slug . '&width=770&height=660&item_id=' . $addon->info->id . '&update_url=https://wpgetpaid.com&TB_iframe=true');
+										} else {
 											// if installed show activation link
-											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
+											if (isset($installed_plugins['wp-easy-updates/external-updates.php'])) {
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
+											} else {
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
 											}
 										}
-										echo '<a href="'.esc_url($url).'" class="thickbox">';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+										echo '<a href="' . esc_url($url) . '" class="thickbox">';
+										echo '<span class="wpi-product-info">' . __('More info', 'invoicing') . '</span>';
 										echo '</a>';
 									}
 
@@ -180,7 +180,7 @@ 
 
 								<span class="wpi-product-button">
 									<?php
-                                    $addon_obj->output_button( $addon );
+                                    $addon_obj->output_button($addon);
 									?>
 								</span>
 
@@ -194,21 +194,21 @@ 
 
 	<div class="clearfix" ></div>
 
-	<?php if($current_tab =='addons'){ ?>
-	<p><?php printf( __( 'All of our Invoicing Addons can be found on WPInvoicing.com here: <a href="%s">Invoicing Addons</a>', 'invoicing' ), 'https://wpinvoicing.com/downloads/category/addons/' ); ?></p>
-	<?php } if($current_tab =='gateways'){  ?>
-    <p><?php printf( __( 'All of our Invoicing Payment Gateways can be found on WPInvoicing.com here: <a href="%s">Invoicing Payment Gateways</a>', 'invoicing' ), 'https://wpinvoicing.com/downloads/category/gateways/' ); ?></p>
+	<?php if ($current_tab == 'addons') { ?>
+	<p><?php printf(__('All of our Invoicing Addons can be found on WPInvoicing.com here: <a href="%s">Invoicing Addons</a>', 'invoicing'), 'https://wpinvoicing.com/downloads/category/addons/'); ?></p>
+	<?php } if ($current_tab == 'gateways') {  ?>
+    <p><?php printf(__('All of our Invoicing Payment Gateways can be found on WPInvoicing.com here: <a href="%s">Invoicing Payment Gateways</a>', 'invoicing'), 'https://wpinvoicing.com/downloads/category/gateways/'); ?></p>
     <?php } ?>
 
-	<div id="wpi-wpeu-required-activation" style="display:none;"><span class="wpi-notification "><?php printf( __("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s'>activate</a> it now.",'invoicing'),wp_nonce_url(admin_url('plugins.php?action=activate&plugin=wp-easy-updates/external-updates.php'), 'activate-plugin_wp-easy-updates/external-updates.php'));?></span></div>
-	<div id="wpi-wpeu-required-for-external" style="display:none;"><span class="wpi-notification "><?php printf(  __("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s' onclick='window.open(\"https://wpeasyupdates.com/wp-easy-updates.zip\", \"_blank\");' >download</a> and install it now.",'invoicing'),admin_url("plugin-install.php?tab=upload&wpeu-install=true"));?></span></div>
+	<div id="wpi-wpeu-required-activation" style="display:none;"><span class="wpi-notification "><?php printf(__("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s'>activate</a> it now.", 'invoicing'), wp_nonce_url(admin_url('plugins.php?action=activate&plugin=wp-easy-updates/external-updates.php'), 'activate-plugin_wp-easy-updates/external-updates.php')); ?></span></div>
+	<div id="wpi-wpeu-required-for-external" style="display:none;"><span class="wpi-notification "><?php printf(__("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s' onclick='window.open(\"https://wpeasyupdates.com/wp-easy-updates.zip\", \"_blank\");' >download</a> and install it now.", 'invoicing'), admin_url("plugin-install.php?tab=upload&wpeu-install=true")); ?></span></div>
 	<div id="wpeu-licence-popup" style="display:none;">
 		<span class="wpi-notification noti-white">
-			<h3 class="wpeu-licence-title"><?php _e("Licence key",'invoicing');?></h3>
-			<input class="wpeu-licence-key" type="text" placeholder="<?php _e("Enter your licence key",'invoicing');?>"> <button class="button-primary wpeu-licence-popup-button" ><?php _e("Install",'invoicing');?></button>
+			<h3 class="wpeu-licence-title"><?php _e("Licence key", 'invoicing'); ?></h3>
+			<input class="wpeu-licence-key" type="text" placeholder="<?php _e("Enter your licence key", 'invoicing'); ?>"> <button class="button-primary wpeu-licence-popup-button" ><?php _e("Install", 'invoicing'); ?></button>
 			<br>
 			<?php
-			echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
+			echo sprintf(__('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">', '</a>', '<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">', '</a>');
 			?>
 		</span>
 	</div>

Braces +4 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
+		} else{
 			$installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
 			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
@@ -157,14 +157,14 @@ 
 										echo '<a href="'.esc_url(admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug)).'&width=770&height=660&TB_iframe=true" class="thickbox" >';
 										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
 										echo '</a>';
-									}elseif(isset($addon->info->link) && ( substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.com" ) ){
+									} elseif(isset($addon->info->link) && ( substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.com" ) ){
 										if(defined('WP_EASY_UPDATES_ACTIVE')){
 											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpgetpaid.com&TB_iframe=true');
-										}else{
+										} else{
 											// if installed show activation link
 											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
+											} else{
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
 											}
 										}

includes/class-bp-getpaid-component.php

Indentation +129 added lines, -129 removed lines

@@ -17,45 +17,45 @@ 
  */
 class BP_GetPaid_Component extends BP_Component {
 
-	/**
-	 * Start the component setup process.
-	 *
-	 * @since 2.1.5
-	 */
-	public function __construct() {
-		parent::start(
-			'getpaid',
-			'GetPaid',
-			buddypress()->plugin_dir,
-			array(
-				'adminbar_myaccount_order' => 30,
-			)
-		);
-	}
+    /**
+     * Start the component setup process.
+     *
+     * @since 2.1.5
+     */
+    public function __construct() {
+        parent::start(
+            'getpaid',
+            'GetPaid',
+            buddypress()->plugin_dir,
+            array(
+                'adminbar_myaccount_order' => 30,
+            )
+        );
+    }
 
     /**
-	 * Set up component global variables.
-	 *
-	 * @since 2.1.5
-	 *
-	 *
-	 * @param array $args {
-	 *     All values are optional.
-	 *     @type string   $slug                  The component slug. Used to construct certain URLs, such as 'friends' in
-	 *                                           http://example.com/members/joe/friends/. Default: the value of $this->id.
-	 *     @type string   $root_slug             The component root slug. Note that this value is generally unused if the
-	 *                                           component has a root directory (the slug will be overridden by the
-	 *                                           post_name of the directory page). Default: the slug of the directory page
-	 *                                           if one is found, otherwise an empty string.
-	 *     @type bool     $has_directory         Set to true if the component requires an associated WordPress page.
-	 *     @type callable $notification_callback Optional. The callable function that formats the component's notifications.
-	 *     @type string   $search_term           Optional. The placeholder text in the component directory search box. Eg,
-	 *                                           'Search Groups...'.
-	 *     @type array    $global_tables         Optional. An array of database table names.
-	 *     @type array    $meta_tables           Optional. An array of metadata table names.
-	 * }
-	 */
-	public function setup_globals( $args = array() ) {
+     * Set up component global variables.
+     *
+     * @since 2.1.5
+     *
+     *
+     * @param array $args {
+     *     All values are optional.
+     *     @type string   $slug                  The component slug. Used to construct certain URLs, such as 'friends' in
+     *                                           http://example.com/members/joe/friends/. Default: the value of $this->id.
+     *     @type string   $root_slug             The component root slug. Note that this value is generally unused if the
+     *                                           component has a root directory (the slug will be overridden by the
+     *                                           post_name of the directory page). Default: the slug of the directory page
+     *                                           if one is found, otherwise an empty string.
+     *     @type bool     $has_directory         Set to true if the component requires an associated WordPress page.
+     *     @type callable $notification_callback Optional. The callable function that formats the component's notifications.
+     *     @type string   $search_term           Optional. The placeholder text in the component directory search box. Eg,
+     *                                           'Search Groups...'.
+     *     @type array    $global_tables         Optional. An array of database table names.
+     *     @type array    $meta_tables           Optional. An array of metadata table names.
+     * }
+     */
+    public function setup_globals( $args = array() ) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -64,21 +64,21 @@ 
                 'has_directory' => false
             )
         );
-	}
-
-	/**
-	 * Set up component navigation.
-	 *
-	 * @since 2.1.5
-	 *
-	 * @see BP_Component::setup_nav() for a description of arguments.
-	 *
-	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
-	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
-	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Abort if the integration is inactive.
+    }
+
+    /**
+     * Set up component navigation.
+     *
+     * @since 2.1.5
+     *
+     * @see BP_Component::setup_nav() for a description of arguments.
+     *
+     * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
+     * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
+     */
+    public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+
+        // Abort if the integration is inactive.
         if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
             return;
         }
@@ -88,25 +88,25 @@ 
             return;
         }
 
-		// Determine user to use.
-		$user_domain   = bp_loggedin_user_domain();
-		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
-
-		// Add 'Payments' to the main navigation.
-		$main_nav = array(
-			'name'                => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
-			'slug'                => $slug,
-			'position'            => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'     => array( $this, 'display_current_tab' ),
-			'default_subnav_slug' => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+        // Determine user to use.
+        $user_domain   = bp_loggedin_user_domain();
+        $slug          = 'getpaid';
+        $payments_link = trailingslashit( $user_domain . $slug );
+
+        // Add 'Payments' to the main navigation.
+        $main_nav = array(
+            'name'                => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+            'slug'                => $slug,
+            'position'            => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
+            'screen_function'     => array( $this, 'display_current_tab' ),
+            'default_subnav_slug' => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
             'show_for_displayed_user' => false,
-			'item_css_id'         => $this->id,
-			'parent_url'          => $user_domain,
-			'parent_slug'         => buddypress()->slug,
-		);
+            'item_css_id'         => $this->id,
+            'parent_url'          => $user_domain,
+            'parent_slug'         => buddypress()->slug,
+        );
 
-		// Add the subnav items to the payments nav item if we are using a theme that supports this.
+        // Add the subnav items to the payments nav item if we are using a theme that supports this.
         foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
 
             $sub_nav[] = array(
@@ -116,8 +116,8 @@ 
                 'parent_slug'     => $slug,
                 'position' => 10,
                 'screen_function'        => function() use ( $tab ) {
-					$GLOBALS['getpaid_bp_current_tab'] = $tab;
-					$this->display_current_tab();
+                    $GLOBALS['getpaid_bp_current_tab'] = $tab;
+                    $this->display_current_tab();
                 },
                 'show_for_displayed_user' => false,
                 'item_css_id'             => "getpaid-bp-$_slug",
@@ -125,27 +125,27 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
-	}
-
-	/**
-	 * Set up the component entries in the WordPress Admin Bar.
-	 *
-	 * @since 2.1.5
-	 *
-	 * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
-	 *      parameter array.
-	 *
-	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
-	 *                            description.
-	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
-
-		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
+        parent::setup_nav( $main_nav, $sub_nav );
+    }
 
-			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+    /**
+     * Set up the component entries in the WordPress Admin Bar.
+     *
+     * @since 2.1.5
+     *
+     * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
+     *      parameter array.
+     *
+     * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
+     *                            description.
+     */
+    public function setup_admin_bar( $wp_admin_nav = array() ) {
+
+        // Menus for logged in user.
+        if ( is_user_logged_in() ) {
+
+            // Setup the logged in user variables.
+            $payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
@@ -167,50 +167,50 @@ 
 
             }
 
-		}
-
-		parent::setup_admin_bar( $wp_admin_nav );
-	}
+        }
 
-	/**
-	 * Retrieves the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function get_current_tab() {
-		global $getpaid_bp_current_tab;
+        parent::setup_admin_bar( $wp_admin_nav );
+    }
 
-		if ( empty( $getpaid_bp_current_tab ) ) {
-			return array(
-				'label'     => __( 'Invoices', 'invoicing' ),
-				'content'   => '[wpinv_history]',
-				'icon'      => 'fas fa-file-invoice',
-			);
-		}
+    /**
+     * Retrieves the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function get_current_tab() {
+        global $getpaid_bp_current_tab;
+
+        if ( empty( $getpaid_bp_current_tab ) ) {
+            return array(
+                'label'     => __( 'Invoices', 'invoicing' ),
+                'content'   => '[wpinv_history]',
+                'icon'      => 'fas fa-file-invoice',
+            );
+        }
 
-		return $getpaid_bp_current_tab;
-	}
+        return $getpaid_bp_current_tab;
+    }
 
-	/**
-	 * Displays the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function display_current_tab() {
+    /**
+     * Displays the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function display_current_tab() {
 
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+        add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
+        $template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
 
         bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
-	}
-
-	/**
-	 * Handles the actual display of the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function handle_display_current_tab() {
-		 getpaid_prepare_user_content_tab( $this->get_current_tab() );
-	}
+    }
+
+    /**
+     * Handles the actual display of the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function handle_display_current_tab() {
+            getpaid_prepare_user_content_tab( $this->get_current_tab() );
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main GetPaid Class.
@@ -55,7 +55,7 @@ 
 	 *     @type array    $meta_tables           Optional. An array of metadata table names.
 	 * }
 	 */
-	public function setup_globals( $args = array() ) {
+	public function setup_globals($args = array()) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -76,30 +76,30 @@ 
 	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
 	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
 	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+	public function setup_nav($main_nav = array(), $sub_nav = array()) {
 
 		// Abort if the integration is inactive.
-        if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
+        if (!getpaid_is_buddypress_integration_active() || !is_user_logged_in()) {
             return;
         }
     
         // Or a user is not viewing their profile.
-        if ( bp_displayed_user_id() != bp_loggedin_user_id() ) {
+        if (bp_displayed_user_id() != bp_loggedin_user_id()) {
             return;
         }
 
 		// Determine user to use.
 		$user_domain   = bp_loggedin_user_domain();
 		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
+		$payments_link = trailingslashit($user_domain . $slug);
 
 		// Add 'Payments' to the main navigation.
 		$main_nav = array(
-			'name'                => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+			'name'                => _x('Billing', 'BuddyPress profile payments screen nav', 'invoicing'),
 			'slug'                => $slug,
-			'position'            => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'     => array( $this, 'display_current_tab' ),
-			'default_subnav_slug' => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+			'position'            => apply_filters('wpinv_bp_nav_position', wpinv_get_option('wpinv_menu_position', 91), $slug),
+			'screen_function'     => array($this, 'display_current_tab'),
+			'default_subnav_slug' => apply_filters('getpaid_default_tab', 'gp-edit-address'),
             'show_for_displayed_user' => false,
 			'item_css_id'         => $this->id,
 			'parent_url'          => $user_domain,
@@ -107,15 +107,15 @@ 
 		);
 
 		// Add the subnav items to the payments nav item if we are using a theme that supports this.
-        foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
+        foreach (getpaid_get_user_content_tabs() as $_slug => $tab) {
 
             $sub_nav[] = array(
-                'name'            => $tab[ 'label'],
+                'name'            => $tab['label'],
                 'slug'            => $_slug,
                 'parent_url'      => $payments_link,
                 'parent_slug'     => $slug,
                 'position' => 10,
-                'screen_function'        => function() use ( $tab ) {
+                'screen_function'        => function() use ($tab) {
 					$GLOBALS['getpaid_bp_current_tab'] = $tab;
 					$this->display_current_tab();
                 },
@@ -125,7 +125,7 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
+		parent::setup_nav($main_nav, $sub_nav);
 	}
 
 	/**
@@ -139,29 +139,29 @@ 
 	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
 	 *                            description.
 	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
+	public function setup_admin_bar($wp_admin_nav = array()) {
 
 		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 
 			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+			$payments_link = trailingslashit(bp_loggedin_user_domain() . 'getpaid/');
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
                 'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-getpaid',
-                'title'  => _x( 'Billing', 'BuddyPress my account payments sub nav', 'invoicing' ),
-                'href'   => $payments_link . apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+                'title'  => _x('Billing', 'BuddyPress my account payments sub nav', 'invoicing'),
+                'href'   => $payments_link . apply_filters('getpaid_default_tab', 'gp-edit-address'),
             );
 
-            foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+            foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-getpaid',
                     'id'       => 'my-account-getpaid' . $slug,
-                    'title'    => $tab[ 'label'],
-                    'href'     => trailingslashit( $payments_link . $slug ),
+                    'title'    => $tab['label'],
+                    'href'     => trailingslashit($payments_link . $slug),
                     'position' => 20
                 );
 
@@ -169,7 +169,7 @@ 
 
 		}
 
-		parent::setup_admin_bar( $wp_admin_nav );
+		parent::setup_admin_bar($wp_admin_nav);
 	}
 
 	/**
@@ -180,9 +180,9 @@ 
 	public function get_current_tab() {
 		global $getpaid_bp_current_tab;
 
-		if ( empty( $getpaid_bp_current_tab ) ) {
+		if (empty($getpaid_bp_current_tab)) {
 			return array(
-				'label'     => __( 'Invoices', 'invoicing' ),
+				'label'     => __('Invoices', 'invoicing'),
 				'content'   => '[wpinv_history]',
 				'icon'      => 'fas fa-file-invoice',
 			);
@@ -198,10 +198,10 @@ 
 	 */
 	public function display_current_tab() {
 
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+		add_action('bp_template_content', array($this, 'handle_display_current_tab'));
+		$template = apply_filters('bp_core_template_plugin', 'members/single/plugins');
 
-        bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
+        bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template));
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 * @since 2.1.5
 	 */
 	public function handle_display_current_tab() {
-		 getpaid_prepare_user_content_tab( $this->get_current_tab() );
+		 getpaid_prepare_user_content_tab($this->get_current_tab());
 	}
 
 }

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

Indentation +133 added lines, -133 removed lines

@@ -12,43 +12,43 @@ 
  */
 class GetPaid_Reports_Report_Earnings extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * Retrieves the earning graphs.
-	 *
-	 */
-	public function get_graphs() {
+    /**
+     * Retrieves the earning graphs.
+     *
+     */
+    public function get_graphs() {
 
-		$graphs = array(
+        $graphs = array(
 
             'total'      => __( 'Earnings', 'invoicing' ),
             'discount'   => __( 'Discount', 'invoicing' ),
-			'fees_total' => __( 'Fees', 'invoicing' ),
-			'tax'        => __( 'Tax', 'invoicing' ),
+            'fees_total' => __( 'Fees', 'invoicing' ),
+            'tax'        => __( 'Tax', 'invoicing' ),
 
-		);
+        );
 
-		return apply_filters( 'getpaid_earning_graphs', $graphs );
+        return apply_filters( 'getpaid_earning_graphs', $graphs );
 
-	}
+    }
 
-	/**
-	 * Retrieves the earning sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
+    /**
+     * Retrieves the earning sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
 
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-		$graphs     = array_keys( $this->get_graphs() );
-		$graphs_sql = array();
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $clauses    = $this->get_range_sql( $range );
+        $graphs     = array_keys( $this->get_graphs() );
+        $graphs_sql = array();
 
-		foreach ( $graphs as $graph ) {
-			$graphs_sql[] = "SUM( meta.$graph ) AS $graph";
-		}
+        foreach ( $graphs as $graph ) {
+            $graphs_sql[] = "SUM( meta.$graph ) AS $graph";
+        }
 
-		$graphs_sql = implode( ', ', $graphs_sql );
-		$sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
+        $graphs_sql = implode( ', ', $graphs_sql );
+        $sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
             FROM $wpdb->posts
             LEFT JOIN $table as meta ON meta.post_id = $wpdb->posts.ID
             WHERE meta.post_id IS NOT NULL
@@ -58,94 +58,94 @@ 
             GROUP BY {$clauses[0]}
         ";
 
-		return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
-
-	}
-
-	/**
-	 * Prepares the report stats.
-	 *
-	 */
-	public function prepare_stats() {
-		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-	}
-
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels( $range ) {
-
-		$labels = array(
-			'today'     => $this->get_hours_in_a_day(),
-			'yesterday' => $this->get_hours_in_a_day(),
-			'7_days'    => $this->get_days_in_period( 7 ),
-			'30_days'   => $this->get_days_in_period( 30 ),
-			'60_days'   => $this->get_days_in_period( 60 ),
-			'90_days'   => $this->get_weeks_in_period( 90 ),
-			'180_days'  => $this->get_weeks_in_period( 180 ),
-			'360_days'  => $this->get_weeks_in_period( 360 ),
-		);
-
-		$label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels[ '7_days' ];
-		return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
-	}
-
-	/**
-	 * Retrieves report datasets.
-	 *
-	 */
-	public function get_datasets( $labels ) {
-
-		$datasets = array();
-
-		foreach ( $this->get_graphs() as $key => $label ) {
-			$datasets[ $key ] = array(
-				'label' => $label,
-				'data'  => $this->get_data( $key, $labels )
-			);
-		}
-
-		return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
-	}
-
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data( $key, $labels ) {
-
-		$data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
-		$prepared = array();
-
-		foreach ( $labels as $label ) {
-
-			$value = 0;
-			if ( isset( $data[ $label ] ) ) {
-				$value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
-			}
-
-			$prepared[] = $value;
-		}
-
-		return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
-
-	}
-
-	/**
-	 * Displays the report card.
-	 *
-	 */
-	public function display() {
-
-		$labels     = $this->get_labels( $this->get_range() );
-		$chart_data = array(
-			'labels'   => array_values( $labels ),
-			'datasets' => $this->get_datasets( array_keys( $labels ) ),
-		);
-
-		?>
+        return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
+
+    }
+
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+    }
+
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels( $range ) {
+
+        $labels = array(
+            'today'     => $this->get_hours_in_a_day(),
+            'yesterday' => $this->get_hours_in_a_day(),
+            '7_days'    => $this->get_days_in_period( 7 ),
+            '30_days'   => $this->get_days_in_period( 30 ),
+            '60_days'   => $this->get_days_in_period( 60 ),
+            '90_days'   => $this->get_weeks_in_period( 90 ),
+            '180_days'  => $this->get_weeks_in_period( 180 ),
+            '360_days'  => $this->get_weeks_in_period( 360 ),
+        );
+
+        $label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels[ '7_days' ];
+        return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
+    }
+
+    /**
+     * Retrieves report datasets.
+     *
+     */
+    public function get_datasets( $labels ) {
+
+        $datasets = array();
+
+        foreach ( $this->get_graphs() as $key => $label ) {
+            $datasets[ $key ] = array(
+                'label' => $label,
+                'data'  => $this->get_data( $key, $labels )
+            );
+        }
+
+        return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
+    }
+
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data( $key, $labels ) {
+
+        $data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
+        $prepared = array();
+
+        foreach ( $labels as $label ) {
+
+            $value = 0;
+            if ( isset( $data[ $label ] ) ) {
+                $value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
+            }
+
+            $prepared[] = $value;
+        }
+
+        return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
+
+    }
+
+    /**
+     * Displays the report card.
+     *
+     */
+    public function display() {
+
+        $labels     = $this->get_labels( $this->get_range() );
+        $chart_data = array(
+            'labels'   => array_values( $labels ),
+            'datasets' => $this->get_datasets( array_keys( $labels ) ),
+        );
+
+        ?>
 
 			<?php foreach ( $chart_data['datasets'] as $key => $dataset ) : ?>
 				<div class="row mb-4">
@@ -165,15 +165,15 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_graph( $key, $dataset, $labels ) {
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_graph( $key, $dataset, $labels ) {
 
-		?>
+        ?>
 
 		<canvas id="getpaid-chartjs-earnings-<?php echo esc_attr( $key ); ?>"></canvas>
 
@@ -223,20 +223,20 @@ 
 		</script>
 
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {}
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {}
 
-	/**
-	 * Displays the range selector.
-	 *
-	 */
-	public function display_range_selector() {
+    /**
+     * Displays the range selector.
+     *
+     */
+    public function display_range_selector() {
 
-	}
+    }
 
 }

Spacing +45 added lines, -45 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Earnings Class.
@@ -20,14 +20,14 @@ 
 
 		$graphs = array(
 
-            'total'      => __( 'Earnings', 'invoicing' ),
-            'discount'   => __( 'Discount', 'invoicing' ),
-			'fees_total' => __( 'Fees', 'invoicing' ),
-			'tax'        => __( 'Tax', 'invoicing' ),
+            'total'      => __('Earnings', 'invoicing'),
+            'discount'   => __('Discount', 'invoicing'),
+			'fees_total' => __('Fees', 'invoicing'),
+			'tax'        => __('Tax', 'invoicing'),
 
 		);
 
-		return apply_filters( 'getpaid_earning_graphs', $graphs );
+		return apply_filters('getpaid_earning_graphs', $graphs);
 
 	}
 
@@ -35,19 +35,19 @@ 
 	 * Retrieves the earning sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-		$graphs     = array_keys( $this->get_graphs() );
+		$clauses    = $this->get_range_sql($range);
+		$graphs     = array_keys($this->get_graphs());
 		$graphs_sql = array();
 
-		foreach ( $graphs as $graph ) {
+		foreach ($graphs as $graph) {
 			$graphs_sql[] = "SUM( meta.$graph ) AS $graph";
 		}
 
-		$graphs_sql = implode( ', ', $graphs_sql );
+		$graphs_sql = implode(', ', $graphs_sql);
 		$sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
             FROM $wpdb->posts
             LEFT JOIN $table as meta ON meta.post_id = $wpdb->posts.ID
@@ -58,7 +58,7 @@ 
             GROUP BY {$clauses[0]}
         ";
 
-		return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_earning_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -68,68 +68,68 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
 	}
 
 	/**
 	 * Retrieves report labels.
 	 *
 	 */
-	public function get_labels( $range ) {
+	public function get_labels($range) {
 
 		$labels = array(
 			'today'     => $this->get_hours_in_a_day(),
 			'yesterday' => $this->get_hours_in_a_day(),
-			'7_days'    => $this->get_days_in_period( 7 ),
-			'30_days'   => $this->get_days_in_period( 30 ),
-			'60_days'   => $this->get_days_in_period( 60 ),
-			'90_days'   => $this->get_weeks_in_period( 90 ),
-			'180_days'  => $this->get_weeks_in_period( 180 ),
-			'360_days'  => $this->get_weeks_in_period( 360 ),
+			'7_days'    => $this->get_days_in_period(7),
+			'30_days'   => $this->get_days_in_period(30),
+			'60_days'   => $this->get_days_in_period(60),
+			'90_days'   => $this->get_weeks_in_period(90),
+			'180_days'  => $this->get_weeks_in_period(180),
+			'360_days'  => $this->get_weeks_in_period(360),
 		);
 
-		$label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels[ '7_days' ];
-		return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
+		$label = isset($labels[$range]) ? $labels[$range] : $labels['7_days'];
+		return apply_filters('getpaid_earning_graphs_get_labels', $label, $range);
 	}
 
 	/**
 	 * Retrieves report datasets.
 	 *
 	 */
-	public function get_datasets( $labels ) {
+	public function get_datasets($labels) {
 
 		$datasets = array();
 
-		foreach ( $this->get_graphs() as $key => $label ) {
-			$datasets[ $key ] = array(
+		foreach ($this->get_graphs() as $key => $label) {
+			$datasets[$key] = array(
 				'label' => $label,
-				'data'  => $this->get_data( $key, $labels )
+				'data'  => $this->get_data($key, $labels)
 			);
 		}
 
-		return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
+		return apply_filters('getpaid_earning_graphs_get_datasets', $datasets, $labels);
 	}
 
 	/**
 	 * Retrieves report data.
 	 *
 	 */
-	public function get_data( $key, $labels ) {
+	public function get_data($key, $labels) {
 
-		$data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
+		$data     = wp_list_pluck($this->stats, $key, 'completed_date');
 		$prepared = array();
 
-		foreach ( $labels as $label ) {
+		foreach ($labels as $label) {
 
 			$value = 0;
-			if ( isset( $data[ $label ] ) ) {
-				$value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
+			if (isset($data[$label])) {
+				$value = wpinv_round_amount(wpinv_sanitize_amount($data[$label]));
 			}
 
 			$prepared[] = $value;
 		}
 
-		return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
+		return apply_filters('getpaid_earning_graphs_get_data', $prepared, $key, $labels);
 
 	}
 
@@ -139,24 +139,24 @@ 
 	 */
 	public function display() {
 
-		$labels     = $this->get_labels( $this->get_range() );
+		$labels     = $this->get_labels($this->get_range());
 		$chart_data = array(
-			'labels'   => array_values( $labels ),
-			'datasets' => $this->get_datasets( array_keys( $labels ) ),
+			'labels'   => array_values($labels),
+			'datasets' => $this->get_datasets(array_keys($labels)),
 		);
 
 		?>
 
-			<?php foreach ( $chart_data['datasets'] as $key => $dataset ) : ?>
+			<?php foreach ($chart_data['datasets'] as $key => $dataset) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0" style="max-width:100%">
 							<div class="card-header d-flex align-items-center">
-								<strong class="flex-grow-1"><?php echo esc_html( $dataset['label'] ); ?></strong>
+								<strong class="flex-grow-1"><?php echo esc_html($dataset['label']); ?></strong>
 								<?php $this->display_range_selector(); ?>
 							</div>
 							<div class="card-body">
-								<?php $this->display_graph( $key, $dataset, $chart_data['labels'] ); ?>
+								<?php $this->display_graph($key, $dataset, $chart_data['labels']); ?>
 							</div>
 						</div>
 					</div>
@@ -171,26 +171,26 @@ 
 	 * Displays the actual report.
 	 *
 	 */
-	public function display_graph( $key, $dataset, $labels ) {
+	public function display_graph($key, $dataset, $labels) {
 
 		?>
 
-		<canvas id="getpaid-chartjs-earnings-<?php echo esc_attr( $key ); ?>"></canvas>
+		<canvas id="getpaid-chartjs-earnings-<?php echo esc_attr($key); ?>"></canvas>
 
 		<script>
 			window.addEventListener( 'DOMContentLoaded', function() {
 
-				var ctx = document.getElementById( 'getpaid-chartjs-earnings-<?php echo esc_attr( $key ); ?>' ).getContext('2d');
+				var ctx = document.getElementById( 'getpaid-chartjs-earnings-<?php echo esc_attr($key); ?>' ).getContext('2d');
 				new Chart(
 					ctx,
 					{
 						type: 'line',
 						data: {
-							'labels': <?php echo wp_json_encode( wpinv_clean( $labels ) ); ?>,
+							'labels': <?php echo wp_json_encode(wpinv_clean($labels)); ?>,
 							'datasets': [
 								{
-									label: '<?php echo esc_attr( $dataset['label'] ); ?>',
-									data: <?php echo wp_json_encode( wpinv_clean( $dataset['data'] ) ); ?>,
+									label: '<?php echo esc_attr($dataset['label']); ?>',
+									data: <?php echo wp_json_encode(wpinv_clean($dataset['data'])); ?>,
 									backgroundColor: 'rgba(54, 162, 235, 0.1)',
 									borderColor: 'rgb(54, 162, 235)',
 									borderWidth: 4,

includes/reports/class-getpaid-reports.php

Indentation +102 added lines, -102 removed lines

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

Spacing +31 added lines, -31 removed lines

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

vendor/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php

Indentation +403 added lines, -403 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,300 +21,300 @@ 
  */
 if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class WP_Font_Awesome_Settings
-	 * @since 1.0.10 Now able to pass wp.org theme check.
-	 * @since 1.0.11 Font Awesome Pro now supported.
-	 * @since 1.0.11 Font Awesome Kits now supported.
-	 * @since 1.0.13 RTL language support added.
-	 * @ver 1.0.13
-	 * @todo decide how to implement textdomain
-	 */
-	class WP_Font_Awesome_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '1.0.13';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'font-awesome-settings';
-
-		/**
-		 * Latest version of Font Awesome at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "5.8.2";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'Font Awesome';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * WP_Font_Awesome_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    WP_Font_Awesome_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-		/**
-		 * Main WP_Font_Awesome_Settings Instance.
-		 *
-		 * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return WP_Font_Awesome_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
-				self::$instance = new WP_Font_Awesome_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-				}
-
-				do_action( 'wp_font_awesome_settings_loaded' );
-			}
-
-			return self::$instance;
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 *
-		 * @since 1.0.8 Settings name wrong - FIXED
-		 */
-		public function init() {
-			$this->settings = $this->get_settings();
-
-			if ( $this->settings['type'] == 'CSS' ) {
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-				}
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-				}
-
-			} else {
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-				}
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-				}
-			}
-
-			// remove font awesome if set to do so
-			if ( $this->settings['dequeue'] == '1' ) {
-				add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
-			}
-
-		}
-
-		/**
-		 * Adds the Font Awesome styles.
-		 */
-		public function enqueue_style() {
-			// build url
-			$url = $this->get_url();
-
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), null );
-			wp_enqueue_style( 'font-awesome' );
-
-			// RTL language support CSS.
-			if ( is_rtl() ) {
-				wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
-			}
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_style( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
-			// build url
-			$url = $this->get_url();
-
-			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Get the url of the Font Awesome files.
-		 *
-		 * @param bool $shims If this is a shim file or not.
-		 *
-		 * @return string The url to the file.
-		 */
-		public function get_url( $shims = false ) {
-			$script  = $shims ? 'v4-shims' : 'all';
-			$sub     = $this->settings['pro'] ? 'pro' : 'use';
-			$type    = $this->settings['type'];
-			$version = $this->settings['version'];
-			$kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
-			$url     = '';
-
-			if ( $type == 'KIT' && $kit_url ) {
-				if ( $shims ) {
-					// if its a kit then we don't add shims here
-					return '';
-				}
-				$url .= $kit_url; // CDN
-				$url .= "?wpfas=true"; // set our var so our version is not removed
-			} else {
-				$url .= "https://$sub.fontawesome.com/releases/"; // CDN
-				$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
-				$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
-				$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
-				$url .= "?wpfas=true"; // set our var so our version is not removed
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Try and remove any other versions of Font Awesome added by other plugins/themes.
-		 *
-		 * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
-		 *
-		 * @param $url
-		 * @param $original_url
-		 * @param $_context
-		 *
-		 * @return string The filtered url.
-		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
-
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
-			) {// it's a font-awesome-url (probably)
-
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
-							$url .= "' data-search-pseudo-elements defer='defer";
-						} else {
-							$url .= "' defer='defer";
-						}
-					}
-				} else {
-					$url = ''; // removing the url removes the file
-				}
-
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-
-			$db_settings = get_option( 'wp-font-awesome-settings' );
-
-			$defaults = array(
-				'type'      => 'CSS', // type to use, CSS or JS or KIT
-				'version'   => '', // latest
-				'enqueue'   => '', // front and backend
-				'shims'     => '0', // default OFF now in 2020
-				'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
-				'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
-				'pro'       => '0', // if pro CDN url should be used
-				'kit-url'   => '', // the kit url
-			);
-
-			$settings = wp_parse_args( $db_settings, $defaults );
-
-			/**
-			 * Filter the Font Awesome settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
-		}
-
-
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'font-awesome-settings' ) );
-			}
-
-			// a hidden way to force the update of the version number via api instead of waiting the 48 hours
-			if ( isset( $_REQUEST['force-version-check'] ) ) {
-				$this->get_latest_version( $force_api = true );
-			}
-			?>
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class WP_Font_Awesome_Settings
+     * @since 1.0.10 Now able to pass wp.org theme check.
+     * @since 1.0.11 Font Awesome Pro now supported.
+     * @since 1.0.11 Font Awesome Kits now supported.
+     * @since 1.0.13 RTL language support added.
+     * @ver 1.0.13
+     * @todo decide how to implement textdomain
+     */
+    class WP_Font_Awesome_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '1.0.13';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'font-awesome-settings';
+
+        /**
+         * Latest version of Font Awesome at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "5.8.2";
+
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'Font Awesome';
+
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
+
+        /**
+         * WP_Font_Awesome_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    WP_Font_Awesome_Settings There can be only one!
+         */
+        private static $instance = null;
+
+        /**
+         * Main WP_Font_Awesome_Settings Instance.
+         *
+         * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return WP_Font_Awesome_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+                self::$instance = new WP_Font_Awesome_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+                }
+
+                do_action( 'wp_font_awesome_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         *
+         * @since 1.0.8 Settings name wrong - FIXED
+         */
+        public function init() {
+            $this->settings = $this->get_settings();
+
+            if ( $this->settings['type'] == 'CSS' ) {
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                }
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                }
+
+            } else {
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                }
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                }
+            }
+
+            // remove font awesome if set to do so
+            if ( $this->settings['dequeue'] == '1' ) {
+                add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+            }
+
+        }
+
+        /**
+         * Adds the Font Awesome styles.
+         */
+        public function enqueue_style() {
+            // build url
+            $url = $this->get_url();
+
+            wp_deregister_style( 'font-awesome' ); // deregister in case its already there
+            wp_register_style( 'font-awesome', $url, array(), null );
+            wp_enqueue_style( 'font-awesome' );
+
+            // RTL language support CSS.
+            if ( is_rtl() ) {
+                wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
+            }
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_style( 'font-awesome-shims', $url, array(), null );
+                wp_enqueue_style( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
+            // build url
+            $url = $this->get_url();
+
+            $deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
+            call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
+            wp_register_script( 'font-awesome', $url, array(), null );
+            wp_enqueue_script( 'font-awesome' );
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_script( 'font-awesome-shims', $url, array(), null );
+                wp_enqueue_script( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Get the url of the Font Awesome files.
+         *
+         * @param bool $shims If this is a shim file or not.
+         *
+         * @return string The url to the file.
+         */
+        public function get_url( $shims = false ) {
+            $script  = $shims ? 'v4-shims' : 'all';
+            $sub     = $this->settings['pro'] ? 'pro' : 'use';
+            $type    = $this->settings['type'];
+            $version = $this->settings['version'];
+            $kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
+            $url     = '';
+
+            if ( $type == 'KIT' && $kit_url ) {
+                if ( $shims ) {
+                    // if its a kit then we don't add shims here
+                    return '';
+                }
+                $url .= $kit_url; // CDN
+                $url .= "?wpfas=true"; // set our var so our version is not removed
+            } else {
+                $url .= "https://$sub.fontawesome.com/releases/"; // CDN
+                $url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+                $url .= $type == 'CSS' ? 'css/' : 'js/'; // type
+                $url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
+                $url .= "?wpfas=true"; // set our var so our version is not removed
+            }
+
+            return $url;
+        }
+
+        /**
+         * Try and remove any other versions of Font Awesome added by other plugins/themes.
+         *
+         * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
+         *
+         * @param $url
+         * @param $original_url
+         * @param $_context
+         *
+         * @return string The filtered url.
+         */
+        public function remove_font_awesome( $url, $original_url, $_context ) {
+
+            if ( $_context == 'display'
+                 && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
+                 && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+            ) {// it's a font-awesome-url (probably)
+
+                if ( strstr( $url, "wpfas=true" ) !== false ) {
+                    if ( $this->settings['type'] == 'JS' ) {
+                        if ( $this->settings['js-pseudo'] ) {
+                            $url .= "' data-search-pseudo-elements defer='defer";
+                        } else {
+                            $url .= "' defer='defer";
+                        }
+                    }
+                } else {
+                    $url = ''; // removing the url removes the file
+                }
+
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+            call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+
+            $db_settings = get_option( 'wp-font-awesome-settings' );
+
+            $defaults = array(
+                'type'      => 'CSS', // type to use, CSS or JS or KIT
+                'version'   => '', // latest
+                'enqueue'   => '', // front and backend
+                'shims'     => '0', // default OFF now in 2020
+                'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
+                'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
+                'pro'       => '0', // if pro CDN url should be used
+                'kit-url'   => '', // the kit url
+            );
+
+            $settings = wp_parse_args( $db_settings, $defaults );
+
+            /**
+             * Filter the Font Awesome settings.
+             *
+             * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+        }
+
+
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'You do not have sufficient permissions to access this page.', 'font-awesome-settings' ) );
+            }
+
+            // a hidden way to force the update of the version number via api instead of waiting the 48 hours
+            if ( isset( $_REQUEST['force-version-check'] ) ) {
+                $this->get_latest_version( $force_api = true );
+            }
+            ?>
 			<style>
 				.wpfas-kit-show {
 					display: none;
@@ -332,10 +332,10 @@ 
 				<h1><?php echo esc_html( $this->name ); ?></h1>
 				<form method="post" action="options.php">
 					<?php
-					settings_fields( 'wp-font-awesome-settings' );
-					do_settings_sections( 'wp-font-awesome-settings' );
-					$kit_set = $this->settings['type'] == 'KIT' ? 'wpfas-kit-set' : '';
-					?>
+                    settings_fields( 'wp-font-awesome-settings' );
+                    do_settings_sections( 'wp-font-awesome-settings' );
+                    $kit_set = $this->settings['type'] == 'KIT' ? 'wpfas-kit-set' : '';
+                    ?>
 					<table class="form-table wpfas-table-settings <?php echo esc_attr( $kit_set ); ?>">
 						<tr valign="top">
 							<th scope="row"><label
@@ -361,12 +361,12 @@ 
 								       value="<?php echo esc_attr( $this->settings['kit-url'] ); ?>"
 								       placeholder="<?php echo 'https://kit.font';echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
 								<span><?php
-									echo sprintf(
-										__( 'Requires a free account with Font Awesome. %sGet kit url%s', 'font-awesome-settings' ),
-										'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
-										'</a>'
-									);
-									?></span>
+                                    echo sprintf(
+                                        __( 'Requires a free account with Font Awesome. %sGet kit url%s', 'font-awesome-settings' ),
+                                        '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
+                                        '</a>'
+                                    );
+                                    ?></span>
 							</td>
 						</tr>
 
@@ -426,14 +426,14 @@ 
 								<input type="checkbox" name="wp-font-awesome-settings[pro]"
 								       value="1" <?php checked( $this->settings['pro'], '1' ); ?> id="wpfas-pro"/>
 								<span><?php
-									echo sprintf(
-										__( 'Requires a subscription. %sLearn more%s %sManage my allowed domains%s', 'font-awesome-settings' ),
-										'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/pro"><i class="fas fa-external-link-alt"></i>',
-										'</a>',
-										'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn"><i class="fas fa-external-link-alt"></i>',
-										'</a>'
-									);
-									?></span>
+                                    echo sprintf(
+                                        __( 'Requires a subscription. %sLearn more%s %sManage my allowed domains%s', 'font-awesome-settings' ),
+                                        '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/pro"><i class="fas fa-external-link-alt"></i>',
+                                        '</a>',
+                                        '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn"><i class="fas fa-external-link-alt"></i>',
+                                        '</a>'
+                                    );
+                                    ?></span>
 							</td>
 						</tr>
 
@@ -476,100 +476,100 @@ 
 
 					</table>
 					<?php
-					submit_button();
-					?>
+                    submit_button();
+                    ?>
 				</form>
 
 				<div id="wpfas-version"><?php echo esc_html( $this->version ); ?></div>
 			</div>
 
 			<?php
-		}
-
-		/**
-		 * Check a version number is valid and if so return it or else return an empty string.
-		 *
-		 * @param $version string The version number to check.
-		 *
-		 * @since 1.0.6
-		 *
-		 * @return string Either a valid version number or an empty string.
-		 */
-		public function validate_version_number( $version ) {
-
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
-				// valid
-			} else {
-				$version = '';// not validated
-			}
-
-			return $version;
-		}
-
-
-		/**
-		 * Get the latest version of Font Awesome.
-		 *
-		 * We check for a cached version and if none we will check for a live version via API and then cache it for 48 hours.
-		 *
-		 * @since 1.0.7
-		 * @return mixed|string The latest version number found.
-		 */
-		public function get_latest_version( $force_api = false ) {
-			$latest_version = $this->latest;
-
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
-
-			if ( $cache === false || $force_api ) { // its not set
-				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
-				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $cache;
-				}
-			}
-
-			return $latest_version;
-		}
-
-		/**
-		 * Get the latest Font Awesome version from the github API.
-		 *
-		 * @since 1.0.7
-		 * @return string The latest version number or `0` on API fail.
-		 */
-		public function get_latest_version_from_api() {
-			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
-					$version = $api_response['tag_name'];
-				}
-			}
-
-			return $version;
-		}
-
-		/**
-		 * Inline CSS for RTL language support.
-		 *
-		 * @since 1.0.13
-		 * @return string Inline CSS.
-		 */
-		public function rtl_inline_css() {
-			$inline_css = '[dir=rtl] .fa-address,[dir=rtl] .fa-address-card,[dir=rtl] .fa-adjust,[dir=rtl] .fa-alarm-clock,[dir=rtl] .fa-align-left,[dir=rtl] .fa-align-right,[dir=rtl] .fa-analytics,[dir=rtl] .fa-angle-double-left,[dir=rtl] .fa-angle-double-right,[dir=rtl] .fa-angle-left,[dir=rtl] .fa-angle-right,[dir=rtl] .fa-arrow-alt-circle-left,[dir=rtl] .fa-arrow-alt-circle-right,[dir=rtl] .fa-arrow-alt-from-left,[dir=rtl] .fa-arrow-alt-from-right,[dir=rtl] .fa-arrow-alt-left,[dir=rtl] .fa-arrow-alt-right,[dir=rtl] .fa-arrow-alt-square-left,[dir=rtl] .fa-arrow-alt-square-right,[dir=rtl] .fa-arrow-alt-to-left,[dir=rtl] .fa-arrow-alt-to-right,[dir=rtl] .fa-arrow-circle-left,[dir=rtl] .fa-arrow-circle-right,[dir=rtl] .fa-arrow-from-left,[dir=rtl] .fa-arrow-from-right,[dir=rtl] .fa-arrow-left,[dir=rtl] .fa-arrow-right,[dir=rtl] .fa-arrow-square-left,[dir=rtl] .fa-arrow-square-right,[dir=rtl] .fa-arrow-to-left,[dir=rtl] .fa-arrow-to-right,[dir=rtl] .fa-balance-scale-left,[dir=rtl] .fa-balance-scale-right,[dir=rtl] .fa-bed,[dir=rtl] .fa-bed-bunk,[dir=rtl] .fa-bed-empty,[dir=rtl] .fa-border-left,[dir=rtl] .fa-border-right,[dir=rtl] .fa-calendar-check,[dir=rtl] .fa-caret-circle-left,[dir=rtl] .fa-caret-circle-right,[dir=rtl] .fa-caret-left,[dir=rtl] .fa-caret-right,[dir=rtl] .fa-caret-square-left,[dir=rtl] .fa-caret-square-right,[dir=rtl] .fa-cart-arrow-down,[dir=rtl] .fa-cart-plus,[dir=rtl] .fa-chart-area,[dir=rtl] .fa-chart-bar,[dir=rtl] .fa-chart-line,[dir=rtl] .fa-chart-line-down,[dir=rtl] .fa-chart-network,[dir=rtl] .fa-chart-pie,[dir=rtl] .fa-chart-pie-alt,[dir=rtl] .fa-chart-scatter,[dir=rtl] .fa-check-circle,[dir=rtl] .fa-check-square,[dir=rtl] .fa-chevron-circle-left,[dir=rtl] .fa-chevron-circle-right,[dir=rtl] .fa-chevron-double-left,[dir=rtl] .fa-chevron-double-right,[dir=rtl] .fa-chevron-left,[dir=rtl] .fa-chevron-right,[dir=rtl] .fa-chevron-square-left,[dir=rtl] .fa-chevron-square-right,[dir=rtl] .fa-clock,[dir=rtl] .fa-file,[dir=rtl] .fa-file-alt,[dir=rtl] .fa-file-archive,[dir=rtl] .fa-file-audio,[dir=rtl] .fa-file-chart-line,[dir=rtl] .fa-file-chart-pie,[dir=rtl] .fa-file-code,[dir=rtl] .fa-file-excel,[dir=rtl] .fa-file-image,[dir=rtl] .fa-file-pdf,[dir=rtl] .fa-file-powerpoint,[dir=rtl] .fa-file-video,[dir=rtl] .fa-file-word,[dir=rtl] .fa-flag,[dir=rtl] .fa-folder,[dir=rtl] .fa-folder-open,[dir=rtl] .fa-hand-lizard,[dir=rtl] .fa-hand-point-down,[dir=rtl] .fa-hand-point-left,[dir=rtl] .fa-hand-point-right,[dir=rtl] .fa-hand-point-up,[dir=rtl] .fa-hand-scissors,[dir=rtl] .fa-image,[dir=rtl] .fa-long-arrow-alt-left,[dir=rtl] .fa-long-arrow-alt-right,[dir=rtl] .fa-long-arrow-left,[dir=rtl] .fa-long-arrow-right,[dir=rtl] .fa-luggage-cart,[dir=rtl] .fa-moon,[dir=rtl] .fa-pencil,[dir=rtl] .fa-pencil-alt,[dir=rtl] .fa-play-circle,[dir=rtl] .fa-project-diagram,[dir=rtl] .fa-quote-left,[dir=rtl] .fa-quote-right,[dir=rtl] .fa-shopping-cart,[dir=rtl] .fa-thumbs-down,[dir=rtl] .fa-thumbs-up,[dir=rtl] .fa-user-chart{filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);transform:scale(-1,1)}[dir=rtl] .fa-spin{animation-direction:reverse}';
-
-			return $inline_css;
-		}
-
-	}
-
-	/**
-	 * Run the class if found.
-	 */
-	WP_Font_Awesome_Settings::instance();
+        }
+
+        /**
+         * Check a version number is valid and if so return it or else return an empty string.
+         *
+         * @param $version string The version number to check.
+         *
+         * @since 1.0.6
+         *
+         * @return string Either a valid version number or an empty string.
+         */
+        public function validate_version_number( $version ) {
+
+            if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+                // valid
+            } else {
+                $version = '';// not validated
+            }
+
+            return $version;
+        }
+
+
+        /**
+         * Get the latest version of Font Awesome.
+         *
+         * We check for a cached version and if none we will check for a live version via API and then cache it for 48 hours.
+         *
+         * @since 1.0.7
+         * @return mixed|string The latest version number found.
+         */
+        public function get_latest_version( $force_api = false ) {
+            $latest_version = $this->latest;
+
+            $cache = get_transient( 'wp-font-awesome-settings-version' );
+
+            if ( $cache === false || $force_api ) { // its not set
+                $api_ver = $this->get_latest_version_from_api();
+                if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $api_ver;
+                    set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+                }
+            } elseif ( $this->validate_version_number( $cache ) ) {
+                if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $cache;
+                }
+            }
+
+            return $latest_version;
+        }
+
+        /**
+         * Get the latest Font Awesome version from the github API.
+         *
+         * @since 1.0.7
+         * @return string The latest version number or `0` on API fail.
+         */
+        public function get_latest_version_from_api() {
+            $version  = "0";
+            $response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
+            if ( ! is_wp_error( $response ) && is_array( $response ) ) {
+                $api_response = json_decode( wp_remote_retrieve_body( $response ), true );
+                if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+                    $version = $api_response['tag_name'];
+                }
+            }
+
+            return $version;
+        }
+
+        /**
+         * Inline CSS for RTL language support.
+         *
+         * @since 1.0.13
+         * @return string Inline CSS.
+         */
+        public function rtl_inline_css() {
+            $inline_css = '[dir=rtl] .fa-address,[dir=rtl] .fa-address-card,[dir=rtl] .fa-adjust,[dir=rtl] .fa-alarm-clock,[dir=rtl] .fa-align-left,[dir=rtl] .fa-align-right,[dir=rtl] .fa-analytics,[dir=rtl] .fa-angle-double-left,[dir=rtl] .fa-angle-double-right,[dir=rtl] .fa-angle-left,[dir=rtl] .fa-angle-right,[dir=rtl] .fa-arrow-alt-circle-left,[dir=rtl] .fa-arrow-alt-circle-right,[dir=rtl] .fa-arrow-alt-from-left,[dir=rtl] .fa-arrow-alt-from-right,[dir=rtl] .fa-arrow-alt-left,[dir=rtl] .fa-arrow-alt-right,[dir=rtl] .fa-arrow-alt-square-left,[dir=rtl] .fa-arrow-alt-square-right,[dir=rtl] .fa-arrow-alt-to-left,[dir=rtl] .fa-arrow-alt-to-right,[dir=rtl] .fa-arrow-circle-left,[dir=rtl] .fa-arrow-circle-right,[dir=rtl] .fa-arrow-from-left,[dir=rtl] .fa-arrow-from-right,[dir=rtl] .fa-arrow-left,[dir=rtl] .fa-arrow-right,[dir=rtl] .fa-arrow-square-left,[dir=rtl] .fa-arrow-square-right,[dir=rtl] .fa-arrow-to-left,[dir=rtl] .fa-arrow-to-right,[dir=rtl] .fa-balance-scale-left,[dir=rtl] .fa-balance-scale-right,[dir=rtl] .fa-bed,[dir=rtl] .fa-bed-bunk,[dir=rtl] .fa-bed-empty,[dir=rtl] .fa-border-left,[dir=rtl] .fa-border-right,[dir=rtl] .fa-calendar-check,[dir=rtl] .fa-caret-circle-left,[dir=rtl] .fa-caret-circle-right,[dir=rtl] .fa-caret-left,[dir=rtl] .fa-caret-right,[dir=rtl] .fa-caret-square-left,[dir=rtl] .fa-caret-square-right,[dir=rtl] .fa-cart-arrow-down,[dir=rtl] .fa-cart-plus,[dir=rtl] .fa-chart-area,[dir=rtl] .fa-chart-bar,[dir=rtl] .fa-chart-line,[dir=rtl] .fa-chart-line-down,[dir=rtl] .fa-chart-network,[dir=rtl] .fa-chart-pie,[dir=rtl] .fa-chart-pie-alt,[dir=rtl] .fa-chart-scatter,[dir=rtl] .fa-check-circle,[dir=rtl] .fa-check-square,[dir=rtl] .fa-chevron-circle-left,[dir=rtl] .fa-chevron-circle-right,[dir=rtl] .fa-chevron-double-left,[dir=rtl] .fa-chevron-double-right,[dir=rtl] .fa-chevron-left,[dir=rtl] .fa-chevron-right,[dir=rtl] .fa-chevron-square-left,[dir=rtl] .fa-chevron-square-right,[dir=rtl] .fa-clock,[dir=rtl] .fa-file,[dir=rtl] .fa-file-alt,[dir=rtl] .fa-file-archive,[dir=rtl] .fa-file-audio,[dir=rtl] .fa-file-chart-line,[dir=rtl] .fa-file-chart-pie,[dir=rtl] .fa-file-code,[dir=rtl] .fa-file-excel,[dir=rtl] .fa-file-image,[dir=rtl] .fa-file-pdf,[dir=rtl] .fa-file-powerpoint,[dir=rtl] .fa-file-video,[dir=rtl] .fa-file-word,[dir=rtl] .fa-flag,[dir=rtl] .fa-folder,[dir=rtl] .fa-folder-open,[dir=rtl] .fa-hand-lizard,[dir=rtl] .fa-hand-point-down,[dir=rtl] .fa-hand-point-left,[dir=rtl] .fa-hand-point-right,[dir=rtl] .fa-hand-point-up,[dir=rtl] .fa-hand-scissors,[dir=rtl] .fa-image,[dir=rtl] .fa-long-arrow-alt-left,[dir=rtl] .fa-long-arrow-alt-right,[dir=rtl] .fa-long-arrow-left,[dir=rtl] .fa-long-arrow-right,[dir=rtl] .fa-luggage-cart,[dir=rtl] .fa-moon,[dir=rtl] .fa-pencil,[dir=rtl] .fa-pencil-alt,[dir=rtl] .fa-play-circle,[dir=rtl] .fa-project-diagram,[dir=rtl] .fa-quote-left,[dir=rtl] .fa-quote-right,[dir=rtl] .fa-shopping-cart,[dir=rtl] .fa-thumbs-down,[dir=rtl] .fa-thumbs-up,[dir=rtl] .fa-user-chart{filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);transform:scale(-1,1)}[dir=rtl] .fa-spin{animation-direction:reverse}';
+
+            return $inline_css;
+        }
+
+    }
+
+    /**
+     * Run the class if found.
+     */
+    WP_Font_Awesome_Settings::instance();
 }
\ No newline at end of file

Spacing +112 added lines, -112 removed lines

@@ -12,14 +12,14 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Only add if the class does not already exist.
  */
-if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
+if (!class_exists('WP_Font_Awesome_Settings')) {
 
 	/**
 	 * A Class to be able to change settings for Font Awesome.
@@ -88,17 +88,17 @@ 
 		 * @return WP_Font_Awesome_Settings - Main instance.
 		 */
 		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+			if (!isset(self::$instance) && !(self::$instance instanceof WP_Font_Awesome_Settings)) {
 				self::$instance = new WP_Font_Awesome_Settings;
 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+				add_action('init', array(self::$instance, 'init')); // set settings
 
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+				if (is_admin()) {
+					add_action('admin_menu', array(self::$instance, 'menu_item'));
+					add_action('admin_init', array(self::$instance, 'register_settings'));
 				}
 
-				do_action( 'wp_font_awesome_settings_loaded' );
+				do_action('wp_font_awesome_settings_loaded');
 			}
 
 			return self::$instance;
@@ -112,30 +112,30 @@ 
 		public function init() {
 			$this->settings = $this->get_settings();
 
-			if ( $this->settings['type'] == 'CSS' ) {
+			if ($this->settings['type'] == 'CSS') {
 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+					add_action('wp_enqueue_scripts', array($this, 'enqueue_style'), 5000);
 				}
 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+					add_action('admin_enqueue_scripts', array($this, 'enqueue_style'), 5000);
 				}
 
 			} else {
 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+					add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
 				}
 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+					add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
 				}
 			}
 
 			// remove font awesome if set to do so
-			if ( $this->settings['dequeue'] == '1' ) {
-				add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+			if ($this->settings['dequeue'] == '1') {
+				add_action('clean_url', array($this, 'remove_font_awesome'), 5000, 3);
 			}
 
 		}
@@ -147,20 +147,20 @@ 
 			// build url
 			$url = $this->get_url();
 
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), null );
-			wp_enqueue_style( 'font-awesome' );
+			wp_deregister_style('font-awesome'); // deregister in case its already there
+			wp_register_style('font-awesome', $url, array(), null);
+			wp_enqueue_style('font-awesome');
 
 			// RTL language support CSS.
-			if ( is_rtl() ) {
-				wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
+			if (is_rtl()) {
+				wp_add_inline_style('font-awesome', $this->rtl_inline_css());
 			}
 
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_style( 'font-awesome-shims' );
+			if ($this->settings['shims']) {
+				$url = $this->get_url(true);
+				wp_deregister_style('font-awesome-shims'); // deregister in case its already there
+				wp_register_style('font-awesome-shims', $url, array(), null);
+				wp_enqueue_style('font-awesome-shims');
 			}
 		}
 
@@ -172,15 +172,15 @@ 
 			$url = $this->get_url();
 
 			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
+			call_user_func($deregister_function, 'font-awesome'); // deregister in case its already there
+			wp_register_script('font-awesome', $url, array(), null);
+			wp_enqueue_script('font-awesome');
+
+			if ($this->settings['shims']) {
+				$url = $this->get_url(true);
+				call_user_func($deregister_function, 'font-awesome-shims'); // deregister in case its already there
+				wp_register_script('font-awesome-shims', $url, array(), null);
+				wp_enqueue_script('font-awesome-shims');
 			}
 		}
 
@@ -191,16 +191,16 @@ 
 		 *
 		 * @return string The url to the file.
 		 */
-		public function get_url( $shims = false ) {
+		public function get_url($shims = false) {
 			$script  = $shims ? 'v4-shims' : 'all';
 			$sub     = $this->settings['pro'] ? 'pro' : 'use';
 			$type    = $this->settings['type'];
 			$version = $this->settings['version'];
-			$kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
+			$kit_url = $this->settings['kit-url'] ? esc_url($this->settings['kit-url']) : '';
 			$url     = '';
 
-			if ( $type == 'KIT' && $kit_url ) {
-				if ( $shims ) {
+			if ($type == 'KIT' && $kit_url) {
+				if ($shims) {
 					// if its a kit then we don't add shims here
 					return '';
 				}
@@ -208,7 +208,7 @@ 
 				$url .= "?wpfas=true"; // set our var so our version is not removed
 			} else {
 				$url .= "https://$sub.fontawesome.com/releases/"; // CDN
-				$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+				$url .= !empty($version) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
 				$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
 				$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
 				$url .= "?wpfas=true"; // set our var so our version is not removed
@@ -228,16 +228,16 @@ 
 		 *
 		 * @return string The filtered url.
 		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
+		public function remove_font_awesome($url, $original_url, $_context) {
 
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+			if ($_context == 'display'
+			     && (strstr($url, "fontawesome") !== false || strstr($url, "font-awesome") !== false)
+			     && (strstr($url, ".js") !== false || strstr($url, ".css") !== false)
 			) {// it's a font-awesome-url (probably)
 
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
+				if (strstr($url, "wpfas=true") !== false) {
+					if ($this->settings['type'] == 'JS') {
+						if ($this->settings['js-pseudo']) {
 							$url .= "' data-search-pseudo-elements defer='defer";
 						} else {
 							$url .= "' defer='defer";
@@ -256,7 +256,7 @@ 
 		 * Register the database settings with WordPress.
 		 */
 		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+			register_setting('wp-font-awesome-settings', 'wp-font-awesome-settings');
 		}
 
 		/**
@@ -265,10 +265,10 @@ 
 		 */
 		public function menu_item() {
 			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
 				$this,
 				'settings_page'
-			) );
+			));
 		}
 
 		/**
@@ -278,7 +278,7 @@ 
 		 */
 		public function get_settings() {
 
-			$db_settings = get_option( 'wp-font-awesome-settings' );
+			$db_settings = get_option('wp-font-awesome-settings');
 
 			$defaults = array(
 				'type'      => 'CSS', // type to use, CSS or JS or KIT
@@ -291,14 +291,14 @@ 
 				'kit-url'   => '', // the kit url
 			);
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+			$settings = wp_parse_args($db_settings, $defaults);
 
 			/**
 			 * Filter the Font Awesome settings.
 			 *
 			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
 			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+			return $this->settings = apply_filters('wp-font-awesome-settings', $settings, $db_settings, $defaults);
 		}
 
 
@@ -306,13 +306,13 @@ 
 		 * The settings page html output.
 		 */
 		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'font-awesome-settings' ) );
+			if (!current_user_can('manage_options')) {
+				wp_die(__('You do not have sufficient permissions to access this page.', 'font-awesome-settings'));
 			}
 
 			// a hidden way to force the update of the version number via api instead of waiting the 48 hours
-			if ( isset( $_REQUEST['force-version-check'] ) ) {
-				$this->get_latest_version( $force_api = true );
+			if (isset($_REQUEST['force-version-check'])) {
+				$this->get_latest_version($force_api = true);
 			}
 			?>
 			<style>
@@ -329,40 +329,40 @@ 
 				}
 			</style>
 			<div class="wrap">
-				<h1><?php echo esc_html( $this->name ); ?></h1>
+				<h1><?php echo esc_html($this->name); ?></h1>
 				<form method="post" action="options.php">
 					<?php
-					settings_fields( 'wp-font-awesome-settings' );
-					do_settings_sections( 'wp-font-awesome-settings' );
+					settings_fields('wp-font-awesome-settings');
+					do_settings_sections('wp-font-awesome-settings');
 					$kit_set = $this->settings['type'] == 'KIT' ? 'wpfas-kit-set' : '';
 					?>
-					<table class="form-table wpfas-table-settings <?php echo esc_attr( $kit_set ); ?>">
+					<table class="form-table wpfas-table-settings <?php echo esc_attr($kit_set); ?>">
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpfas-type"><?php _e( 'Type', 'font-awesome-settings' ); ?></label></th>
+									for="wpfas-type"><?php _e('Type', 'font-awesome-settings'); ?></label></th>
 							<td>
 								<select name="wp-font-awesome-settings[type]" id="wpfas-type"
 								        onchange="if(this.value=='KIT'){jQuery('.wpfas-table-settings').addClass('wpfas-kit-set');}else{jQuery('.wpfas-table-settings').removeClass('wpfas-kit-set');}">
 									<option
-										value="CSS" <?php selected( $this->settings['type'], 'CSS' ); ?>><?php _e( 'CSS (default)', 'font-awesome-settings' ); ?></option>
-									<option value="JS" <?php selected( $this->settings['type'], 'JS' ); ?>>JS</option>
+										value="CSS" <?php selected($this->settings['type'], 'CSS'); ?>><?php _e('CSS (default)', 'font-awesome-settings'); ?></option>
+									<option value="JS" <?php selected($this->settings['type'], 'JS'); ?>>JS</option>
 									<option
-										value="KIT" <?php selected( $this->settings['type'], 'KIT' ); ?>><?php _e( 'Kits (settings managed on fontawesome.com)', 'font-awesome-settings' ); ?></option>
+										value="KIT" <?php selected($this->settings['type'], 'KIT'); ?>><?php _e('Kits (settings managed on fontawesome.com)', 'font-awesome-settings'); ?></option>
 								</select>
 							</td>
 						</tr>
 
 						<tr valign="top" class="wpfas-kit-show">
 							<th scope="row"><label
-									for="wpfas-kit-url"><?php _e( 'Kit URL', 'font-awesome-settings' ); ?></label></th>
+									for="wpfas-kit-url"><?php _e('Kit URL', 'font-awesome-settings'); ?></label></th>
 							<td>
 								<input class="regular-text" id="wpfas-kit-url" type="url"
 								       name="wp-font-awesome-settings[kit-url]"
-								       value="<?php echo esc_attr( $this->settings['kit-url'] ); ?>"
-								       placeholder="<?php echo 'https://kit.font';echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
+								       value="<?php echo esc_attr($this->settings['kit-url']); ?>"
+								       placeholder="<?php echo 'https://kit.font'; echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
 								<span><?php
 									echo sprintf(
-										__( 'Requires a free account with Font Awesome. %sGet kit url%s', 'font-awesome-settings' ),
+										__('Requires a free account with Font Awesome. %sGet kit url%s', 'font-awesome-settings'),
 										'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
 										'</a>'
 									);
@@ -372,31 +372,31 @@ 
 
 						<tr valign="top" class="wpfas-kit-hide">
 							<th scope="row"><label
-									for="wpfas-version"><?php _e( 'Version', 'font-awesome-settings' ); ?></label></th>
+									for="wpfas-version"><?php _e('Version', 'font-awesome-settings'); ?></label></th>
 							<td>
 								<select name="wp-font-awesome-settings[version]" id="wpfas-version">
 									<option
-										value="" <?php selected( $this->settings['version'], '' ); ?>><?php echo sprintf( __( 'Latest - %s (default)', 'font-awesome-settings' ), esc_html( $this->get_latest_version() ) ); ?>
+										value="" <?php selected($this->settings['version'], ''); ?>><?php echo sprintf(__('Latest - %s (default)', 'font-awesome-settings'), esc_html($this->get_latest_version())); ?>
 									</option>
-									<option value="5.6.0" <?php selected( $this->settings['version'], '5.6.0' ); ?>>
+									<option value="5.6.0" <?php selected($this->settings['version'], '5.6.0'); ?>>
 										5.6.0
 									</option>
-									<option value="5.5.0" <?php selected( $this->settings['version'], '5.5.0' ); ?>>
+									<option value="5.5.0" <?php selected($this->settings['version'], '5.5.0'); ?>>
 										5.5.0
 									</option>
-									<option value="5.4.0" <?php selected( $this->settings['version'], '5.4.0' ); ?>>
+									<option value="5.4.0" <?php selected($this->settings['version'], '5.4.0'); ?>>
 										5.4.0
 									</option>
-									<option value="5.3.0" <?php selected( $this->settings['version'], '5.3.0' ); ?>>
+									<option value="5.3.0" <?php selected($this->settings['version'], '5.3.0'); ?>>
 										5.3.0
 									</option>
-									<option value="5.2.0" <?php selected( $this->settings['version'], '5.2.0' ); ?>>
+									<option value="5.2.0" <?php selected($this->settings['version'], '5.2.0'); ?>>
 										5.2.0
 									</option>
-									<option value="5.1.0" <?php selected( $this->settings['version'], '5.1.0' ); ?>>
+									<option value="5.1.0" <?php selected($this->settings['version'], '5.1.0'); ?>>
 										5.1.0
 									</option>
-									<option value="4.7.0" <?php selected( $this->settings['version'], '4.7.0' ); ?>>
+									<option value="4.7.0" <?php selected($this->settings['version'], '4.7.0'); ?>>
 										4.7.1 (CSS only)
 									</option>
 								</select>
@@ -405,29 +405,29 @@ 
 
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpfas-enqueue"><?php _e( 'Enqueue', 'font-awesome-settings' ); ?></label></th>
+									for="wpfas-enqueue"><?php _e('Enqueue', 'font-awesome-settings'); ?></label></th>
 							<td>
 								<select name="wp-font-awesome-settings[enqueue]" id="wpfas-enqueue">
 									<option
-										value="" <?php selected( $this->settings['enqueue'], '' ); ?>><?php _e( 'Frontend + Backend (default)', 'font-awesome-settings' ); ?></option>
+										value="" <?php selected($this->settings['enqueue'], ''); ?>><?php _e('Frontend + Backend (default)', 'font-awesome-settings'); ?></option>
 									<option
-										value="frontend" <?php selected( $this->settings['enqueue'], 'frontend' ); ?>><?php _e( 'Frontend', 'font-awesome-settings' ); ?></option>
+										value="frontend" <?php selected($this->settings['enqueue'], 'frontend'); ?>><?php _e('Frontend', 'font-awesome-settings'); ?></option>
 									<option
-										value="backend" <?php selected( $this->settings['enqueue'], 'backend' ); ?>><?php _e( 'Backend', 'font-awesome-settings' ); ?></option>
+										value="backend" <?php selected($this->settings['enqueue'], 'backend'); ?>><?php _e('Backend', 'font-awesome-settings'); ?></option>
 								</select>
 							</td>
 						</tr>
 
 						<tr valign="top" class="wpfas-kit-hide">
 							<th scope="row"><label
-									for="wpfas-pro"><?php _e( 'Enable pro', 'font-awesome-settings' ); ?></label></th>
+									for="wpfas-pro"><?php _e('Enable pro', 'font-awesome-settings'); ?></label></th>
 							<td>
 								<input type="hidden" name="wp-font-awesome-settings[pro]" value="0"/>
 								<input type="checkbox" name="wp-font-awesome-settings[pro]"
-								       value="1" <?php checked( $this->settings['pro'], '1' ); ?> id="wpfas-pro"/>
+								       value="1" <?php checked($this->settings['pro'], '1'); ?> id="wpfas-pro"/>
 								<span><?php
 									echo sprintf(
-										__( 'Requires a subscription. %sLearn more%s %sManage my allowed domains%s', 'font-awesome-settings' ),
+										__('Requires a subscription. %sLearn more%s %sManage my allowed domains%s', 'font-awesome-settings'),
 										'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/pro"><i class="fas fa-external-link-alt"></i>',
 										'</a>',
 										'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn"><i class="fas fa-external-link-alt"></i>',
@@ -439,38 +439,38 @@ 
 
 						<tr valign="top" class="wpfas-kit-hide">
 							<th scope="row"><label
-									for="wpfas-shims"><?php _e( 'Enable v4 shims compatibility', 'font-awesome-settings' ); ?></label>
+									for="wpfas-shims"><?php _e('Enable v4 shims compatibility', 'font-awesome-settings'); ?></label>
 							</th>
 							<td>
 								<input type="hidden" name="wp-font-awesome-settings[shims]" value="0"/>
 								<input type="checkbox" name="wp-font-awesome-settings[shims]"
-								       value="1" <?php checked( $this->settings['shims'], '1' ); ?> id="wpfas-shims"/>
-								<span><?php _e( 'This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'font-awesome-settings' ); ?></span>
+								       value="1" <?php checked($this->settings['shims'], '1'); ?> id="wpfas-shims"/>
+								<span><?php _e('This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'font-awesome-settings'); ?></span>
 							</td>
 						</tr>
 
 						<tr valign="top" class="wpfas-kit-hide">
 							<th scope="row"><label
-									for="wpfas-js-pseudo"><?php _e( 'Enable JS pseudo elements (not recommended)', 'font-awesome-settings' ); ?></label>
+									for="wpfas-js-pseudo"><?php _e('Enable JS pseudo elements (not recommended)', 'font-awesome-settings'); ?></label>
 							</th>
 							<td>
 								<input type="hidden" name="wp-font-awesome-settings[js-pseudo]" value="0"/>
 								<input type="checkbox" name="wp-font-awesome-settings[js-pseudo]"
-								       value="1" <?php checked( $this->settings['js-pseudo'], '1' ); ?>
+								       value="1" <?php checked($this->settings['js-pseudo'], '1'); ?>
 								       id="wpfas-js-pseudo"/>
-								<span><?php _e( 'Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'font-awesome-settings' ); ?></span>
+								<span><?php _e('Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'font-awesome-settings'); ?></span>
 							</td>
 						</tr>
 
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpfas-dequeue"><?php _e( 'Dequeue', 'font-awesome-settings' ); ?></label></th>
+									for="wpfas-dequeue"><?php _e('Dequeue', 'font-awesome-settings'); ?></label></th>
 							<td>
 								<input type="hidden" name="wp-font-awesome-settings[dequeue]" value="0"/>
 								<input type="checkbox" name="wp-font-awesome-settings[dequeue]"
-								       value="1" <?php checked( $this->settings['dequeue'], '1' ); ?>
+								       value="1" <?php checked($this->settings['dequeue'], '1'); ?>
 								       id="wpfas-dequeue"/>
-								<span><?php _e( 'This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'font-awesome-settings' ); ?></span>
+								<span><?php _e('This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'font-awesome-settings'); ?></span>
 							</td>
 						</tr>
 
@@ -480,7 +480,7 @@ 
 					?>
 				</form>
 
-				<div id="wpfas-version"><?php echo esc_html( $this->version ); ?></div>
+				<div id="wpfas-version"><?php echo esc_html($this->version); ?></div>
 			</div>
 
 			<?php
@@ -495,12 +495,12 @@ 
 		 *
 		 * @return string Either a valid version number or an empty string.
 		 */
-		public function validate_version_number( $version ) {
+		public function validate_version_number($version) {
 
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+			if (version_compare($version, '0.0.1', '>=') >= 0) {
 				// valid
 			} else {
-				$version = '';// not validated
+				$version = ''; // not validated
 			}
 
 			return $version;
@@ -515,19 +515,19 @@ 
 		 * @since 1.0.7
 		 * @return mixed|string The latest version number found.
 		 */
-		public function get_latest_version( $force_api = false ) {
+		public function get_latest_version($force_api = false) {
 			$latest_version = $this->latest;
 
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
+			$cache = get_transient('wp-font-awesome-settings-version');
 
-			if ( $cache === false || $force_api ) { // its not set
+			if ($cache === false || $force_api) { // its not set
 				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+				if (version_compare($api_ver, $this->latest, '>=') >= 0) {
 					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+					set_transient('wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS);
 				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+			} elseif ($this->validate_version_number($cache)) {
+				if (version_compare($cache, $this->latest, '>=') >= 0) {
 					$latest_version = $cache;
 				}
 			}
@@ -543,10 +543,10 @@ 
 		 */
 		public function get_latest_version_from_api() {
 			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+			$response = wp_remote_get("https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest");
+			if (!is_wp_error($response) && is_array($response)) {
+				$api_response = json_decode(wp_remote_retrieve_body($response), true);
+				if (isset($api_response['tag_name']) && version_compare($api_response['tag_name'], $this->latest, '>=') >= 0 && empty($api_response['prerelease'])) {
 					$version = $api_response['tag_name'];
 				}
 			}