AyeCode / invoicing

includes/admin/class-getpaid-admin-setup-wizard.php

Indentation +385 added lines, -385 removed lines

@@ -17,397 +17,397 @@
  */
 class GetPaid_Admin_Setup_Wizard {
 
-	/**
-	 * @var string Current Step
-	 */
-	protected $step = '';
-
-	/**
-	 * @var string|false Previous Step
-	 */
-	protected $previous_step = '';
-
-	/**
-	 * @var string|false Next Step
-	 */
-	protected $next_step = '';
-
-	/**
-	 * @var array All available steps for the setup wizard
-	 */
-	protected $steps = array();
-
-	/**
-	 * Class constructor.
-	 *
-	 * @since 2.4.0
-	 */
-	public function __construct() {
-
-		if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && wpinv_current_user_can_manage_invoicing() ) {
-			add_action( 'admin_menu', array( $this, 'add_menu' ) );
-			add_action( 'current_screen', array( $this, 'setup_wizard' ) );
-		}
-
-	}
-
-	/**
-	 * Add admin menus/screens.
-	 *
-	 * @since 2.4.0
-	 */
-	public function add_menu() {
-		add_dashboard_page( '', '', wpinv_get_capability(), 'gp-setup', '' );
-	}
-
-	/**
-	 * Sets up the setup wizard.
-	 *
-	 * @since 2.4.0
-	 */
-	public function setup_wizard() {
-
-		if ( isset( $_GET['page'] ) && 'gp-setup' === $_GET['page'] ) {
-			$this->setup_globals();
-			$this->maybe_save_current_step();
-			$this->display_wizard();
-			exit;
-		}
-
-	}
-
-	/**
-	 * Sets up class variables.
-	 *
-	 * @since 2.4.0
-	 */
-	protected function setup_globals() {
-		$this->steps         = $this->get_setup_steps();
-		$this->step          = $this->get_current_step();
-		$this->previous_step = $this->get_previous_step();
-		$this->next_step     = $this->get_next_step();
-	}
-
-	/**
-	 * Saves the current step.
-	 *
-	 * @since 2.4.0
-	 */
-	protected function maybe_save_current_step() {
-		if ( ! empty( $_POST['save_step'] ) && is_callable( $this->steps[ $this->step ]['handler'] ) ) {
-			call_user_func( $this->steps[ $this->step ]['handler'], $this );
-		}
-	}
-
-	/**
-	 * Returns the setup steps.
-	 *
-	 * @since 2.4.0
-	 * @return array
-	 */
-	protected function get_setup_steps() {
-
-		$steps = array(
-
-			'introduction'     => array(
-				'name'    => __( 'Introduction', 'invoicing' ),
-				'view'    => array( $this, 'setup_introduction' ),
-				'handler' => '',
-			),
-
-			'business_details'             => array(
-				'name'    => __( "Business Details", 'invoicing' ),
-				'view'    => array( $this, 'setup_business' ),
-				'handler' => '',
-			),
-
-			'currency' => array(
-				'name'    => __( 'Currency', 'invoicing' ),
-				'view'    => array( $this, 'setup_currency' ),
-				'handler' => '',
-			),
-
-			'payments'        => array(
-				'name'    => __( 'Payment Gateways', 'invoicing' ),
-				'view'    => array( $this, 'setup_payments' ),
-				'handler' => array( $this, 'setup_payments_save' ),
-			),
-
-			'recommend'          => array(
-				'name'    => __( 'Recommend', 'invoicing' ),
-				'view'    => array( $this, 'setup_recommend' ),
-				'handler' => '',
-			),
-
-			'next_steps'       => array(
-				'name'    => __( 'Get Paid', 'invoicing' ),
-				'view'    => array( $this, 'setup_ready' ),
-				'handler' => '',
-			),
-
-		);
-
-		return apply_filters( 'getpaid_setup_wizard_steps', $steps );
-
-	}
-
-	/**
-	 * Returns the current step.
-	 *
-	 * @since 2.4.0
-	 * @return string
-	 */
-	protected function get_current_step() {
-		$step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : '';
-		return ! empty( $step ) && in_array( $step, array_keys( $this->steps ) ) ? $step : current( array_keys( $this->steps ) );
-	}
-
-	/**
-	 * Returns the previous step.
-	 *
-	 * @since 2.4.0
-	 * @return string|false
-	 */
-	protected function get_previous_step() {
-
-		$previous = false;
-		$current  = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
-			if ( $current === $step ) {
-				return $previous;
-			}
-
-			$previous = $step;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the next step.
-	 *
-	 * @since 2.4.0
-	 * @return string|false
-	 */
-	protected function get_next_step() {
-
-		$on_current = false;
-		$current    = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
-
-			if ( $on_current ) {
-				return $step;
-			}
-
-			if ( $current === $step ) {
-				return $on_current = true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Displays the setup wizard.
-	 *
-	 * @since 2.4.0
-	 */
-	public function display_wizard() {
-		$this->display_header();
-		$this->display_current_step();
-		$this->display_footer();
-	}
-
-	/**
-	 * Displays the Wizard Header.
-	 *
-	 * @since 2.0.0
-	 */
-	public function display_header() {
-		$steps     = $this->steps;
-		$current   = $this->step;
-		$next_step = $this->next_step;
-		array_shift( $steps );
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-header.php';
-	}
-
-	/**
-	 * Displays the content for the current step.
-	 *
-	 * @since 2.4.0
-	 */
-	public function display_current_step() {
-		?>
+    /**
+     * @var string Current Step
+     */
+    protected $step = '';
+
+    /**
+     * @var string|false Previous Step
+     */
+    protected $previous_step = '';
+
+    /**
+     * @var string|false Next Step
+     */
+    protected $next_step = '';
+
+    /**
+     * @var array All available steps for the setup wizard
+     */
+    protected $steps = array();
+
+    /**
+     * Class constructor.
+     *
+     * @since 2.4.0
+     */
+    public function __construct() {
+
+        if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && wpinv_current_user_can_manage_invoicing() ) {
+            add_action( 'admin_menu', array( $this, 'add_menu' ) );
+            add_action( 'current_screen', array( $this, 'setup_wizard' ) );
+        }
+
+    }
+
+    /**
+     * Add admin menus/screens.
+     *
+     * @since 2.4.0
+     */
+    public function add_menu() {
+        add_dashboard_page( '', '', wpinv_get_capability(), 'gp-setup', '' );
+    }
+
+    /**
+     * Sets up the setup wizard.
+     *
+     * @since 2.4.0
+     */
+    public function setup_wizard() {
+
+        if ( isset( $_GET['page'] ) && 'gp-setup' === $_GET['page'] ) {
+            $this->setup_globals();
+            $this->maybe_save_current_step();
+            $this->display_wizard();
+            exit;
+        }
+
+    }
+
+    /**
+     * Sets up class variables.
+     *
+     * @since 2.4.0
+     */
+    protected function setup_globals() {
+        $this->steps         = $this->get_setup_steps();
+        $this->step          = $this->get_current_step();
+        $this->previous_step = $this->get_previous_step();
+        $this->next_step     = $this->get_next_step();
+    }
+
+    /**
+     * Saves the current step.
+     *
+     * @since 2.4.0
+     */
+    protected function maybe_save_current_step() {
+        if ( ! empty( $_POST['save_step'] ) && is_callable( $this->steps[ $this->step ]['handler'] ) ) {
+            call_user_func( $this->steps[ $this->step ]['handler'], $this );
+        }
+    }
+
+    /**
+     * Returns the setup steps.
+     *
+     * @since 2.4.0
+     * @return array
+     */
+    protected function get_setup_steps() {
+
+        $steps = array(
+
+            'introduction'     => array(
+                'name'    => __( 'Introduction', 'invoicing' ),
+                'view'    => array( $this, 'setup_introduction' ),
+                'handler' => '',
+            ),
+
+            'business_details'             => array(
+                'name'    => __( "Business Details", 'invoicing' ),
+                'view'    => array( $this, 'setup_business' ),
+                'handler' => '',
+            ),
+
+            'currency' => array(
+                'name'    => __( 'Currency', 'invoicing' ),
+                'view'    => array( $this, 'setup_currency' ),
+                'handler' => '',
+            ),
+
+            'payments'        => array(
+                'name'    => __( 'Payment Gateways', 'invoicing' ),
+                'view'    => array( $this, 'setup_payments' ),
+                'handler' => array( $this, 'setup_payments_save' ),
+            ),
+
+            'recommend'          => array(
+                'name'    => __( 'Recommend', 'invoicing' ),
+                'view'    => array( $this, 'setup_recommend' ),
+                'handler' => '',
+            ),
+
+            'next_steps'       => array(
+                'name'    => __( 'Get Paid', 'invoicing' ),
+                'view'    => array( $this, 'setup_ready' ),
+                'handler' => '',
+            ),
+
+        );
+
+        return apply_filters( 'getpaid_setup_wizard_steps', $steps );
+
+    }
+
+    /**
+     * Returns the current step.
+     *
+     * @since 2.4.0
+     * @return string
+     */
+    protected function get_current_step() {
+        $step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : '';
+        return ! empty( $step ) && in_array( $step, array_keys( $this->steps ) ) ? $step : current( array_keys( $this->steps ) );
+    }
+
+    /**
+     * Returns the previous step.
+     *
+     * @since 2.4.0
+     * @return string|false
+     */
+    protected function get_previous_step() {
+
+        $previous = false;
+        $current  = $this->step;
+        foreach ( array_keys( $this->steps ) as $step ) {
+            if ( $current === $step ) {
+                return $previous;
+            }
+
+            $previous = $step;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the next step.
+     *
+     * @since 2.4.0
+     * @return string|false
+     */
+    protected function get_next_step() {
+
+        $on_current = false;
+        $current    = $this->step;
+        foreach ( array_keys( $this->steps ) as $step ) {
+
+            if ( $on_current ) {
+                return $step;
+            }
+
+            if ( $current === $step ) {
+                return $on_current = true;
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * Displays the setup wizard.
+     *
+     * @since 2.4.0
+     */
+    public function display_wizard() {
+        $this->display_header();
+        $this->display_current_step();
+        $this->display_footer();
+    }
+
+    /**
+     * Displays the Wizard Header.
+     *
+     * @since 2.0.0
+     */
+    public function display_header() {
+        $steps     = $this->steps;
+        $current   = $this->step;
+        $next_step = $this->next_step;
+        array_shift( $steps );
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-header.php';
+    }
+
+    /**
+     * Displays the content for the current step.
+     *
+     * @since 2.4.0
+     */
+    public function display_current_step() {
+        ?>
 			<div class="gp-setup-content rowx mw-100 text-center mb-3">
 				<div class="col-12 col-md-5 m-auto">
 					<?php call_user_func( $this->steps[ $this->step ]['view'], $this ); ?>
 				</div>
 			</div>
 		<?php
-	}
-
-	/**
-	 * Setup Wizard Footer.
-	 *
-	 * @since 2.4.0
-	 */
-	public function display_footer() {
-
-		if ( isset( $_GET['step'] ) ) {
-			$next_url = esc_url( $this->get_next_step_link() );
-			$label    = $this->step == 'next_steps' ? __( 'Return to the WordPress Dashboard', 'invoicing' ) : __( 'Skip this step', 'invoicing' );
-
-			echo '<p class="gd-return-to-dashboard-wrap"> <a href="' . $next_url . '" class="gd-return-to-dashboard btn btn-link d-block text-muted">' . $label . '</a></p>';
-		}
-
-		echo '</body></html>';
-	}
-
-	/**
-	 * Introduction step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_introduction() {
-		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-introduction.php';
-	}
-
-	/**
-	 * Get the URL for the next step's screen.
-	 *
-	 * @param string step   slug (default: current step)
-	 *
-	 * @return string       URL for next step if a next step exists.
-	 *                      Admin URL if it's the last step.
-	 *                      Empty string on failure.
-	 * @since 3.0.0
-	 */
-	public function get_next_step_link( $step = '' ) {
-		if ( ! $step ) {
-			$step = $this->step;
-		}
-
-		$keys = array_keys( $this->steps );
-		if ( end( $keys ) === $step ) {
-			return admin_url();
-		}
-
-		$step_index = array_search( $step, $keys );
-		if ( false === $step_index ) {
-			return '';
-		}
-
-		return remove_query_arg('settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ));
-	}
-
-	/**
-	 * Setup maps api.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_business() {
-		$next_url = $this->get_next_step_link();
-		$wizard   = $this;
-		$page     = 'wpinv_settings_general_main';
-		$section  = 'wpinv_settings_general_main';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
-	}
-
-	/**
-	 * Default Location settings.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_currency() {
-		$next_url = $this->get_next_step_link();
-		$wizard   = $this;
-		$page     = 'wpinv_settings_general_currency_section';
-		$section  = 'wpinv_settings_general_currency_section';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
-	}
-
-	/**
-	 * Installation of recommended plugins.
-	 *
-	 * @since 1.0.0
-	 */
-	public function setup_recommend() {
-		$next_url            = $this->get_next_step_link();
-		$recommended_plugins = self::get_recommend_wp_plugins();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-plugins.php';
-	}
-
-	/**
-	 * A list of recommended wp.org plugins.
-	 * @return array
-	 */
-	public static function get_recommend_wp_plugins(){
-		return array(
-			'ayecode-connect' => array(
-				'file'   => 'ayecode-connect/ayecode-connect.php',
-				'url'    => 'https://wordpress.org/plugins/ayecode-connect/',
-				'slug'   => 'ayecode-connect',
-				'name'   => 'AyeCode Connect',
-				'desc'   => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
-			),
-			'invoicing-quotes' => array(
-				'file'   => 'invoicing-quotes/wpinv-quote.php',
-				'url'    => 'https://wordpress.org/plugins/invoicing-quotes/',
-				'slug'   => 'invoicing-quotes',
-				'name'   => 'Customer Quotes',
-				'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.','geodirectory'),
-			),
-			'userswp'    => array(
-				'file'   => 'userswp/userswp.php',
-				'url'    => 'https://wordpress.org/plugins/userswp/',
-				'slug'   => 'userswp',
-				'name'   => 'UsersWP',
-				'desc'   => __('Frontend user login and registration as well as slick profile pages.','geodirectory'),
-			),
-		);
-	}
-
-	/**
-	 * Dummy Data setup.
-	 *
-	 * @since 2.4.0
-	 */
-	public function setup_payments() {
-		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-gateways.php';
-	}
-
-	/**
-	 * Dummy data save.
-	 *
-	 * This is done via ajax so we just pass onto the next step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_payments_save() {
-		check_admin_referer( 'getpaid-setup-wizard', 'getpaid-setup-wizard' );
-		wpinv_update_option( 'manual_active', ! empty( $_POST['enable-manual-gateway'] ) );
-
-		if ( ! empty( $_POST['paypal-email'] ) ) {
-			wpinv_update_option( 'paypal_email', sanitize_email( $_POST['paypal-email'] ) );
-			wpinv_update_option( 'paypal_active', 1 );
-			wpinv_update_option( 'paypal_sandbox', 0 );
-		}
-
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
-		exit;
-	}
-
-	/**
-	 * Final step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_ready() {
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-thank-you.php';
-	}
+    }
+
+    /**
+     * Setup Wizard Footer.
+     *
+     * @since 2.4.0
+     */
+    public function display_footer() {
+
+        if ( isset( $_GET['step'] ) ) {
+            $next_url = esc_url( $this->get_next_step_link() );
+            $label    = $this->step == 'next_steps' ? __( 'Return to the WordPress Dashboard', 'invoicing' ) : __( 'Skip this step', 'invoicing' );
+
+            echo '<p class="gd-return-to-dashboard-wrap"> <a href="' . $next_url . '" class="gd-return-to-dashboard btn btn-link d-block text-muted">' . $label . '</a></p>';
+        }
+
+        echo '</body></html>';
+    }
+
+    /**
+     * Introduction step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_introduction() {
+        $next_url = $this->get_next_step_link();
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-introduction.php';
+    }
+
+    /**
+     * Get the URL for the next step's screen.
+     *
+     * @param string step   slug (default: current step)
+     *
+     * @return string       URL for next step if a next step exists.
+     *                      Admin URL if it's the last step.
+     *                      Empty string on failure.
+     * @since 3.0.0
+     */
+    public function get_next_step_link( $step = '' ) {
+        if ( ! $step ) {
+            $step = $this->step;
+        }
+
+        $keys = array_keys( $this->steps );
+        if ( end( $keys ) === $step ) {
+            return admin_url();
+        }
+
+        $step_index = array_search( $step, $keys );
+        if ( false === $step_index ) {
+            return '';
+        }
+
+        return remove_query_arg('settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ));
+    }
+
+    /**
+     * Setup maps api.
+     *
+     * @since 2.0.0
+     */
+    public function setup_business() {
+        $next_url = $this->get_next_step_link();
+        $wizard   = $this;
+        $page     = 'wpinv_settings_general_main';
+        $section  = 'wpinv_settings_general_main';
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+    }
+
+    /**
+     * Default Location settings.
+     *
+     * @since 2.0.0
+     */
+    public function setup_currency() {
+        $next_url = $this->get_next_step_link();
+        $wizard   = $this;
+        $page     = 'wpinv_settings_general_currency_section';
+        $section  = 'wpinv_settings_general_currency_section';
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+    }
+
+    /**
+     * Installation of recommended plugins.
+     *
+     * @since 1.0.0
+     */
+    public function setup_recommend() {
+        $next_url            = $this->get_next_step_link();
+        $recommended_plugins = self::get_recommend_wp_plugins();
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-plugins.php';
+    }
+
+    /**
+     * A list of recommended wp.org plugins.
+     * @return array
+     */
+    public static function get_recommend_wp_plugins(){
+        return array(
+            'ayecode-connect' => array(
+                'file'   => 'ayecode-connect/ayecode-connect.php',
+                'url'    => 'https://wordpress.org/plugins/ayecode-connect/',
+                'slug'   => 'ayecode-connect',
+                'name'   => 'AyeCode Connect',
+                'desc'   => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
+            ),
+            'invoicing-quotes' => array(
+                'file'   => 'invoicing-quotes/wpinv-quote.php',
+                'url'    => 'https://wordpress.org/plugins/invoicing-quotes/',
+                'slug'   => 'invoicing-quotes',
+                'name'   => 'Customer Quotes',
+                'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.','geodirectory'),
+            ),
+            'userswp'    => array(
+                'file'   => 'userswp/userswp.php',
+                'url'    => 'https://wordpress.org/plugins/userswp/',
+                'slug'   => 'userswp',
+                'name'   => 'UsersWP',
+                'desc'   => __('Frontend user login and registration as well as slick profile pages.','geodirectory'),
+            ),
+        );
+    }
+
+    /**
+     * Dummy Data setup.
+     *
+     * @since 2.4.0
+     */
+    public function setup_payments() {
+        $next_url = $this->get_next_step_link();
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-gateways.php';
+    }
+
+    /**
+     * Dummy data save.
+     *
+     * This is done via ajax so we just pass onto the next step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_payments_save() {
+        check_admin_referer( 'getpaid-setup-wizard', 'getpaid-setup-wizard' );
+        wpinv_update_option( 'manual_active', ! empty( $_POST['enable-manual-gateway'] ) );
+
+        if ( ! empty( $_POST['paypal-email'] ) ) {
+            wpinv_update_option( 'paypal_email', sanitize_email( $_POST['paypal-email'] ) );
+            wpinv_update_option( 'paypal_active', 1 );
+            wpinv_update_option( 'paypal_sandbox', 0 );
+        }
+
+        wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+        exit;
+    }
+
+    /**
+     * Final step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_ready() {
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-thank-you.php';
+    }
 
 }
 

Spacing +59 added lines, -59 removed lines

@@ -10,7 +10,7 @@ 
  * @version     2.4.0
  * @info        GetPaid Setup Wizard.
  */
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Admin_Setup_Wizard class.
@@ -44,9 +44,9 @@ 
 	 */
 	public function __construct() {
 
-		if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && wpinv_current_user_can_manage_invoicing() ) {
-			add_action( 'admin_menu', array( $this, 'add_menu' ) );
-			add_action( 'current_screen', array( $this, 'setup_wizard' ) );
+		if (apply_filters('getpaid_enable_setup_wizard', true) && wpinv_current_user_can_manage_invoicing()) {
+			add_action('admin_menu', array($this, 'add_menu'));
+			add_action('current_screen', array($this, 'setup_wizard'));
 		}
 
 	}
@@ -57,7 +57,7 @@ 
 	 * @since 2.4.0
 	 */
 	public function add_menu() {
-		add_dashboard_page( '', '', wpinv_get_capability(), 'gp-setup', '' );
+		add_dashboard_page('', '', wpinv_get_capability(), 'gp-setup', '');
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 */
 	public function setup_wizard() {
 
-		if ( isset( $_GET['page'] ) && 'gp-setup' === $_GET['page'] ) {
+		if (isset($_GET['page']) && 'gp-setup' === $_GET['page']) {
 			$this->setup_globals();
 			$this->maybe_save_current_step();
 			$this->display_wizard();
@@ -94,8 +94,8 @@ 
 	 * @since 2.4.0
 	 */
 	protected function maybe_save_current_step() {
-		if ( ! empty( $_POST['save_step'] ) && is_callable( $this->steps[ $this->step ]['handler'] ) ) {
-			call_user_func( $this->steps[ $this->step ]['handler'], $this );
+		if (!empty($_POST['save_step']) && is_callable($this->steps[$this->step]['handler'])) {
+			call_user_func($this->steps[$this->step]['handler'], $this);
 		}
 	}
 
@@ -110,44 +110,44 @@ 
 		$steps = array(
 
 			'introduction'     => array(
-				'name'    => __( 'Introduction', 'invoicing' ),
-				'view'    => array( $this, 'setup_introduction' ),
+				'name'    => __('Introduction', 'invoicing'),
+				'view'    => array($this, 'setup_introduction'),
 				'handler' => '',
 			),
 
 			'business_details'             => array(
-				'name'    => __( "Business Details", 'invoicing' ),
-				'view'    => array( $this, 'setup_business' ),
+				'name'    => __("Business Details", 'invoicing'),
+				'view'    => array($this, 'setup_business'),
 				'handler' => '',
 			),
 
 			'currency' => array(
-				'name'    => __( 'Currency', 'invoicing' ),
-				'view'    => array( $this, 'setup_currency' ),
+				'name'    => __('Currency', 'invoicing'),
+				'view'    => array($this, 'setup_currency'),
 				'handler' => '',
 			),
 
 			'payments'        => array(
-				'name'    => __( 'Payment Gateways', 'invoicing' ),
-				'view'    => array( $this, 'setup_payments' ),
-				'handler' => array( $this, 'setup_payments_save' ),
+				'name'    => __('Payment Gateways', 'invoicing'),
+				'view'    => array($this, 'setup_payments'),
+				'handler' => array($this, 'setup_payments_save'),
 			),
 
 			'recommend'          => array(
-				'name'    => __( 'Recommend', 'invoicing' ),
-				'view'    => array( $this, 'setup_recommend' ),
+				'name'    => __('Recommend', 'invoicing'),
+				'view'    => array($this, 'setup_recommend'),
 				'handler' => '',
 			),
 
 			'next_steps'       => array(
-				'name'    => __( 'Get Paid', 'invoicing' ),
-				'view'    => array( $this, 'setup_ready' ),
+				'name'    => __('Get Paid', 'invoicing'),
+				'view'    => array($this, 'setup_ready'),
 				'handler' => '',
 			),
 
 		);
 
-		return apply_filters( 'getpaid_setup_wizard_steps', $steps );
+		return apply_filters('getpaid_setup_wizard_steps', $steps);
 
 	}
 
@@ -158,8 +158,8 @@ 
 	 * @return string
 	 */
 	protected function get_current_step() {
-		$step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : '';
-		return ! empty( $step ) && in_array( $step, array_keys( $this->steps ) ) ? $step : current( array_keys( $this->steps ) );
+		$step = isset($_GET['step']) ? sanitize_key($_GET['step']) : '';
+		return !empty($step) && in_array($step, array_keys($this->steps)) ? $step : current(array_keys($this->steps));
 	}
 
 	/**
@@ -172,8 +172,8 @@ 
 
 		$previous = false;
 		$current  = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
-			if ( $current === $step ) {
+		foreach (array_keys($this->steps) as $step) {
+			if ($current === $step) {
 				return $previous;
 			}
 
@@ -193,13 +193,13 @@ 
 
 		$on_current = false;
 		$current    = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
+		foreach (array_keys($this->steps) as $step) {
 
-			if ( $on_current ) {
+			if ($on_current) {
 				return $step;
 			}
 
-			if ( $current === $step ) {
+			if ($current === $step) {
 				return $on_current = true;
 			}
 
@@ -228,8 +228,8 @@ 
 		$steps     = $this->steps;
 		$current   = $this->step;
 		$next_step = $this->next_step;
-		array_shift( $steps );
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-header.php';
+		array_shift($steps);
+		include plugin_dir_path(__FILE__) . 'views/wizard-header.php';
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 		?>
 			<div class="gp-setup-content rowx mw-100 text-center mb-3">
 				<div class="col-12 col-md-5 m-auto">
-					<?php call_user_func( $this->steps[ $this->step ]['view'], $this ); ?>
+					<?php call_user_func($this->steps[$this->step]['view'], $this); ?>
 				</div>
 			</div>
 		<?php
@@ -254,9 +254,9 @@ 
 	 */
 	public function display_footer() {
 
-		if ( isset( $_GET['step'] ) ) {
-			$next_url = esc_url( $this->get_next_step_link() );
-			$label    = $this->step == 'next_steps' ? __( 'Return to the WordPress Dashboard', 'invoicing' ) : __( 'Skip this step', 'invoicing' );
+		if (isset($_GET['step'])) {
+			$next_url = esc_url($this->get_next_step_link());
+			$label    = $this->step == 'next_steps' ? __('Return to the WordPress Dashboard', 'invoicing') : __('Skip this step', 'invoicing');
 
 			echo '<p class="gd-return-to-dashboard-wrap"> <a href="' . $next_url . '" class="gd-return-to-dashboard btn btn-link d-block text-muted">' . $label . '</a></p>';
 		}
@@ -271,7 +271,7 @@ 
 	 */
 	public function setup_introduction() {
 		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-introduction.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-introduction.php';
 	}
 
 	/**
@@ -284,22 +284,22 @@ 
 	 *                      Empty string on failure.
 	 * @since 3.0.0
 	 */
-	public function get_next_step_link( $step = '' ) {
-		if ( ! $step ) {
+	public function get_next_step_link($step = '') {
+		if (!$step) {
 			$step = $this->step;
 		}
 
-		$keys = array_keys( $this->steps );
-		if ( end( $keys ) === $step ) {
+		$keys = array_keys($this->steps);
+		if (end($keys) === $step) {
 			return admin_url();
 		}
 
-		$step_index = array_search( $step, $keys );
-		if ( false === $step_index ) {
+		$step_index = array_search($step, $keys);
+		if (false === $step_index) {
 			return '';
 		}
 
-		return remove_query_arg('settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ));
+		return remove_query_arg('settings-updated', add_query_arg('step', $keys[$step_index + 1]));
 	}
 
 	/**
@@ -312,7 +312,7 @@ 
 		$wizard   = $this;
 		$page     = 'wpinv_settings_general_main';
 		$section  = 'wpinv_settings_general_main';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-settings.php';
 	}
 
 	/**
@@ -325,7 +325,7 @@ 
 		$wizard   = $this;
 		$page     = 'wpinv_settings_general_currency_section';
 		$section  = 'wpinv_settings_general_currency_section';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-settings.php';
 	}
 
 	/**
@@ -336,35 +336,35 @@ 
 	public function setup_recommend() {
 		$next_url            = $this->get_next_step_link();
 		$recommended_plugins = self::get_recommend_wp_plugins();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-plugins.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-plugins.php';
 	}
 
 	/**
 	 * A list of recommended wp.org plugins.
 	 * @return array
 	 */
-	public static function get_recommend_wp_plugins(){
+	public static function get_recommend_wp_plugins() {
 		return array(
 			'ayecode-connect' => array(
 				'file'   => 'ayecode-connect/ayecode-connect.php',
 				'url'    => 'https://wordpress.org/plugins/ayecode-connect/',
 				'slug'   => 'ayecode-connect',
 				'name'   => 'AyeCode Connect',
-				'desc'   => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
+				'desc'   => __('Documentation and Support from within your WordPress admin.', 'geodirectory'),
 			),
 			'invoicing-quotes' => array(
 				'file'   => 'invoicing-quotes/wpinv-quote.php',
 				'url'    => 'https://wordpress.org/plugins/invoicing-quotes/',
 				'slug'   => 'invoicing-quotes',
 				'name'   => 'Customer Quotes',
-				'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.','geodirectory'),
+				'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.', 'geodirectory'),
 			),
 			'userswp'    => array(
 				'file'   => 'userswp/userswp.php',
 				'url'    => 'https://wordpress.org/plugins/userswp/',
 				'slug'   => 'userswp',
 				'name'   => 'UsersWP',
-				'desc'   => __('Frontend user login and registration as well as slick profile pages.','geodirectory'),
+				'desc'   => __('Frontend user login and registration as well as slick profile pages.', 'geodirectory'),
 			),
 		);
 	}
@@ -376,7 +376,7 @@ 
 	 */
 	public function setup_payments() {
 		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-gateways.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-gateways.php';
 	}
 
 	/**
@@ -387,16 +387,16 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_payments_save() {
-		check_admin_referer( 'getpaid-setup-wizard', 'getpaid-setup-wizard' );
-		wpinv_update_option( 'manual_active', ! empty( $_POST['enable-manual-gateway'] ) );
+		check_admin_referer('getpaid-setup-wizard', 'getpaid-setup-wizard');
+		wpinv_update_option('manual_active', !empty($_POST['enable-manual-gateway']));
 
-		if ( ! empty( $_POST['paypal-email'] ) ) {
-			wpinv_update_option( 'paypal_email', sanitize_email( $_POST['paypal-email'] ) );
-			wpinv_update_option( 'paypal_active', 1 );
-			wpinv_update_option( 'paypal_sandbox', 0 );
+		if (!empty($_POST['paypal-email'])) {
+			wpinv_update_option('paypal_email', sanitize_email($_POST['paypal-email']));
+			wpinv_update_option('paypal_active', 1);
+			wpinv_update_option('paypal_sandbox', 0);
 		}
 
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+		wp_redirect(esc_url_raw($this->get_next_step_link()));
 		exit;
 	}
 
@@ -406,7 +406,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_ready() {
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-thank-you.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-thank-you.php';
 	}
 
 }

includes/admin/views/wizard-gateways.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -12,54 +12,54 @@ 
 
     <form method="post" class="text-center card-body">
         <div class="gp-wizard-payments">
-            <h2 class="gd-settings-title h3 "><?php _e( 'Gateway Setup', 'invoicing' ); ?></h2>
-            <p><?php _e( 'Below are a few gateways that can be setup in a few seconds.', 'invoicing' ); ?>
+            <h2 class="gd-settings-title h3 "><?php _e('Gateway Setup', 'invoicing'); ?></h2>
+            <p><?php _e('Below are a few gateways that can be setup in a few seconds.', 'invoicing'); ?>
                 <br>
-                <?php _e( 'We have 20+ Gateways that can be setup later.', 'invoicing' ); ?>
+                <?php _e('We have 20+ Gateways that can be setup later.', 'invoicing'); ?>
             </p>
 
             <ul class="list-group">
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg' );?>" class="ml-n2" alt="Stripe"></span>
-				    <?php if ( false === wpinv_get_option( 'stripe_live_connect_account_id' ) ) : ?>
+				    <span class="mr-auto"><img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg'); ?>" class="ml-n2" alt="Stripe"></span>
+				    <?php if (false === wpinv_get_option('stripe_live_connect_account_id')) : ?>
                         <a href="<?php echo wp_nonce_url(
                             add_query_arg(
                                 array(
                                     'getpaid-admin-action' => 'connect_gateway',
                                     'plugin'               => 'stripe',
-                                    'redirect'             => urlencode( add_query_arg( 'step', 'payments' ) ),
+                                    'redirect'             => urlencode(add_query_arg('step', 'payments')),
                                 ),
                                 admin_url()
                             ),
                             'getpaid-nonce',
                             'getpaid-nonce'
                         ); ?>"
-                        class="btn btn-sm btn-outline-primary"><?php _e( 'Connect', 'invoicing' ); ?></a>
+                        class="btn btn-sm btn-outline-primary"><?php _e('Connect', 'invoicing'); ?></a>
                     <?php else: ?>
-                        <span class="btn btn-sm btn-success"><?php _e( 'Connected', 'invoicing' ); ?></span>
+                        <span class="btn btn-sm btn-success"><?php _e('Connected', 'invoicing'); ?></span>
                     <?php endif; ?>
 				</li>
 
 				<li class="list-group-item">
                     <div class="d-flex justify-content-between align-items-center">
                         <span class="mr-auto">
-                            <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp' );?>" class="" alt="PayPal" height="25">
+                            <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp'); ?>" class="" alt="PayPal" height="25">
                         </span>
                         <a
                             href="#"
                             onclick="jQuery('.getpaid-setup-paypal-input').toggleClass('d-none'); return false;"
-                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php _e( 'Set-up', 'invoicing' ); ?></a>
+                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php _e('Set-up', 'invoicing'); ?></a>
                     </div>
                     <div class="mt-4 getpaid-setup-paypal-input d-none">
-                        <input type="text" placeholder="<?php esc_attr_e( 'PayPal Email', 'invoicing' ); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr( wpinv_get_option( 'paypal_email' ) ); ?>">
+                        <input type="text" placeholder="<?php esc_attr_e('PayPal Email', 'invoicing'); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr(wpinv_get_option('paypal_email')); ?>">
                     </div>
                 </li>
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><?php _e( 'Test Getway', 'invoicing' ); ?></span>
+				    <span class="mr-auto"><?php _e('Test Getway', 'invoicing'); ?></span>
 					<div class="custom-control custom-switch">
-						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked( wpinv_is_gateway_active( 'manual' ) ); ?>>
+						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked(wpinv_is_gateway_active('manual')); ?>>
 						<label class="custom-control-label" for="enable-manual-gateway"></label>
 					</div>
 				</li>
@@ -68,10 +68,10 @@ 
         </div>
 
         <p class="gp-setup-actions step text-center mt-4">
-			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e( 'Continue', 'invoicing' ); ?>" />
+			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e('Continue', 'invoicing'); ?>" />
 		</p>
         
-        <?php getpaid_hidden_field( 'save_step', 1 ); ?>
-        <?php wp_nonce_field( 'getpaid-setup-wizard', 'getpaid-setup-wizard' ); ?>
+        <?php getpaid_hidden_field('save_step', 1); ?>
+        <?php wp_nonce_field('getpaid-setup-wizard', 'getpaid-setup-wizard'); ?>
     </form>
 </div>

Braces +5 added lines, -2 removed lines

@@ -36,8 +36,11 @@
                             'getpaid-nonce'
                         ); ?>"
                         class="btn btn-sm btn-outline-primary"><?php _e( 'Connect', 'invoicing' ); ?></a>
-                    <?php else: ?>
-                        <span class="btn btn-sm btn-success"><?php _e( 'Connected', 'invoicing' ); ?></span>
+                    <?php else {
+    : ?>
+                        <span class="btn btn-sm btn-success"><?php _e( 'Connected', 'invoicing' );
+}
+?></span>
                     <?php endif; ?>
 				</li>
 

includes/admin/register-settings.php

Indentation +299 added lines, -299 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 $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 = 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">' . $args['desc'] . '</p>';
-	}
+            $sanitize_key = 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">' . $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; ?>>
 				<?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>
 
@@ -1025,19 +1025,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' );
 
@@ -1061,15 +1061,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 +369 added lines, -369 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'] ) ? array_values( $_POST['tax_rates'] ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? 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'] ) ) {
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
         echo $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 = wpinv_sanitize_key( $key );
-			if ( in_array( $sanitize_key, $value ) ) { 
+        foreach ($args['options'] as $key => $option):
+			$sanitize_key = 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">' . $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; ?>>
-				<?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,124 +933,124 @@ 
     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>
 
-			<?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.
@@ -1059,16 +1059,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/gateways/class-getpaid-paypal-gateway.php

Indentation +353 added lines, -353 removed lines

@@ -13,96 +13,96 @@ 
 class GetPaid_Paypal_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'paypal';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'subscription', 'sandbox', 'single_subscription_group' );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
+     * Payment method order.
+     *
+     * @var int
+     */
     public $order = 1;
 
     /**
-	 * Stores line items to send to PayPal.
-	 *
-	 * @var array
-	 */
+     * Stores line items to send to PayPal.
+     *
+     * @var array
+     */
     protected $line_items = array();
 
     /**
-	 * Endpoint for requests from PayPal.
-	 *
-	 * @var string
-	 */
-	protected $notify_url;
-
-	/**
-	 * Endpoint for requests to PayPal.
-	 *
-	 * @var string
-	 */
+     * Endpoint for requests from PayPal.
+     *
+     * @var string
+     */
+    protected $notify_url;
+
+    /**
+     * Endpoint for requests to PayPal.
+     *
+     * @var string
+     */
     protected $endpoint;
 
     /**
-	 * Currencies this gateway is allowed for.
-	 *
-	 * @var array
-	 */
-	public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
+     * Currencies this gateway is allowed for.
+     *
+     * @var array
+     */
+    public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
 
     /**
-	 * URL to view a transaction.
-	 *
-	 * @var string
-	 */
+     * URL to view a transaction.
+     *
+     * @var string
+     */
     public $view_transaction_url = 'https://www.{sandbox}paypal.com/activity/payment/%s';
 
     /**
-	 * URL to view a subscription.
-	 *
-	 * @var string
-	 */
-	public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
+     * URL to view a subscription.
+     *
+     * @var string
+     */
+    public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
 
         $this->title                = __( 'PayPal Standard', 'invoicing' );
         $this->method_title         = __( 'PayPal Standard', 'invoicing' );
         $this->checkout_button_text = __( 'Proceed to PayPal', 'invoicing' );
         $this->notify_url           = wpinv_get_ipn_url( $this->id );
 
-		add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
+        add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
         add_filter( 'getpaid_paypal_sandbox_notice', array( $this, 'sandbox_notice' ) );
-		add_filter( 'getpaid_get_paypal_connect_url', array( $this, 'maybe_get_connect_url' ), 10, 2 );
-		add_action( 'getpaid_authenticated_admin_action_connect_paypal', array( $this, 'connect_paypal' ) );
+        add_filter( 'getpaid_get_paypal_connect_url', array( $this, 'maybe_get_connect_url' ), 10, 2 );
+        add_action( 'getpaid_authenticated_admin_action_connect_paypal', array( $this, 'connect_paypal' ) );
 
         parent::__construct();
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Get redirect url.
         $paypal_redirect = $this->get_request_url( $invoice );
@@ -125,15 +125,15 @@ 
     }
 
     /**
-	 * Get the PayPal request URL for an invoice.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return string
-	 */
-	public function get_request_url( $invoice ) {
+     * Get the PayPal request URL for an invoice.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return string
+     */
+    public function get_request_url( $invoice ) {
 
         // Endpoint for this request
-		$this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
+        $this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
 
         // Retrieve paypal args.
         $paypal_args       = map_deep( $this->get_paypal_args( $invoice ), 'urlencode' );
@@ -146,44 +146,44 @@ 
 
         return add_query_arg( $paypal_args, $this->endpoint );
 
-	}
+    }
 
     /**
-	 * Get PayPal Args for passing to PP.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_paypal_args( $invoice ) {
+     * Get PayPal Args for passing to PP.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    protected function get_paypal_args( $invoice ) {
 
         // Whether or not to send the line items as one item.
-		$force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
+        $force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
 
-		if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
-			$force_one_line_item = true;
-		}
+        if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
+            $force_one_line_item = true;
+        }
 
-		$paypal_args = apply_filters(
-			'getpaid_paypal_args',
-			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, $force_one_line_item )
-			),
-			$invoice
-		);
+        $paypal_args = apply_filters(
+            'getpaid_paypal_args',
+            array_merge(
+                $this->get_transaction_args( $invoice ),
+                $this->get_line_item_args( $invoice, $force_one_line_item )
+            ),
+            $invoice
+        );
 
-		return $this->fix_request_length( $invoice, $paypal_args );
+        return $this->fix_request_length( $invoice, $paypal_args );
     }
 
     /**
-	 * Get transaction args for paypal request.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_transaction_args( $invoice ) {
-
-		return array(
+     * Get transaction args for paypal request.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    protected function get_transaction_args( $invoice ) {
+
+        return array(
             'cmd'           => '_cart',
             'business'      => wpinv_get_option( 'paypal_email', false ),
             'no_shipping'   => '1',
@@ -208,16 +208,16 @@ 
     }
 
     /**
-	 * Get line item args for paypal request.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @param  bool     $force_one_line_item Create only one item for this invoice.
-	 * @return array
-	 */
-	protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
+     * Get line item args for paypal request.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @param  bool     $force_one_line_item Create only one item for this invoice.
+     * @return array
+     */
+    protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
 
         // Maybe send invoice as a single item.
-		if ( $force_one_line_item ) {
+        if ( $force_one_line_item ) {
             return $this->get_line_item_args_single_item( $invoice );
         }
 
@@ -237,129 +237,129 @@ 
             $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_discount(), 2 );
         }
 
-		return array_merge( $line_item_args, $this->get_line_items() );
+        return array_merge( $line_item_args, $this->get_line_items() );
 
     }
 
     /**
-	 * Get line item args for paypal request as a single line item.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_line_item_args_single_item( $invoice ) {
-		$this->delete_line_items();
+     * Get line item args for paypal request as a single line item.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    protected function get_line_item_args_single_item( $invoice ) {
+        $this->delete_line_items();
 
         $item_name = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
-		$this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
+        $this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
 
-		return $this->get_line_items();
+        return $this->get_line_items();
     }
 
     /**
-	 * Return all line items.
-	 */
-	protected function get_line_items() {
-		return $this->line_items;
-	}
+     * Return all line items.
+     */
+    protected function get_line_items() {
+        return $this->line_items;
+    }
 
     /**
-	 * Remove all line items.
-	 */
-	protected function delete_line_items() {
-		$this->line_items = array();
+     * Remove all line items.
+     */
+    protected function delete_line_items() {
+        $this->line_items = array();
     }
 
     /**
-	 * Prepare line items to send to paypal.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 */
-	protected function prepare_line_items( $invoice ) {
-		$this->delete_line_items();
-
-		// Items.
-		foreach ( $invoice->get_items() as $item ) {
-			$amount   = $item->get_price();
-			$quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
-			$this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
+     * Prepare line items to send to paypal.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     */
+    protected function prepare_line_items( $invoice ) {
+        $this->delete_line_items();
+
+        // Items.
+        foreach ( $invoice->get_items() as $item ) {
+            $amount   = $item->get_price();
+            $quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
+            $this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
         }
 
         // Fees.
-		foreach ( $invoice->get_fees() as $fee => $data ) {
+        foreach ( $invoice->get_fees() as $fee => $data ) {
             $this->add_line_item( $fee, 1, wpinv_sanitize_amount( $data['initial_fee'] ) );
         }
 
     }
 
     /**
-	 * Add PayPal Line Item.
-	 *
-	 * @param  string $item_name Item name.
-	 * @param  float    $quantity Item quantity.
-	 * @param  float  $amount Amount.
-	 * @param  string $item_number Item number.
-	 */
-	protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
-		$index = ( count( $this->line_items ) / 4 ) + 1;
-
-		$item = apply_filters(
-			'getpaid_paypal_line_item',
-			array(
-				'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
-				'quantity'    => (float) $quantity,
-				'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
-				'item_number' => $item_number,
-			),
-			$item_name,
-			$quantity,
-			$amount,
-			$item_number
-		);
+     * Add PayPal Line Item.
+     *
+     * @param  string $item_name Item name.
+     * @param  float    $quantity Item quantity.
+     * @param  float  $amount Amount.
+     * @param  string $item_number Item number.
+     */
+    protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
+        $index = ( count( $this->line_items ) / 4 ) + 1;
 
-		$this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
+        $item = apply_filters(
+            'getpaid_paypal_line_item',
+            array(
+                'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+                'quantity'    => (float) $quantity,
+                'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
+                'item_number' => $item_number,
+            ),
+            $item_name,
+            $quantity,
+            $amount,
+            $item_number
+        );
+
+        $this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
         $this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
 
         // The price or amount of the product, service, or contribution, not including shipping, handling, or tax.
-		$this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
-		$this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
+        $this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
+        $this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
     }
 
     /**
-	 * If the default request with line items is too long, generate a new one with only one line item.
-	 *
-	 * https://support.microsoft.com/en-us/help/208427/maximum-url-length-is-2-083-characters-in-internet-explorer.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice to be sent to Paypal.
-	 * @param array    $paypal_args Arguments sent to Paypal in the request.
-	 * @return array
-	 */
-	protected function fix_request_length( $invoice, $paypal_args ) {
-		$max_paypal_length = 2083;
-		$query_candidate   = http_build_query( $paypal_args, '', '&' );
-
-		if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
-			return $paypal_args;
-		}
-
-		return apply_filters(
-			'getpaid_paypal_args',
-			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, true )
-			),
-			$invoice
-		);
+     * If the default request with line items is too long, generate a new one with only one line item.
+     *
+     * https://support.microsoft.com/en-us/help/208427/maximum-url-length-is-2-083-characters-in-internet-explorer.
+     *
+     * @param WPInv_Invoice $invoice Invoice to be sent to Paypal.
+     * @param array    $paypal_args Arguments sent to Paypal in the request.
+     * @return array
+     */
+    protected function fix_request_length( $invoice, $paypal_args ) {
+        $max_paypal_length = 2083;
+        $query_candidate   = http_build_query( $paypal_args, '', '&' );
+
+        if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
+            return $paypal_args;
+        }
+
+        return apply_filters(
+            'getpaid_paypal_args',
+            array_merge(
+                $this->get_transaction_args( $invoice ),
+                $this->get_line_item_args( $invoice, true )
+            ),
+            $invoice
+        );
 
     }
 
     /**
-	 * Processes recurring invoices.
-	 *
-	 * @param  array $paypal_args PayPal args.
-	 * @param  WPInv_Invoice    $invoice Invoice object.
-	 */
-	public function process_subscription( $paypal_args, $invoice ) {
+     * Processes recurring invoices.
+     *
+     * @param  array $paypal_args PayPal args.
+     * @param  WPInv_Invoice    $invoice Invoice object.
+     */
+    public function process_subscription( $paypal_args, $invoice ) {
 
         // Make sure this is a subscription.
         if ( ! $invoice->is_recurring() || ! $subscription = getpaid_get_invoice_subscription( $invoice ) ) {
@@ -384,11 +384,11 @@ 
 
             $paypal_args['a1'] = 0 == $initial_amount ? 0 : $initial_amount;
 
-			// Trial period length.
-			$paypal_args['p1'] = $subscription_item->get_trial_interval();
+            // Trial period length.
+            $paypal_args['p1'] = $subscription_item->get_trial_interval();
 
-			// Trial period.
-			$paypal_args['t1'] = $subscription_item->get_trial_period();
+            // Trial period.
+            $paypal_args['t1'] = $subscription_item->get_trial_period();
 
         } else if ( $initial_amount != $recurring_amount ) {
 
@@ -411,40 +411,40 @@ 
         }
 
         // We have a recurring payment
-		if ( ! isset( $param_number ) || 1 == $param_number ) {
+        if ( ! isset( $param_number ) || 1 == $param_number ) {
 
-			// Subscription price
-			$paypal_args['a3'] = $recurring_amount;
+            // Subscription price
+            $paypal_args['a3'] = $recurring_amount;
 
-			// Subscription duration
-			$paypal_args['p3'] = $interval;
+            // Subscription duration
+            $paypal_args['p3'] = $interval;
 
-			// Subscription period
-			$paypal_args['t3'] = $period;
+            // Subscription period
+            $paypal_args['t3'] = $period;
 
         }
 
         // Recurring payments
-		if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
+        if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
 
-			// Non-recurring payments
-			$paypal_args['src'] = 0;
+            // Non-recurring payments
+            $paypal_args['src'] = 0;
 
-		} else {
+        } else {
 
-			$paypal_args['src'] = 1;
+            $paypal_args['src'] = 1;
 
-			if ( $bill_times > 0 ) {
+            if ( $bill_times > 0 ) {
 
-				// An initial period is being used to charge a sign-up fee
-				if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
-					$bill_times--;
-				}
+                // An initial period is being used to charge a sign-up fee
+                if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
+                    $bill_times--;
+                }
 
                 // Make sure it's not over the max of 52
                 $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
 
-			}
+            }
         }
 
         // Force return URL so that order description & instructions display
@@ -460,19 +460,19 @@ 
         }
 
         return apply_filters(
-			'getpaid_paypal_subscription_args',
-			$paypal_args,
-			$invoice
+            'getpaid_paypal_subscription_args',
+            $paypal_args,
+            $invoice
         );
 
     }
 
     /**
-	 * Processes ipns and marks payments as complete.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {
+     * Processes ipns and marks payments as complete.
+     *
+     * @return void
+     */
+    public function verify_ipn() {
         new GetPaid_Paypal_Gateway_IPN_Handler( $this );
     }
 
@@ -482,19 +482,19 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-			__( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
-			'<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
-			'</a>'
-		);
+            __( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
+            '<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
+            '</a>'
+        );
 
     }
 
-	/**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+    /**
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $currencies = sprintf(
             __( 'Supported Currencies: %s', 'invoicing' ),
@@ -503,7 +503,7 @@ 
 
         $admin_settings['paypal_active']['desc'] .= " ($currencies)";
         $admin_settings['paypal_desc']['std']     = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' );
-		/*
+        /*
 		// Access tokens.
         $live_account    = wpinv_get_option( 'paypal_live_access_token' );
         $sandbox_account = wpinv_get_option( 'paypal_test_access_token' );
@@ -534,12 +534,12 @@ 
 		*/
         $admin_settings['paypal_email'] = array(
             'type'  => 'text',
-			'class' => 'live-auth-data',
+            'class' => 'live-auth-data',
             'id'    => 'paypal_email',
             'name'  => __( 'Live Email Address', 'invoicing' ),
             'desc'  => __( 'The email address of your PayPal account.', 'invoicing' ),
         );
-		/*
+        /*
 		$admin_settings['paypal_merchant_id'] = array(
             'type'  => 'text',
 			'class' => 'live-auth-data',
@@ -600,29 +600,29 @@ 
             'readonly' => true,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
-	/**
-	 * Retrieves the PayPal connect URL when using the setup wizzard.
-	 *
-	 *
+    /**
+     * Retrieves the PayPal connect URL when using the setup wizzard.
+     *
+     *
      * @param array $data
      * @return string
-	 */
-	public static function maybe_get_connect_url( $url = '', $data ) {
-		return self::get_connect_url( false, urldecode( $data['redirect'] ) );
-	}
-
-	/**
-	 * Retrieves the PayPal connect URL.
-	 *
-	 *
+     */
+    public static function maybe_get_connect_url( $url = '', $data ) {
+        return self::get_connect_url( false, urldecode( $data['redirect'] ) );
+    }
+
+    /**
+     * Retrieves the PayPal connect URL.
+     *
+     *
      * @param bool $is_sandbox
-	 * @param string $redirect
+     * @param string $redirect
      * @return string
-	 */
-	public static function get_connect_url( $is_sandbox, $redirect = '' ) {
+     */
+    public static function get_connect_url( $is_sandbox, $redirect = '' ) {
 
         $redirect_url = add_query_arg(
             array(
@@ -632,7 +632,7 @@ 
                 'tab'                  => 'gateways',
                 'section'              => 'paypal',
                 'getpaid-nonce'        => wp_create_nonce( 'getpaid-nonce' ),
-				'redirect'             => urlencode( $redirect ),
+                'redirect'             => urlencode( $redirect ),
             ),
             admin_url( 'admin.php' )
         );
@@ -647,12 +647,12 @@ 
 
     }
 
-	/**
-	 * Generates settings page js.
-	 *
+    /**
+     * Generates settings page js.
+     *
      * @return void
-	 */
-	public static function get_js() { return '';
+     */
+    public static function get_js() { return '';
         ob_start();
         ?>
             <script>
@@ -698,109 +698,109 @@ 
         return ob_get_clean();
     }
 
-	/**
-	 * Connects to PayPal.
-	 *
-	 * @param array $data Connection data.
-	 * @return void
-	 */
-	public function connect_paypal( $data ) {
-
-		$sandbox      = $this->is_sandbox();
-		$data         = wp_unslash( $data );
-		$access_token = empty( $data['access_token'] ) ? '' : sanitize_text_field( $data['access_token'] );
-
-		if ( isset( $data['live_mode'] ) ) {
-			$sandbox = empty( $data['live_mode'] );
-		}
-
-		wpinv_update_option( 'paypal_sandbox', (int) $sandbox );
-		wpinv_update_option( 'paypal_active', 1 );
-
-		if ( ! empty( $data['error_description'] ) ) {
-			getpaid_admin()->show_error( wp_kses_post( urldecode( $data['error_description'] ) ) );
-		} else {
-
-			// Retrieve the user info.
-			$user_info = wp_remote_get(
-				! $sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
-				array(
-
-					'headers' => array(
-						'Authorization' => 'Bearer ' . $access_token,
-						'Content-type'  => 'application/json',
-					)
-
-				)
-			);
-
-			if ( is_wp_error( $user_info ) ) {
-				getpaid_admin()->show_error( wp_kses_post( $user_info->get_error_message() ) );
-			} else {
-
-				// Create application.
-				$user_info = json_decode( wp_remote_retrieve_body( $user_info ) );
-				$app       = wp_remote_post(
-					! $sandbox ? 'https://api-m.paypal.com/v1/identity/applications' : 'https://api-m.sandbox.paypal.com/v1/identity/applications',
-					array(
-
-						'body'    => array(
-							'application_type' => 'web',
-							'redirect_uris'    => array(
-								add_query_arg( 'getpaid_oauth', 'paypal', home_url() ),
-							),
-							'client_name'      => 'GetPaid',
-							'contacts'         => array( $user_info->emails[0]->value ),
-							'payer_id'         => $user_info->payer_id,
-							'migrated_app'     => '',
-						),
-						'headers' => array(
-							'Authorization' => 'Bearer ' . $access_token,
-							'Content-type'  => 'application/json',
-						)
-
-					)
-				);
-
-				if ( is_wp_error( $app ) ) {
-					getpaid_admin()->show_error( wp_kses_post( $app->get_error_message() ) );
-				} else {
-
-					$app = json_decode( wp_remote_retrieve_body( $app ) );
-					wpinv_error_log( $app );
-					if ( $sandbox ) {
-						wpinv_update_option( 'paypal_sandbox_email', sanitize_email( $user_info->emails[0]->value ) );
-						wpinv_update_option( 'paypal_sandbox_merchant_id', '' );
-						wpinv_update_option( 'paypal_sandbox_client_id', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_sandbox_client_secret', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_sandbox_client_secret_expires_at', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_sandbox_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-						set_transient( 'getpaid_paypal_sandbox_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-						getpaid_admin()->show_success( __( 'Successfully connected your PayPal sandbox account', 'invoicing' ) );
-					} else {
-						wpinv_update_option( 'paypal_email', sanitize_email( $user_info->emails[0]->value ) );
-						wpinv_update_option( 'paypal_merchant_id', '' );
-						wpinv_update_option( 'paypal_client_id', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_client_secret', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_client_secret_expires_at', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-						set_transient( 'getpaid_paypal_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-						getpaid_admin()->show_success( __( 'Successfully connected your PayPal account', 'invoicing' ) );
-					}
+    /**
+     * Connects to PayPal.
+     *
+     * @param array $data Connection data.
+     * @return void
+     */
+    public function connect_paypal( $data ) {
 
-				}
+        $sandbox      = $this->is_sandbox();
+        $data         = wp_unslash( $data );
+        $access_token = empty( $data['access_token'] ) ? '' : sanitize_text_field( $data['access_token'] );
 
-			}
+        if ( isset( $data['live_mode'] ) ) {
+            $sandbox = empty( $data['live_mode'] );
+        }
 
-		}
+        wpinv_update_option( 'paypal_sandbox', (int) $sandbox );
+        wpinv_update_option( 'paypal_active', 1 );
 
-		$redirect = empty( $data['redirect'] ) ? admin_url( 'admin.php?page=wpinv-settings&tab=gateways&section=paypal' ) : urldecode( $data['redirect'] );
+        if ( ! empty( $data['error_description'] ) ) {
+            getpaid_admin()->show_error( wp_kses_post( urldecode( $data['error_description'] ) ) );
+        } else {
+
+            // Retrieve the user info.
+            $user_info = wp_remote_get(
+                ! $sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
+                array(
+
+                    'headers' => array(
+                        'Authorization' => 'Bearer ' . $access_token,
+                        'Content-type'  => 'application/json',
+                    )
 
-		if ( isset( $data['step'] ) ) {
-			$redirect = add_query_arg( 'step', $data['step'], $redirect );
-		}
-		wp_redirect( $redirect );
-		exit;
-	}
+                )
+            );
+
+            if ( is_wp_error( $user_info ) ) {
+                getpaid_admin()->show_error( wp_kses_post( $user_info->get_error_message() ) );
+            } else {
+
+                // Create application.
+                $user_info = json_decode( wp_remote_retrieve_body( $user_info ) );
+                $app       = wp_remote_post(
+                    ! $sandbox ? 'https://api-m.paypal.com/v1/identity/applications' : 'https://api-m.sandbox.paypal.com/v1/identity/applications',
+                    array(
+
+                        'body'    => array(
+                            'application_type' => 'web',
+                            'redirect_uris'    => array(
+                                add_query_arg( 'getpaid_oauth', 'paypal', home_url() ),
+                            ),
+                            'client_name'      => 'GetPaid',
+                            'contacts'         => array( $user_info->emails[0]->value ),
+                            'payer_id'         => $user_info->payer_id,
+                            'migrated_app'     => '',
+                        ),
+                        'headers' => array(
+                            'Authorization' => 'Bearer ' . $access_token,
+                            'Content-type'  => 'application/json',
+                        )
+
+                    )
+                );
+
+                if ( is_wp_error( $app ) ) {
+                    getpaid_admin()->show_error( wp_kses_post( $app->get_error_message() ) );
+                } else {
+
+                    $app = json_decode( wp_remote_retrieve_body( $app ) );
+                    wpinv_error_log( $app );
+                    if ( $sandbox ) {
+                        wpinv_update_option( 'paypal_sandbox_email', sanitize_email( $user_info->emails[0]->value ) );
+                        wpinv_update_option( 'paypal_sandbox_merchant_id', '' );
+                        wpinv_update_option( 'paypal_sandbox_client_id', sanitize_text_field( '' ) );
+                        wpinv_update_option( 'paypal_sandbox_client_secret', sanitize_text_field( '' ) );
+                        wpinv_update_option( 'paypal_sandbox_client_secret_expires_at', sanitize_text_field( '' ) );
+                        wpinv_update_option( 'paypal_sandbox_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
+                        set_transient( 'getpaid_paypal_sandbox_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
+                        getpaid_admin()->show_success( __( 'Successfully connected your PayPal sandbox account', 'invoicing' ) );
+                    } else {
+                        wpinv_update_option( 'paypal_email', sanitize_email( $user_info->emails[0]->value ) );
+                        wpinv_update_option( 'paypal_merchant_id', '' );
+                        wpinv_update_option( 'paypal_client_id', sanitize_text_field( '' ) );
+                        wpinv_update_option( 'paypal_client_secret', sanitize_text_field( '' ) );
+                        wpinv_update_option( 'paypal_client_secret_expires_at', sanitize_text_field( '' ) );
+                        wpinv_update_option( 'paypal_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
+                        set_transient( 'getpaid_paypal_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
+                        getpaid_admin()->show_success( __( 'Successfully connected your PayPal account', 'invoicing' ) );
+                    }
+
+                }
+
+            }
+
+        }
+
+        $redirect = empty( $data['redirect'] ) ? admin_url( 'admin.php?page=wpinv-settings&tab=gateways&section=paypal' ) : urldecode( $data['redirect'] );
+
+        if ( isset( $data['step'] ) ) {
+            $redirect = add_query_arg( 'step', $data['step'], $redirect );
+        }
+        wp_redirect( $redirect );
+        exit;
+    }
 
 }

Spacing +149 added lines, -149 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Paypal Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'sandbox', 'single_subscription_group' );
+    protected $supports = array('subscription', 'sandbox', 'single_subscription_group');
 
     /**
 	 * Payment method order.
@@ -59,7 +59,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
+	public $currencies = array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR');
 
     /**
 	 * URL to view a transaction.
@@ -80,15 +80,15 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'PayPal Standard', 'invoicing' );
-        $this->method_title         = __( 'PayPal Standard', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to PayPal', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->title                = __('PayPal Standard', 'invoicing');
+        $this->method_title         = __('PayPal Standard', 'invoicing');
+        $this->checkout_button_text = __('Proceed to PayPal', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-		add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
-        add_filter( 'getpaid_paypal_sandbox_notice', array( $this, 'sandbox_notice' ) );
-		add_filter( 'getpaid_get_paypal_connect_url', array( $this, 'maybe_get_connect_url' ), 10, 2 );
-		add_action( 'getpaid_authenticated_admin_action_connect_paypal', array( $this, 'connect_paypal' ) );
+		add_filter('getpaid_paypal_args', array($this, 'process_subscription'), 10, 2);
+        add_filter('getpaid_paypal_sandbox_notice', array($this, 'sandbox_notice'));
+		add_filter('getpaid_get_paypal_connect_url', array($this, 'maybe_get_connect_url'), 10, 2);
+		add_action('getpaid_authenticated_admin_action_connect_paypal', array($this, 'connect_paypal'));
 
         parent::__construct();
     }
@@ -102,16 +102,16 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Get redirect url.
-        $paypal_redirect = $this->get_request_url( $invoice );
+        $paypal_redirect = $this->get_request_url($invoice);
 
         // Add a note about the request url.
         $invoice->add_note(
             sprintf(
-                __( 'Redirecting to PayPal: %s', 'invoicing' ),
-                esc_url( $paypal_redirect )
+                __('Redirecting to PayPal: %s', 'invoicing'),
+                esc_url($paypal_redirect)
             ),
             false,
             false,
@@ -119,7 +119,7 @@ 
         );
 
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
 
     }
@@ -130,21 +130,21 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
 
         // Retrieve paypal args.
-        $paypal_args       = map_deep( $this->get_paypal_args( $invoice ), 'urlencode' );
+        $paypal_args = map_deep($this->get_paypal_args($invoice), 'urlencode');
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $paypal_args['bn'] = 'GetPaid_Subscribe_WPS_US';
         } else {
             $paypal_args['bn'] = 'GetPaid_ShoppingCart_WPS_US';
         }
 
-        return add_query_arg( $paypal_args, $this->endpoint );
+        return add_query_arg($paypal_args, $this->endpoint);
 
 	}
 
@@ -154,25 +154,25 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_paypal_args( $invoice ) {
+	protected function get_paypal_args($invoice) {
 
         // Whether or not to send the line items as one item.
-		$force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
+		$force_one_line_item = apply_filters('getpaid_paypal_force_one_line_item', true, $invoice);
 
-		if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
+		if ($invoice->is_recurring() || (wpinv_use_taxes() && wpinv_prices_include_tax())) {
 			$force_one_line_item = true;
 		}
 
 		$paypal_args = apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, $force_one_line_item )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, $force_one_line_item)
 			),
 			$invoice
 		);
 
-		return $this->fix_request_length( $invoice, $paypal_args );
+		return $this->fix_request_length($invoice, $paypal_args);
     }
 
     /**
@@ -181,11 +181,11 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_transaction_args( $invoice ) {
+	protected function get_transaction_args($invoice) {
 
 		return array(
             'cmd'           => '_cart',
-            'business'      => wpinv_get_option( 'paypal_email', false ),
+            'business'      => wpinv_get_option('paypal_email', false),
             'no_shipping'   => '1',
             'shipping'      => '0',
             'no_note'       => '1',
@@ -193,16 +193,16 @@ 
             'rm'            => is_ssl() ? 2 : 1,
             'upload'        => 1,
             'currency_code' => $invoice->get_currency(), // https://developer.paypal.com/docs/nvp-soap-api/currency-codes/#paypal
-            'return'        => esc_url_raw( $this->get_return_url( $invoice ) ),
-            'cancel_return' => esc_url_raw( $invoice->get_checkout_payment_url() ),
-            'notify_url'    => getpaid_limit_length( $this->notify_url, 255 ),
-            'invoice'       => getpaid_limit_length( $invoice->get_number(), 127 ),
+            'return'        => esc_url_raw($this->get_return_url($invoice)),
+            'cancel_return' => esc_url_raw($invoice->get_checkout_payment_url()),
+            'notify_url'    => getpaid_limit_length($this->notify_url, 255),
+            'invoice'       => getpaid_limit_length($invoice->get_number(), 127),
             'custom'        => $invoice->get_id(),
-            'first_name'    => getpaid_limit_length( $invoice->get_first_name(), 32 ),
-            'last_name'     => getpaid_limit_length( $invoice->get_last_name(), 64 ),
-            'country'       => getpaid_limit_length( $invoice->get_country(), 2 ),
-            'email'         => getpaid_limit_length( $invoice->get_email(), 127 ),
-            'cbt'           => get_bloginfo( 'name' )
+            'first_name'    => getpaid_limit_length($invoice->get_first_name(), 32),
+            'last_name'     => getpaid_limit_length($invoice->get_last_name(), 64),
+            'country'       => getpaid_limit_length($invoice->get_country(), 2),
+            'email'         => getpaid_limit_length($invoice->get_email(), 127),
+            'cbt'           => get_bloginfo('name')
         );
 
     }
@@ -214,30 +214,30 @@ 
 	 * @param  bool     $force_one_line_item Create only one item for this invoice.
 	 * @return array
 	 */
-	protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
+	protected function get_line_item_args($invoice, $force_one_line_item = false) {
 
         // Maybe send invoice as a single item.
-		if ( $force_one_line_item ) {
-            return $this->get_line_item_args_single_item( $invoice );
+		if ($force_one_line_item) {
+            return $this->get_line_item_args_single_item($invoice);
         }
 
         // Send each line item individually.
         $line_item_args = array();
 
         // Prepare line items.
-        $this->prepare_line_items( $invoice );
+        $this->prepare_line_items($invoice);
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() && $invoice->is_taxable() ) {
-            $line_item_args['tax_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_tax(), 2 );
+        if (wpinv_use_taxes() && $invoice->is_taxable()) {
+            $line_item_args['tax_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_tax(), 2);
         }
 
         // Add discount.
-        if ( $invoice->get_total_discount() > 0 ) {
-            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_discount(), 2 );
+        if ($invoice->get_total_discount() > 0) {
+            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_discount(), 2);
         }
 
-		return array_merge( $line_item_args, $this->get_line_items() );
+		return array_merge($line_item_args, $this->get_line_items());
 
     }
 
@@ -247,11 +247,11 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_line_item_args_single_item( $invoice ) {
+	protected function get_line_item_args_single_item($invoice) {
 		$this->delete_line_items();
 
-        $item_name = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
-		$this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
+        $item_name = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
+		$this->add_line_item($item_name, 1, wpinv_round_amount((float) $invoice->get_total(), 2, true), $invoice->get_id());
 
 		return $this->get_line_items();
     }
@@ -275,19 +275,19 @@ 
 	 *
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 */
-	protected function prepare_line_items( $invoice ) {
+	protected function prepare_line_items($invoice) {
 		$this->delete_line_items();
 
 		// Items.
-		foreach ( $invoice->get_items() as $item ) {
+		foreach ($invoice->get_items() as $item) {
 			$amount   = $item->get_price();
 			$quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
-			$this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
+			$this->add_line_item($item->get_raw_name(), $quantity, $amount, $item->get_id());
         }
 
         // Fees.
-		foreach ( $invoice->get_fees() as $fee => $data ) {
-            $this->add_line_item( $fee, 1, wpinv_sanitize_amount( $data['initial_fee'] ) );
+		foreach ($invoice->get_fees() as $fee => $data) {
+            $this->add_line_item($fee, 1, wpinv_sanitize_amount($data['initial_fee']));
         }
 
     }
@@ -300,15 +300,15 @@ 
 	 * @param  float  $amount Amount.
 	 * @param  string $item_number Item number.
 	 */
-	protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
-		$index = ( count( $this->line_items ) / 4 ) + 1;
+	protected function add_line_item($item_name, $quantity = 1, $amount = 0.0, $item_number = '') {
+		$index = (count($this->line_items) / 4) + 1;
 
 		$item = apply_filters(
 			'getpaid_paypal_line_item',
 			array(
-				'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+				'item_name'   => html_entity_decode(getpaid_limit_length($item_name ? wp_strip_all_tags($item_name) : __('Item', 'invoicing'), 127), ENT_NOQUOTES, 'UTF-8'),
 				'quantity'    => (float) $quantity,
-				'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
+				'amount'      => wpinv_sanitize_amount((float) $amount, 2),
 				'item_number' => $item_number,
 			),
 			$item_name,
@@ -317,12 +317,12 @@ 
 			$item_number
 		);
 
-		$this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
-        $this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
+		$this->line_items['item_name_' . $index] = getpaid_limit_length($item['item_name'], 127);
+        $this->line_items['quantity_' . $index] = $item['quantity'];
 
         // The price or amount of the product, service, or contribution, not including shipping, handling, or tax.
-		$this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
-		$this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
+		$this->line_items['amount_' . $index]      = $item['amount'] * $item['quantity'];
+		$this->line_items['item_number_' . $index] = getpaid_limit_length($item['item_number'], 127);
     }
 
     /**
@@ -334,19 +334,19 @@ 
 	 * @param array    $paypal_args Arguments sent to Paypal in the request.
 	 * @return array
 	 */
-	protected function fix_request_length( $invoice, $paypal_args ) {
+	protected function fix_request_length($invoice, $paypal_args) {
 		$max_paypal_length = 2083;
-		$query_candidate   = http_build_query( $paypal_args, '', '&' );
+		$query_candidate   = http_build_query($paypal_args, '', '&');
 
-		if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
+		if (strlen($this->endpoint . $query_candidate) <= $max_paypal_length) {
 			return $paypal_args;
 		}
 
 		return apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, true )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, true)
 			),
 			$invoice
 		);
@@ -359,10 +359,10 @@ 
 	 * @param  array $paypal_args PayPal args.
 	 * @param  WPInv_Invoice    $invoice Invoice object.
 	 */
-	public function process_subscription( $paypal_args, $invoice ) {
+	public function process_subscription($paypal_args, $invoice) {
 
         // Make sure this is a subscription.
-        if ( ! $invoice->is_recurring() || ! $subscription = getpaid_get_invoice_subscription( $invoice ) ) {
+        if (!$invoice->is_recurring() || !$subscription = getpaid_get_invoice_subscription($invoice)) {
             return $paypal_args;
         }
 
@@ -370,17 +370,17 @@ 
         $paypal_args['cmd'] = '_xclick-subscriptions';
 
         // Subscription name.
-        $paypal_args['item_name'] = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
+        $paypal_args['item_name'] = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
 
         // Get subscription args.
-        $period                 = strtoupper( substr( $subscription->get_period(), 0, 1) );
+        $period                 = strtoupper(substr($subscription->get_period(), 0, 1));
         $interval               = (int) $subscription->get_frequency();
         $bill_times             = (int) $subscription->get_bill_times();
-        $initial_amount         = (float) wpinv_sanitize_amount( $invoice->get_initial_total(), 2 );
-        $recurring_amount       = (float) wpinv_sanitize_amount( $invoice->get_recurring_total(), 2 );
-        $subscription_item      = $invoice->get_recurring( true );
+        $initial_amount         = (float) wpinv_sanitize_amount($invoice->get_initial_total(), 2);
+        $recurring_amount       = (float) wpinv_sanitize_amount($invoice->get_recurring_total(), 2);
+        $subscription_item      = $invoice->get_recurring(true);
 
-        if ( $subscription_item->has_free_trial() ) {
+        if ($subscription_item->has_free_trial()) {
 
             $paypal_args['a1'] = 0 == $initial_amount ? 0 : $initial_amount;
 
@@ -390,28 +390,28 @@ 
 			// Trial period.
 			$paypal_args['t1'] = $subscription_item->get_trial_period();
 
-        } else if ( $initial_amount != $recurring_amount ) {
+        } else if ($initial_amount != $recurring_amount) {
 
             // No trial period, but initial amount includes a sign-up fee and/or other items, so charge it as a separate period.
 
-            if ( 1 == $bill_times ) {
+            if (1 == $bill_times) {
                 $param_number = 3;
             } else {
                 $param_number = 1;
             }
 
-            $paypal_args[ 'a' . $param_number ] = $initial_amount ? $initial_amount : 0;
+            $paypal_args['a' . $param_number] = $initial_amount ? $initial_amount : 0;
 
             // Sign Up interval
-            $paypal_args[ 'p' . $param_number ] = $interval;
+            $paypal_args['p' . $param_number] = $interval;
 
             // Sign Up unit of duration
-            $paypal_args[ 't' . $param_number ] = $period;
+            $paypal_args['t' . $param_number] = $period;
 
         }
 
         // We have a recurring payment
-		if ( ! isset( $param_number ) || 1 == $param_number ) {
+		if (!isset($param_number) || 1 == $param_number) {
 
 			// Subscription price
 			$paypal_args['a3'] = $recurring_amount;
@@ -425,7 +425,7 @@ 
         }
 
         // Recurring payments
-		if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
+		if (1 == $bill_times || ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial() && 2 == $bill_times)) {
 
 			// Non-recurring payments
 			$paypal_args['src'] = 0;
@@ -434,15 +434,15 @@ 
 
 			$paypal_args['src'] = 1;
 
-			if ( $bill_times > 0 ) {
+			if ($bill_times > 0) {
 
 				// An initial period is being used to charge a sign-up fee
-				if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
+				if ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial()) {
 					$bill_times--;
 				}
 
                 // Make sure it's not over the max of 52
-                $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+                $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
 
 			}
         }
@@ -451,10 +451,10 @@ 
         $paypal_args['rm'] = 2;
 
         // Get rid of redudant items.
-        foreach ( array( 'item_name_1', 'quantity_1', 'amount_1', 'item_number_1' ) as $arg ) {
+        foreach (array('item_name_1', 'quantity_1', 'amount_1', 'item_number_1') as $arg) {
 
-            if ( isset( $paypal_args[ $arg ] ) ) {
-                unset( $paypal_args[ $arg ] );
+            if (isset($paypal_args[$arg])) {
+                unset($paypal_args[$arg]);
             }
 
         }
@@ -473,7 +473,7 @@ 
 	 * @return void
 	 */
 	public function verify_ipn() {
-        new GetPaid_Paypal_Gateway_IPN_Handler( $this );
+        new GetPaid_Paypal_Gateway_IPN_Handler($this);
     }
 
     /**
@@ -482,7 +482,7 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-			__( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
+			__('SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing'),
 			'<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
 			'</a>'
 		);
@@ -494,15 +494,15 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['paypal_active']['desc'] .= " ($currencies)";
-        $admin_settings['paypal_desc']['std']     = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' );
+        $admin_settings['paypal_desc']['std']     = __('Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing');
 		/*
 		// Access tokens.
         $live_account    = wpinv_get_option( 'paypal_live_access_token' );
@@ -536,8 +536,8 @@ 
             'type'  => 'text',
 			'class' => 'live-auth-data',
             'id'    => 'paypal_email',
-            'name'  => __( 'Live Email Address', 'invoicing' ),
-            'desc'  => __( 'The email address of your PayPal account.', 'invoicing' ),
+            'name'  => __('Live Email Address', 'invoicing'),
+            'desc'  => __('The email address of your PayPal account.', 'invoicing'),
         );
 		/*
 		$admin_settings['paypal_merchant_id'] = array(
@@ -594,9 +594,9 @@ 
         $admin_settings['paypal_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'paypal_ipn_url',
-            'name'     => __( 'IPN Url', 'invoicing' ),
+            'name'     => __('IPN Url', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( "If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing' ) . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'desc'     => __("If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing') . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
             'readonly' => true,
         );
 
@@ -610,8 +610,8 @@ 
      * @param array $data
      * @return string
 	 */
-	public static function maybe_get_connect_url( $url = '', $data ) {
-		return self::get_connect_url( false, urldecode( $data['redirect'] ) );
+	public static function maybe_get_connect_url($url = '', $data) {
+		return self::get_connect_url(false, urldecode($data['redirect']));
 	}
 
 	/**
@@ -622,25 +622,25 @@ 
 	 * @param string $redirect
      * @return string
 	 */
-	public static function get_connect_url( $is_sandbox, $redirect = '' ) {
+	public static function get_connect_url($is_sandbox, $redirect = '') {
 
         $redirect_url = add_query_arg(
             array(
                 'getpaid-admin-action' => 'connect_paypal',
                 'page'                 => 'wpinv-settings',
-                'live_mode'            => (int) empty( $is_sandbox ),
+                'live_mode'            => (int) empty($is_sandbox),
                 'tab'                  => 'gateways',
                 'section'              => 'paypal',
-                'getpaid-nonce'        => wp_create_nonce( 'getpaid-nonce' ),
-				'redirect'             => urlencode( $redirect ),
+                'getpaid-nonce'        => wp_create_nonce('getpaid-nonce'),
+				'redirect'             => urlencode($redirect),
             ),
-            admin_url( 'admin.php' )
+            admin_url('admin.php')
         );
 
         return add_query_arg(
             array(
-                'live_mode'    => (int) empty( $is_sandbox ),
-                'redirect_url' => urlencode( str_replace( '&amp;', '&', $redirect_url ) )
+                'live_mode'    => (int) empty($is_sandbox),
+                'redirect_url' => urlencode(str_replace('&amp;', '&', $redirect_url))
             ),
             'https://ayecode.io/oauth/paypal'
         );
@@ -704,26 +704,26 @@ 
 	 * @param array $data Connection data.
 	 * @return void
 	 */
-	public function connect_paypal( $data ) {
+	public function connect_paypal($data) {
 
 		$sandbox      = $this->is_sandbox();
-		$data         = wp_unslash( $data );
-		$access_token = empty( $data['access_token'] ) ? '' : sanitize_text_field( $data['access_token'] );
+		$data         = wp_unslash($data);
+		$access_token = empty($data['access_token']) ? '' : sanitize_text_field($data['access_token']);
 
-		if ( isset( $data['live_mode'] ) ) {
-			$sandbox = empty( $data['live_mode'] );
+		if (isset($data['live_mode'])) {
+			$sandbox = empty($data['live_mode']);
 		}
 
-		wpinv_update_option( 'paypal_sandbox', (int) $sandbox );
-		wpinv_update_option( 'paypal_active', 1 );
+		wpinv_update_option('paypal_sandbox', (int) $sandbox);
+		wpinv_update_option('paypal_active', 1);
 
-		if ( ! empty( $data['error_description'] ) ) {
-			getpaid_admin()->show_error( wp_kses_post( urldecode( $data['error_description'] ) ) );
+		if (!empty($data['error_description'])) {
+			getpaid_admin()->show_error(wp_kses_post(urldecode($data['error_description'])));
 		} else {
 
 			// Retrieve the user info.
 			$user_info = wp_remote_get(
-				! $sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
+				!$sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
 				array(
 
 					'headers' => array(
@@ -734,23 +734,23 @@ 
 				)
 			);
 
-			if ( is_wp_error( $user_info ) ) {
-				getpaid_admin()->show_error( wp_kses_post( $user_info->get_error_message() ) );
+			if (is_wp_error($user_info)) {
+				getpaid_admin()->show_error(wp_kses_post($user_info->get_error_message()));
 			} else {
 
 				// Create application.
-				$user_info = json_decode( wp_remote_retrieve_body( $user_info ) );
+				$user_info = json_decode(wp_remote_retrieve_body($user_info));
 				$app       = wp_remote_post(
-					! $sandbox ? 'https://api-m.paypal.com/v1/identity/applications' : 'https://api-m.sandbox.paypal.com/v1/identity/applications',
+					!$sandbox ? 'https://api-m.paypal.com/v1/identity/applications' : 'https://api-m.sandbox.paypal.com/v1/identity/applications',
 					array(
 
 						'body'    => array(
 							'application_type' => 'web',
 							'redirect_uris'    => array(
-								add_query_arg( 'getpaid_oauth', 'paypal', home_url() ),
+								add_query_arg('getpaid_oauth', 'paypal', home_url()),
 							),
 							'client_name'      => 'GetPaid',
-							'contacts'         => array( $user_info->emails[0]->value ),
+							'contacts'         => array($user_info->emails[0]->value),
 							'payer_id'         => $user_info->payer_id,
 							'migrated_app'     => '',
 						),
@@ -762,30 +762,30 @@ 
 					)
 				);
 
-				if ( is_wp_error( $app ) ) {
-					getpaid_admin()->show_error( wp_kses_post( $app->get_error_message() ) );
+				if (is_wp_error($app)) {
+					getpaid_admin()->show_error(wp_kses_post($app->get_error_message()));
 				} else {
 
-					$app = json_decode( wp_remote_retrieve_body( $app ) );
-					wpinv_error_log( $app );
-					if ( $sandbox ) {
-						wpinv_update_option( 'paypal_sandbox_email', sanitize_email( $user_info->emails[0]->value ) );
-						wpinv_update_option( 'paypal_sandbox_merchant_id', '' );
-						wpinv_update_option( 'paypal_sandbox_client_id', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_sandbox_client_secret', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_sandbox_client_secret_expires_at', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_sandbox_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-						set_transient( 'getpaid_paypal_sandbox_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-						getpaid_admin()->show_success( __( 'Successfully connected your PayPal sandbox account', 'invoicing' ) );
+					$app = json_decode(wp_remote_retrieve_body($app));
+					wpinv_error_log($app);
+					if ($sandbox) {
+						wpinv_update_option('paypal_sandbox_email', sanitize_email($user_info->emails[0]->value));
+						wpinv_update_option('paypal_sandbox_merchant_id', '');
+						wpinv_update_option('paypal_sandbox_client_id', sanitize_text_field(''));
+						wpinv_update_option('paypal_sandbox_client_secret', sanitize_text_field(''));
+						wpinv_update_option('paypal_sandbox_client_secret_expires_at', sanitize_text_field(''));
+						wpinv_update_option('paypal_sandbox_refresh_token', sanitize_text_field(urldecode($data['refresh_token'])));
+						set_transient('getpaid_paypal_sandbox_access_token', sanitize_text_field(urldecode($data['access_token'])), (int) $data['expires_in']);
+						getpaid_admin()->show_success(__('Successfully connected your PayPal sandbox account', 'invoicing'));
 					} else {
-						wpinv_update_option( 'paypal_email', sanitize_email( $user_info->emails[0]->value ) );
-						wpinv_update_option( 'paypal_merchant_id', '' );
-						wpinv_update_option( 'paypal_client_id', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_client_secret', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_client_secret_expires_at', sanitize_text_field( '' ) );
-						wpinv_update_option( 'paypal_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-						set_transient( 'getpaid_paypal_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-						getpaid_admin()->show_success( __( 'Successfully connected your PayPal account', 'invoicing' ) );
+						wpinv_update_option('paypal_email', sanitize_email($user_info->emails[0]->value));
+						wpinv_update_option('paypal_merchant_id', '');
+						wpinv_update_option('paypal_client_id', sanitize_text_field(''));
+						wpinv_update_option('paypal_client_secret', sanitize_text_field(''));
+						wpinv_update_option('paypal_client_secret_expires_at', sanitize_text_field(''));
+						wpinv_update_option('paypal_refresh_token', sanitize_text_field(urldecode($data['refresh_token'])));
+						set_transient('getpaid_paypal_access_token', sanitize_text_field(urldecode($data['access_token'])), (int) $data['expires_in']);
+						getpaid_admin()->show_success(__('Successfully connected your PayPal account', 'invoicing'));
 					}
 
 				}
@@ -794,12 +794,12 @@ 
 
 		}
 
-		$redirect = empty( $data['redirect'] ) ? admin_url( 'admin.php?page=wpinv-settings&tab=gateways&section=paypal' ) : urldecode( $data['redirect'] );
+		$redirect = empty($data['redirect']) ? admin_url('admin.php?page=wpinv-settings&tab=gateways&section=paypal') : urldecode($data['redirect']);
 
-		if ( isset( $data['step'] ) ) {
-			$redirect = add_query_arg( 'step', $data['step'], $redirect );
+		if (isset($data['step'])) {
+			$redirect = add_query_arg('step', $data['step'], $redirect);
 		}
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		exit;
 	}