AyeCode / invoicing

includes/admin/class-getpaid-admin.php

Indentation +222 added lines, -222 removed lines

@@ -14,62 +14,62 @@ 
 class GetPaid_Admin {
 
     /**
-	 * Local path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_path;
-
-	/**
-	 * Web path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
+     * Local path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_path;
+
+    /**
+     * Web path to this plugins admin directory
+     *
+     * @var         string
+     */
     public $admin_url;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct(){
+     * Class constructor.
+     */
+    public function __construct(){
 
         $this->admin_path  = plugin_dir_path( __FILE__ );
         $this->admin_url   = plugins_url( '/', __FILE__ );
 
         if ( is_admin() ) {
-			$this->init_admin_hooks();
+            $this->init_admin_hooks();
         }
 
     }
 
     /**
-	 * Init action and filter hooks
-	 *
-	 */
-	private function init_admin_hooks() {
+     * Init action and filter hooks
+     *
+     */
+    private function init_admin_hooks() {
         add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ) );
         add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
         add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
         add_action( 'admin_init', array( $this, 'activation_redirect') );
         add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action( 'admin_notices', array( $this, 'show_notices' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
+        do_action( 'getpaid_init_admin_hooks', $this );
 
     }
 
     /**
-	 * Register admin scripts
-	 *
-	 */
-	public function enqeue_scripts() {
+     * Register admin scripts
+     *
+     */
+    public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
-		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
+        $page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
@@ -93,30 +93,30 @@ 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+        if ( 'wpi_payment_form' == $page && $editing ) {
             $this->load_payment_form_scripts();
         }
 
         if ( $page == 'wpinv-subscriptions' ) {
-			wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-			wp_enqueue_script( 'wpinv-sub-admin-script' );
-		}
+            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
+            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        }
 
-		if ( $page == 'wpinv-reports' ) {
-			wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
-		}
+        if ( $page == 'wpinv-reports' ) {
+            wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
+        }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
-		}
+        if ( $page == 'wpinv-subscriptions' ) {
+            wp_enqueue_script( 'postbox' );
+        }
 
     }
 
     /**
-	 * Returns admin js translations.
-	 *
-	 */
-	protected function get_admin_i18() {
+     * Returns admin js translations.
+     *
+     */
+    protected function get_admin_i18() {
         global $post;
 
         $i18n = array(
@@ -152,50 +152,50 @@ 
             'searching'                 => __( 'Searching', 'invoicing' ),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+        if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$invoice              = new WPInv_Invoice( $post );
-			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_type() )
-			);
+            $invoice              = new WPInv_Invoice( $post );
+            $i18n['save_invoice'] = sprintf(
+                __( 'Save %s', 'invoicing' ),
+                ucfirst( $invoice->get_type() )
+            );
 
-			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_type() )
-			);
+            $i18n['invoice_description'] = sprintf(
+                __( '%s Description', 'invoicing' ),
+                ucfirst( $invoice->get_type() )
+            );
 
-		}
-		return $i18n;
+        }
+        return $i18n;
     }
 
     /**
-	 * Loads payment form js.
-	 *
-	 */
-	protected function load_payment_form_scripts() {
+     * Loads payment form js.
+     *
+     */
+    protected function load_payment_form_scripts() {
         global $post;
 
         wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
+        wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
+        wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
 
-		wp_localize_script(
+        wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
-				'currency'      => wpinv_currency_symbol(),
-				'position'      => wpinv_currency_position(),
-				'decimals'      => (int) wpinv_decimals(),
-				'thousands_sep' => wpinv_thousands_separator(),
-				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
-				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
+                'elements'      => wpinv_get_data( 'payment-form-elements' ),
+                'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+                'currency'      => wpinv_currency_symbol(),
+                'position'      => wpinv_currency_position(),
+                'decimals'      => (int) wpinv_decimals(),
+                'thousands_sep' => wpinv_thousands_separator(),
+                'decimals_sep'  => wpinv_decimal_separator(),
+                'form_items'    => gepaid_get_form_items( $post->ID ),
+                'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
@@ -204,20 +204,20 @@ 
     }
 
     /**
-	 * Add our classes to admin pages.
+     * Add our classes to admin pages.
      *
      * @param string $classes
      * @return string
-	 *
-	 */
+     *
+     */
     public function admin_body_class( $classes ) {
-		global $pagenow, $post, $current_screen;
+        global $pagenow, $post, $current_screen;
 
 
         $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         if ( false !== stripos( $page, 'wpi' ) ) {
@@ -226,29 +226,29 @@ 
 
         if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
             $classes .= ' wpinv-cpt wpinv';
-		}
+        }
 		
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+        if ( getpaid_is_invoice_post_type( $page ) ) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
-		return $classes;
+        return $classes;
     }
 
     /**
-	 * Maybe show the AyeCode Connect Notice.
-	 */
-	public function init_ayecode_connect_helper(){
+     * Maybe show the AyeCode Connect Notice.
+     */
+    public function init_ayecode_connect_helper(){
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-				'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-				'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-				'connect_button'    => __("Connect Site","invoicing"),
-				'connecting_button'    => __("Connecting...","invoicing"),
-				'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-				'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+                'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
+                'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
+                'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
+                'connect_button'    => __("Connect Site","invoicing"),
+                'connecting_button'    => __("Connecting...","invoicing"),
+                'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
+                'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
             ),
             array( 'wpi-addons' )
         );
@@ -260,21 +260,21 @@ 
      */
     public function activation_redirect() {
 
-		// Bail if no activation redirect.
-		if ( ! get_transient( '_wpinv_activation_redirect' ) || wp_doing_ajax() ) {
-			return;
-		}
+        // Bail if no activation redirect.
+        if ( ! get_transient( '_wpinv_activation_redirect' ) || wp_doing_ajax() ) {
+            return;
+        }
 
-		// Delete the redirect transient.
-		delete_transient( '_wpinv_activation_redirect' );
+        // Delete the redirect transient.
+        delete_transient( '_wpinv_activation_redirect' );
 
-		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-			return;
-		}
+        // Bail if activating from network, or bulk
+        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+            return;
+        }
 
-		wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
-		exit;
+        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        exit;
     }
 
     /**
@@ -289,150 +289,150 @@ 
 
     }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_invoice( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent the invoice to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent the invoice to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
     /**
-	 * Returns an array of admin notices.
-	 *
-	 * @since       1.0.19
+     * Returns an array of admin notices.
+     *
+     * @since       1.0.19
      * @return array
-	 */
-	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
+     */
+    public function get_notices() {
+        $notices = get_option( 'wpinv_admin_notices' );
         return is_array( $notices ) ? $notices : array();
-	}
-
-	/**
-	 * Clears all admin notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
-	}
-
-	/**
-	 * Saves a new admin notice
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function save_notice( $type, $message ) {
-		$notices = $this->get_notices();
-
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
-		}
-
-		$notices[ $type ][] = $message;
-
-		update_option( 'wpinv_admin_notices', $notices );
-	}
-
-	/**
-	 * Displays a success notice
-	 *
-	 * @param       string $msg The message to qeue.
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
-	}
-
-	/**
-	 * Displays a error notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
-	}
-
-	/**
-	 * Displays a warning notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
-	}
-
-	/**
-	 * Displays a info notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
-	}
-
-	/**
-	 * Show notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_notices() {
+    }
+
+    /**
+     * Clears all admin notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function clear_notices() {
+        delete_option( 'wpinv_admin_notices' );
+    }
+
+    /**
+     * Saves a new admin notice
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function save_notice( $type, $message ) {
+        $notices = $this->get_notices();
+
+        if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
+            $notices[ $type ] = array();
+        }
+
+        $notices[ $type ][] = $message;
+
+        update_option( 'wpinv_admin_notices', $notices );
+    }
+
+    /**
+     * Displays a success notice
+     *
+     * @param       string $msg The message to qeue.
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_success( $msg ) {
+        $this->save_notice( 'success', $msg );
+    }
+
+    /**
+     * Displays a error notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_error( $msg ) {
+        $this->save_notice( 'error', $msg );
+    }
+
+    /**
+     * Displays a warning notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_warning( $msg ) {
+        $this->save_notice( 'warning', $msg );
+    }
+
+    /**
+     * Displays a info notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_info( $msg ) {
+        $this->save_notice( 'info', $msg );
+    }
+
+    /**
+     * Show notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_notices() {
 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+        foreach ( $notices as $type => $messages ) {
 
-			if ( ! is_array( $messages ) ) {
-				continue;
-			}
+            if ( ! is_array( $messages ) ) {
+                continue;
+            }
 
             $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
+            foreach ( $messages as $message ) {
                 $message = wp_kses_post( $message );
-				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
+                echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 
         }
 
-	}
+    }
 
 }

includes/data/item-schema.php

Indentation +228 added lines, -228 removed lines

@@ -13,233 +13,233 @@
 
 return array(
 
-	'id'              => array(
-		'description' => __( 'Unique identifier for the item.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'parent_id'       => array(
-		'description' => __( 'Parent item ID.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'default'     => 0,
-	),
-
-	'status'          => array(
-		'description' => __( 'A named status for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'enum'        => array( 'draft', 'pending', 'publish' ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'default'     => 'draft',
-	),
-
-	'version'         => array(
-		'description' => __( 'Plugin version when the item was created.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'date_created'    => array(
-		'description' => __( "The date the item was created, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'date_created_gmt'    => array(
-		'description' => __( 'The GMT date the item was created.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'date_modified'   => array(
-		'description' => __( "The date the item was last modified, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'date_modified_gmt'    => array(
-		'description' => __( 'The GMT date the item was last modified.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'name'			  => array(
-		'description' => __( "The item's name.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'required'    => true,
-	),
-
-	'description'     => array(
-		'description' => __( "The item's description.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'owner'           => array(
-		'description' => __( 'The owner of the item (user id).', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'price'           => array(
-		'description' => __( 'The price of the item.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'required'    => true,
-	),
-
-	'the_price'       => array(
-		'description' => __( 'The formatted price of the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'type'       => array(
-		'description' => __( 'The item type.', 'invoicing' ),
-		'type'        => 'string',
-		'enum'        => wpinv_item_types(),
-		'default'     => 'custom',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'vat_rule'       => array(
-		'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
-		'type'        => 'string',
-		'enum'        => array_keys( getpaid_tax()->get_rules() ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'vat_class'       => array(
-		'description' => __( 'VAT class for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array_keys( getpaid_tax()->get_vat_groups() ),
-	),
-
-	'custom_id'       => array(
-		'description' => __( 'Custom id for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
+    'id'              => array(
+        'description' => __( 'Unique identifier for the item.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'parent_id'       => array(
+        'description' => __( 'Parent item ID.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'default'     => 0,
+    ),
+
+    'status'          => array(
+        'description' => __( 'A named status for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'enum'        => array( 'draft', 'pending', 'publish' ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'default'     => 'draft',
+    ),
+
+    'version'         => array(
+        'description' => __( 'Plugin version when the item was created.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'date_created'    => array(
+        'description' => __( "The date the item was created, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'date_created_gmt'    => array(
+        'description' => __( 'The GMT date the item was created.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'date_modified'   => array(
+        'description' => __( "The date the item was last modified, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'date_modified_gmt'    => array(
+        'description' => __( 'The GMT date the item was last modified.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'name'			  => array(
+        'description' => __( "The item's name.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'required'    => true,
+    ),
+
+    'description'     => array(
+        'description' => __( "The item's description.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'owner'           => array(
+        'description' => __( 'The owner of the item (user id).', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'price'           => array(
+        'description' => __( 'The price of the item.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'required'    => true,
+    ),
+
+    'the_price'       => array(
+        'description' => __( 'The formatted price of the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'type'       => array(
+        'description' => __( 'The item type.', 'invoicing' ),
+        'type'        => 'string',
+        'enum'        => wpinv_item_types(),
+        'default'     => 'custom',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'vat_rule'       => array(
+        'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
+        'type'        => 'string',
+        'enum'        => array_keys( getpaid_tax()->get_rules() ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'vat_class'       => array(
+        'description' => __( 'VAT class for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'enum'        => array_keys( getpaid_tax()->get_vat_groups() ),
+    ),
+
+    'custom_id'       => array(
+        'description' => __( 'Custom id for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
 	
-	'custom_name'       => array(
-		'description' => __( 'Custom name for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'custom_singular_name'       => array(
-		'description' => __( 'Custom singular name for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'is_dynamic_pricing'     => array(
-		'description' => __( 'Whether or not customers can enter their own prices when checking out.', 'invoicing' ),
-		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'minimum_price'   => array(
-		'description' => __( 'For dynamic prices, this is the minimum price that a user can set.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'is_recurring'        => array(
-		'description' => __( 'Whether or not this is a subscription item.', 'invoicing' ),
-		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'initial_price'   => array(
-		'description' => __( 'The initial price of the item.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'the_initial_price'       => array(
-		'description' => __( 'The formatted initial price of the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'recurring_price' => array(
-		'description' => __( 'The recurring price of the item.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'the_recurring_price'       => array(
-		'description' => __( 'The formatted recurring price of the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'recurring_period'        => array(
-		'description' => __( 'The recurring period for a recurring item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'D', 'W', 'M', 'Y' ),
-	),
-
-	'recurring_interval'        => array(
-		'description' => __( 'The recurring interval for a subscription item.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'recurring_limit' => array(
-		'description' => __( 'The maximum number of renewals for a subscription item.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'is_free_trial'   => array(
-		'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
-		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'trial_period'    => array(
-		'description' => __( 'The trial period.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'D', 'W', 'M', 'Y' ),
-	),
-
-	'trial_interval'  => array(
-		'description' => __( 'The trial interval.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'first_renewal_date'       => array(
-		'description' => __( 'The first renewal date in case the item was to be bought today.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'edit_url'        => array(
-		'description' => __( 'The URL to edit an item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
+    'custom_name'       => array(
+        'description' => __( 'Custom name for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'custom_singular_name'       => array(
+        'description' => __( 'Custom singular name for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'is_dynamic_pricing'     => array(
+        'description' => __( 'Whether or not customers can enter their own prices when checking out.', 'invoicing' ),
+        'type'        => 'integer',
+        'enum'        => array( 0, 1 ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'minimum_price'   => array(
+        'description' => __( 'For dynamic prices, this is the minimum price that a user can set.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'is_recurring'        => array(
+        'description' => __( 'Whether or not this is a subscription item.', 'invoicing' ),
+        'type'        => 'integer',
+        'enum'        => array( 0, 1 ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'initial_price'   => array(
+        'description' => __( 'The initial price of the item.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'the_initial_price'       => array(
+        'description' => __( 'The formatted initial price of the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'recurring_price' => array(
+        'description' => __( 'The recurring price of the item.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'the_recurring_price'       => array(
+        'description' => __( 'The formatted recurring price of the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'recurring_period'        => array(
+        'description' => __( 'The recurring period for a recurring item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'enum'        => array( 'D', 'W', 'M', 'Y' ),
+    ),
+
+    'recurring_interval'        => array(
+        'description' => __( 'The recurring interval for a subscription item.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'recurring_limit' => array(
+        'description' => __( 'The maximum number of renewals for a subscription item.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'is_free_trial'   => array(
+        'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
+        'type'        => 'integer',
+        'enum'        => array( 0, 1 ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'trial_period'    => array(
+        'description' => __( 'The trial period.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'enum'        => array( 'D', 'W', 'M', 'Y' ),
+    ),
+
+    'trial_interval'  => array(
+        'description' => __( 'The trial interval.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'first_renewal_date'       => array(
+        'description' => __( 'The first renewal date in case the item was to be bought today.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'edit_url'        => array(
+        'description' => __( 'The URL to edit an item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
 );

includes/admin/register-settings.php

Indentation +341 added lines, -341 removed lines

@@ -196,11 +196,11 @@ 
     $cb      = "wpinv_{$option['type']}_callback";
     $section = "wpinv_settings_{$tab}_$section";
 
-	if ( isset( $option['desc'] ) && ! empty( $option['help-tip'] ) ) {
-		$tip   = esc_attr( $option['desc'] );
-		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
-	}
+    if ( isset( $option['desc'] ) && ! empty( $option['help-tip'] ) ) {
+        $tip   = esc_attr( $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(
@@ -279,10 +279,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
@@ -427,333 +427,333 @@ 
 }
 
 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 ) {
-	global $wpinv_options;
-
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$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 ) ) . '" />';
+    global $wpinv_options;
+
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    } elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $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 ) ) . '" />';
     
-	echo $html;
+    echo $html;
 }
 
 function wpinv_checkbox_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$name = '';
-	} else {
-		$name = 'name="wpinv_settings[' . $sanitize_id . ']"';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $name = '';
+    } else {
+        $name = 'name="wpinv_settings[' . $sanitize_id . ']"';
+    }
 
-	$std     = isset( $args['std'] ) ? $args['std'] : 0;
-	$value   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : $std;
-	$checked = checked( empty( $value ), false, false );
+    $std     = isset( $args['std'] ) ? $args['std'] : 0;
+    $value   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : $std;
+    $checked = checked( empty( $value ), false, false );
 
-	$html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_multicheck_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
 
-	$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   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : $std;
+        $std     = isset( $args['std'] ) ? $args['std'] : array();
+        $value   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $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 ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	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( isset( $wpinv_options[$args['id']][$key] ) ) {
-				$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( isset( $wpinv_options[$args['id']][$key] ) ) {
+                $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>';
+    }
 }
 
 function wpinv_radio_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     
     foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         $checked = false;
 
-		if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
-			$checked = true;
-		elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
-			$checked = true;
+        if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
+            $checked = true;
+        elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
+            $checked = true;
 
-		echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
+    endforeach;
 
-	echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+    echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
 }
 
 function wpinv_gateways_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+    foreach ( $args['options'] as $key => $option ) :
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         if ( isset( $wpinv_options['gateways'][ $key ] ) )
-			$enabled = '1';
-		else
-			$enabled = null;
+            $enabled = '1';
+        else
+            $enabled = null;
 
-		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
+    endforeach;
 }
 
 function wpinv_gateway_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	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 = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], 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>';
 }
 
 function wpinv_text_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
-
-	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
-	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
-	$html    .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
-
-	echo $html;
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+    $class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+
+    $readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
+    $size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
+    $html    .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+
+    echo $html;
 }
 
 function wpinv_number_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$max  = isset( $args['max'] ) ? $args['max'] : 999999;
-	$min  = isset( $args['min'] ) ? $args['min'] : 0;
-	$step = isset( $args['step'] ) ? $args['step'] : 1;
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
-
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
-
-	echo $html;
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $max  = isset( $args['max'] ) ? $args['max'] : 999999;
+    $min  = isset( $args['min'] ) ? $args['min'] : 0;
+    $step = isset( $args['step'] ) ? $args['step'] : 1;
+    $class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+
+    echo $html;
 }
 
 function wpinv_textarea_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['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 ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['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>'
+    );
 }
 
 function wpinv_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
         $value = $args['selected'];
     }
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
     
     if( !empty( $args['onchange'] ) ) {
         $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
@@ -763,143 +763,143 @@ 
 
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
 
-	foreach ( $args['options'] as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $args['options'] 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;
 }
 
 function wpinv_color_select_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['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 $wpinv_options, $wp_version;
+    global $wpinv_options, $wp_version;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
-		}
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+        if( empty( $args['allow_blank'] ) && empty( $value ) ) {
+            $value = isset( $args['std'] ) ? $args['std'] : '';
+        }
+    } else {
+        $value = isset( $args['std'] ) ? $args['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 ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[$args['id']];
-	} else {
-		$value = isset($args['std']) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[$args['id']];
+    } else {
+        $value = isset($args['std']) ? $args['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 ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+    $default = isset( $args['std'] ) ? $args['std'] : '';
 
-	$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( $default ) . '" />';
-	$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( $default ) . '" />';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_country_states_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $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 = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], 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;
 }
 
 function wpinv_tax_rates_callback($args) {
-	global $wpinv_options;
-	$rates = wpinv_get_tax_rates();
-	ob_start(); ?>
+    global $wpinv_options;
+    $rates = wpinv_get_tax_rates();
+    ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tax_tdbox">
 	<p><?php echo $args['desc']; ?></p>
@@ -923,40 +923,40 @@ 
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
-						'name'             => 'tax_rates[' . $sanitized_key . '][country]',
+                    echo wpinv_html_select( array(
+                        'options'          => wpinv_get_country_list( true ),
+                        'name'             => 'tax_rates[' . $sanitized_key . '][country]',
                         'id'               => 'tax_rates[' . $sanitized_key . '][country]',
-						'selected'         => $rate['country'],
-						'show_option_all'  => false,
-						'show_option_none' => false,
-						'class'            => 'wpinv-tax-country wpi_select2',
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) );
-					?>
+                        'selected'         => $rate['country'],
+                        'show_option_all'  => false,
+                        'show_option_none' => false,
+                        'class'            => 'wpinv-tax-country wpi_select2',
+                        'placeholder'      => __( 'Choose a country', 'invoicing' )
+                    ) );
+                    ?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php
-					$states = wpinv_get_country_states( $rate['country'] );
-					if( !empty( $states ) ) {
-						echo wpinv_html_select( array(
-							'options'          => array_merge( array( '' => '' ), $states ),
-							'name'             => 'tax_rates[' . $sanitized_key . '][state]',
+                    $states = wpinv_get_country_states( $rate['country'] );
+                    if( !empty( $states ) ) {
+                        echo wpinv_html_select( array(
+                            'options'          => array_merge( array( '' => '' ), $states ),
+                            'name'             => 'tax_rates[' . $sanitized_key . '][state]',
                             'id'               => 'tax_rates[' . $sanitized_key . '][state]',
-							'selected'         => $rate['state'],
-							'show_option_all'  => false,
-							'show_option_none' => false,
+                            'selected'         => $rate['state'],
+                            'show_option_all'  => false,
+                            'show_option_none' => false,
                             'class'            => 'wpi_select2',
-							'placeholder'      => __( 'Choose a state', 'invoicing' )
-						) );
-					} else {
-						echo wpinv_html_text( array(
-							'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
-							'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
+                            'placeholder'      => __( 'Choose a state', 'invoicing' )
+                        ) );
+                    } else {
+                        echo wpinv_html_text( array(
+                            'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
+                            'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
                             'id'    => 'tax_rates[' . $sanitized_key . '][state]',
-						) );
-					}
-					?>
+                        ) );
+                    }
+                    ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[<?php echo $sanitized_key; ?>][global]" id="tax_rates[<?php echo $sanitized_key; ?>][global]" value="1"<?php checked( true, ! empty( $rate['global'] ) ); ?>/>
@@ -971,19 +971,19 @@ 
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
-						'name'             => 'tax_rates[0][country]',
-						'show_option_all'  => false,
-						'show_option_none' => false,
-						'class'            => 'wpinv-tax-country wpi_select2',
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) ); ?>
+                    echo wpinv_html_select( array(
+                        'options'          => wpinv_get_country_list( true ),
+                        'name'             => 'tax_rates[0][country]',
+                        'show_option_all'  => false,
+                        'show_option_none' => false,
+                        'class'            => 'wpinv-tax-country wpi_select2',
+                        'placeholder'      => __( 'Choose a country', 'invoicing' )
+                    ) ); ?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php echo wpinv_html_text( array(
-						'name' => 'tax_rates[0][state]'
-					) ); ?>
+                        'name' => 'tax_rates[0][state]'
+                    ) ); ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[0][global]" id="tax_rates[0][global]" value="1"/>
@@ -998,7 +998,7 @@ 
         <tfoot><tr><td colspan="5"></td><td class="wpinv_tax_action"><span class="button-secondary" id="wpinv_add_tax_rate"><?php _e( 'Add Tax Rate', 'invoicing' ); ?></span></td></tr></tfoot>
 	</table>
 	<?php
-	echo ob_get_clean();
+    echo ob_get_clean();
 }
 
 function wpinv_tools_callback($args) {
@@ -1026,15 +1026,15 @@ 
 }
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $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' );
 

includes/geolocation/class-getpaid-maxmind-geolocation.php

Indentation +159 added lines, -159 removed lines

@@ -16,164 +16,164 @@
  */
 class GetPaid_MaxMind_Geolocation {
 
-	/**
-	 * The service responsible for interacting with the MaxMind database.
-	 *
-	 * @var GetPaid_MaxMind_Database_Service
-	 */
-	private $database_service;
-
-	/**
-	 * Initialize the integration.
-	 */
-	public function __construct() {
-
-		/**
-		 * Supports overriding the database service to be used.
-		 *
-		 * @since 1.0.19
-		 * @return mixed|null The geolocation database service.
-		 */
-		$this->database_service = apply_filters( 'getpaid_maxmind_geolocation_database_service', null );
-		if ( null === $this->database_service ) {
-			$this->database_service = new GetPaid_MaxMind_Database_Service( $this->get_database_prefix() );
-		}
-
-		// Bind to the scheduled updater action.
-		add_action( 'getpaid_update_geoip_databases', array( $this, 'update_database' ) );
-
-		// Bind to the geolocation filter for MaxMind database lookups.
-		add_filter( 'getpaid_get_geolocation', array( $this, 'get_geolocation' ), 10, 2 );
-
-		// Handle maxmind key updates.
-		add_filter( 'wpinv_settings_sanitize_maxmind_license_key', array( $this, 'handle_key_updates' ) );
-
-	}
-
-	/**
-	 * Get database service.
-	 *
-	 * @return GetPaid_MaxMind_Database_Service|null
-	 */
-	public function get_database_service() {
-		return $this->database_service;
-	}
-
-	/**
-	 * Checks to make sure that the license key is valid.
-	 *
-	 * @param string $license_key The new license key.
-	 * @return string
-	 */
-	public function handle_key_updates( $license_key ) {
-
-		// Trim whitespaces and strip slashes.
-		$license_key = trim( $license_key );
-
-		// Abort if the license key is empty or unchanged.
-		if ( empty( $license_key ) ) {
-			return $license_key;
-		}
-
-		// Abort if a database exists and the license key is unchaged.
-		if ( file_exists( $this->database_service->get_database_path() && $license_key == wpinv_get_option( 'maxmind_license_key' ) ) ) {
-			return $license_key;
-		}
-
-		// Check the license key by attempting to download the Geolocation database.
-		$tmp_database_path = $this->database_service->download_database( $license_key );
-		if ( is_wp_error( $tmp_database_path ) ) {
-			getpaid_admin()->show_error( $tmp_database_path->get_error_message() );
-			return $license_key;
-		}
-
-		$this->update_database( $tmp_database_path );
-
-	}
-
-	/**
-	 * Updates the database used for geolocation queries.
-	 *
-	 * @param string $tmp_database_path Temporary database path.
-	 */
-	public function update_database( $tmp_database_path = null ) {
-
-		// Allow us to easily interact with the filesystem.
-		require_once ABSPATH . 'wp-admin/includes/file.php';
-		WP_Filesystem();
-		global $wp_filesystem;
-
-		// Remove any existing archives to comply with the MaxMind TOS.
-		$target_database_path = $this->database_service->get_database_path();
-
-		// If there's no database path, we can't store the database.
-		if ( empty( $target_database_path ) ) {
-			return;
-		}
-
-		if ( $wp_filesystem->exists( $target_database_path ) ) {
-			$wp_filesystem->delete( $target_database_path );
-		}
-
-		// We can't download a database if there's no license key configured.
-		$license_key = wpinv_get_option( 'maxmind_license_key' );
-		if ( empty( $license_key ) ) {
-			return;
-		}
-
-		if ( empty( $tmp_database_path ) ) {
-			$tmp_database_path = $this->database_service->download_database( $license_key );
-		}
-
-		if ( is_wp_error( $tmp_database_path ) ) {
-			wpinv_error_log( $tmp_database_path->get_error_message() );
-			return;
-		}
-
-		// Move the new database into position.
-		$wp_filesystem->move( $tmp_database_path, $target_database_path, true );
-		$wp_filesystem->delete( dirname( $tmp_database_path ) );
-	}
-
-	/**
-	 * Performs a geolocation lookup against the MaxMind database for the given IP address.
-	 *
-	 * @param array  $data       Geolocation data.
-	 * @param string $ip_address The IP address to geolocate.
-	 * @return array Geolocation including country code, state, city and postcode based on an IP address.
-	 */
-	public function get_geolocation( $data, $ip_address ) {
-
-		if ( ! empty( $data['country'] ) || empty( $ip_address ) ) {
-			return $data;
-		}
-
-		$country_code = $this->database_service->get_iso_country_code_for_ip( $ip_address );
-
-		return array(
-			'country'  => $country_code,
-			'state'    => '',
-			'city'     => '',
-			'postcode' => '',
-		);
-
-	}
-
-	/**
-	 * Fetches the prefix for the MaxMind database file.
-	 *
-	 * @return string
-	 */
-	private function get_database_prefix() {
-
-		$prefix = get_option( 'wpinv_maxmind_database_prefix' );
-
-		if ( empty( $prefix ) ) {
-			$prefix = md5( uniqid( 'wpinv' ) );
-			update_option( 'wpinv_maxmind_database_prefix', $prefix );
-		}
-
-		return $prefix;
-	}
+    /**
+     * The service responsible for interacting with the MaxMind database.
+     *
+     * @var GetPaid_MaxMind_Database_Service
+     */
+    private $database_service;
+
+    /**
+     * Initialize the integration.
+     */
+    public function __construct() {
+
+        /**
+         * Supports overriding the database service to be used.
+         *
+         * @since 1.0.19
+         * @return mixed|null The geolocation database service.
+         */
+        $this->database_service = apply_filters( 'getpaid_maxmind_geolocation_database_service', null );
+        if ( null === $this->database_service ) {
+            $this->database_service = new GetPaid_MaxMind_Database_Service( $this->get_database_prefix() );
+        }
+
+        // Bind to the scheduled updater action.
+        add_action( 'getpaid_update_geoip_databases', array( $this, 'update_database' ) );
+
+        // Bind to the geolocation filter for MaxMind database lookups.
+        add_filter( 'getpaid_get_geolocation', array( $this, 'get_geolocation' ), 10, 2 );
+
+        // Handle maxmind key updates.
+        add_filter( 'wpinv_settings_sanitize_maxmind_license_key', array( $this, 'handle_key_updates' ) );
+
+    }
+
+    /**
+     * Get database service.
+     *
+     * @return GetPaid_MaxMind_Database_Service|null
+     */
+    public function get_database_service() {
+        return $this->database_service;
+    }
+
+    /**
+     * Checks to make sure that the license key is valid.
+     *
+     * @param string $license_key The new license key.
+     * @return string
+     */
+    public function handle_key_updates( $license_key ) {
+
+        // Trim whitespaces and strip slashes.
+        $license_key = trim( $license_key );
+
+        // Abort if the license key is empty or unchanged.
+        if ( empty( $license_key ) ) {
+            return $license_key;
+        }
+
+        // Abort if a database exists and the license key is unchaged.
+        if ( file_exists( $this->database_service->get_database_path() && $license_key == wpinv_get_option( 'maxmind_license_key' ) ) ) {
+            return $license_key;
+        }
+
+        // Check the license key by attempting to download the Geolocation database.
+        $tmp_database_path = $this->database_service->download_database( $license_key );
+        if ( is_wp_error( $tmp_database_path ) ) {
+            getpaid_admin()->show_error( $tmp_database_path->get_error_message() );
+            return $license_key;
+        }
+
+        $this->update_database( $tmp_database_path );
+
+    }
+
+    /**
+     * Updates the database used for geolocation queries.
+     *
+     * @param string $tmp_database_path Temporary database path.
+     */
+    public function update_database( $tmp_database_path = null ) {
+
+        // Allow us to easily interact with the filesystem.
+        require_once ABSPATH . 'wp-admin/includes/file.php';
+        WP_Filesystem();
+        global $wp_filesystem;
+
+        // Remove any existing archives to comply with the MaxMind TOS.
+        $target_database_path = $this->database_service->get_database_path();
+
+        // If there's no database path, we can't store the database.
+        if ( empty( $target_database_path ) ) {
+            return;
+        }
+
+        if ( $wp_filesystem->exists( $target_database_path ) ) {
+            $wp_filesystem->delete( $target_database_path );
+        }
+
+        // We can't download a database if there's no license key configured.
+        $license_key = wpinv_get_option( 'maxmind_license_key' );
+        if ( empty( $license_key ) ) {
+            return;
+        }
+
+        if ( empty( $tmp_database_path ) ) {
+            $tmp_database_path = $this->database_service->download_database( $license_key );
+        }
+
+        if ( is_wp_error( $tmp_database_path ) ) {
+            wpinv_error_log( $tmp_database_path->get_error_message() );
+            return;
+        }
+
+        // Move the new database into position.
+        $wp_filesystem->move( $tmp_database_path, $target_database_path, true );
+        $wp_filesystem->delete( dirname( $tmp_database_path ) );
+    }
+
+    /**
+     * Performs a geolocation lookup against the MaxMind database for the given IP address.
+     *
+     * @param array  $data       Geolocation data.
+     * @param string $ip_address The IP address to geolocate.
+     * @return array Geolocation including country code, state, city and postcode based on an IP address.
+     */
+    public function get_geolocation( $data, $ip_address ) {
+
+        if ( ! empty( $data['country'] ) || empty( $ip_address ) ) {
+            return $data;
+        }
+
+        $country_code = $this->database_service->get_iso_country_code_for_ip( $ip_address );
+
+        return array(
+            'country'  => $country_code,
+            'state'    => '',
+            'city'     => '',
+            'postcode' => '',
+        );
+
+    }
+
+    /**
+     * Fetches the prefix for the MaxMind database file.
+     *
+     * @return string
+     */
+    private function get_database_prefix() {
+
+        $prefix = get_option( 'wpinv_maxmind_database_prefix' );
+
+        if ( empty( $prefix ) ) {
+            $prefix = md5( uniqid( 'wpinv' ) );
+            update_option( 'wpinv_maxmind_database_prefix', $prefix );
+        }
+
+        return $prefix;
+    }
 
 }

includes/geolocation/class-getpaid-geolocation.php

Indentation +259 added lines, -259 removed lines

@@ -13,264 +13,264 @@
  */
 class GetPaid_Geolocation {
 
-	/**
-	 * Holds the current user's IP Address.
-	 *
-	 * @var string
-	 */
-	public static $current_user_ip;
-
-	/**
-	 * API endpoints for looking up a user IP address.
-	 *
-	 * For example, in case a user is on localhost.
-	 *
-	 * @var array
-	 */
-	protected static $ip_lookup_apis = array(
-		'ipify'             => 'http://api.ipify.org/',
-		'ipecho'            => 'http://ipecho.net/plain',
-		'ident'             => 'http://ident.me',
-		'whatismyipaddress' => 'http://bot.whatismyipaddress.com',
-	);
-
-	/**
-	 * API endpoints for geolocating an IP address
-	 *
-	 * @var array
-	 */
-	protected static $geoip_apis = array(
-		'ipinfo.io'  => 'https://ipinfo.io/%s/json',
-		'ip-api.com' => 'http://ip-api.com/json/%s',
-	);
-
-	/**
-	 * Get current user IP Address.
-	 *
-	 * @return string
-	 */
-	public static function get_ip_address() {
-		return wpinv_get_ip();
-	}
-
-	/**
-	 * Get user IP Address using an external service.
-	 * This can be used as a fallback for users on localhost where
-	 * get_ip_address() will be a local IP and non-geolocatable.
-	 *
-	 * @return string
-	 */
-	public static function get_external_ip_address() {
-
-		$transient_name = 'external_ip_address_0.0.0.0';
-
-		if ( '' !== self::get_ip_address() ) {
-			$transient_name      = 'external_ip_address_' . self::get_ip_address();
-		}
-
-		// Try retrieving from cache.
-		$external_ip_address = get_transient( $transient_name );
-
-		if ( false === $external_ip_address ) {
-			$external_ip_address     = '0.0.0.0';
-			$ip_lookup_services      = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
-			$ip_lookup_services_keys = array_keys( $ip_lookup_services );
-			shuffle( $ip_lookup_services_keys );
-
-			foreach ( $ip_lookup_services_keys as $service_name ) {
-				$service_endpoint = $ip_lookup_services[ $service_name ];
-				$response         = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
-
-				if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
-					$external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
-					break;
-				}
-
-			}
-
-			set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
-		}
-
-		return $external_ip_address;
-	}
-
-	/**
-	 * Geolocate an IP address.
-	 *
-	 * @param  string $ip_address   IP Address.
-	 * @param  bool   $fallback     If true, fallbacks to alternative IP detection (can be slower).
-	 * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
-	 * @return array
-	 */
-	public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
-
-		if ( empty( $ip_address ) ) {
-			$ip_address = self::get_ip_address();
-		}
-
-		// Update the current user's IP Address.
-		self::$current_user_ip = $ip_address;
-
-		// Filter to allow custom geolocation of the IP address.
-		$country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
-
-		if ( false !== $country_code ) {
-
-			return array(
-				'country'  => $country_code,
-				'state'    => '',
-				'city'     => '',
-				'postcode' => '',
-			);
-
-		}
-
-		$country_code = self::get_country_code_from_headers();
-
-		/**
-		 * Get geolocation filter.
-		 *
-		 * @since 1.0.19
-		 * @param array  $geolocation Geolocation data, including country, state, city, and postcode.
-		 * @param string $ip_address  IP Address.
-		 */
-		$geolocation  = apply_filters(
-			'getpaid_get_geolocation',
-			array(
-				'country'  => $country_code,
-				'state'    => '',
-				'city'     => '',
-				'postcode' => '',
-			),
-			$ip_address
-		);
-
-		// If we still haven't found a country code, let's consider doing an API lookup.
-		if ( '' === $geolocation['country'] && $api_fallback ) {
-			$geolocation['country'] = self::geolocate_via_api( $ip_address );
-		}
-
-		// It's possible that we're in a local environment, in which case the geolocation needs to be done from the
-		// external address.
-		if ( '' === $geolocation['country'] && $fallback ) {
-			$external_ip_address = self::get_external_ip_address();
-
-			// Only bother with this if the external IP differs.
-			if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
-				return self::geolocate_ip( $external_ip_address, false, $api_fallback );
-			}
-
-		}
-
-		return array(
-			'country'  => $geolocation['country'],
-			'state'    => $geolocation['state'],
-			'city'     => $geolocation['city'],
-			'postcode' => $geolocation['postcode'],
-		);
-
-	}
-
-	/**
-	 * Fetches the country code from the request headers, if one is available.
-	 *
-	 * @since 1.0.19
-	 * @return string The country code pulled from the headers, or empty string if one was not found.
-	 */
-	protected static function get_country_code_from_headers() {
-		$country_code = '';
-
-		$headers = array(
-			'MM_COUNTRY_CODE',
-			'GEOIP_COUNTRY_CODE',
-			'HTTP_CF_IPCOUNTRY',
-			'HTTP_X_COUNTRY_CODE',
-		);
-
-		foreach ( $headers as $header ) {
-			if ( empty( $_SERVER[ $header ] ) ) {
-				continue;
-			}
-
-			$country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
-			break;
-		}
-
-		return $country_code;
-	}
-
-	/**
-	 * Use APIs to Geolocate the user.
-	 *
-	 * Geolocation APIs can be added through the use of the getpaid_geolocation_geoip_apis filter.
-	 * Provide a name=>value pair for service-slug=>endpoint.
-	 *
-	 * If APIs are defined, one will be chosen at random to fulfil the request. After completing, the result
-	 * will be cached in a transient.
-	 *
-	 * @param  string $ip_address IP address.
-	 * @return string
-	 */
-	protected static function geolocate_via_api( $ip_address ) {
-
-		// Retrieve from cache...
-		$country_code = get_transient( 'geoip_' . $ip_address );
-
-		// If missing, retrieve from the API.
-		if ( false === $country_code ) {
-			$geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
-
-			if ( empty( $geoip_services ) ) {
-				return '';
-			}
-
-			$geoip_services_keys = array_keys( $geoip_services );
-
-			shuffle( $geoip_services_keys );
-
-			foreach ( $geoip_services_keys as $service_name ) {
-
-				$service_endpoint = $geoip_services[ $service_name ];
-				$response         = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
-				$country_code     = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
-
-				if ( ! empty( $country_code ) ) {
-					break;
-				}
-
-			}
-
-			set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
-		}
-
-		return $country_code;
-	}
-
-	/**
-	 * Handles geolocation response
-	 *
-	 * @param  WP_Error|String $geolocation_response
-	 * @param  String $geolocation_service
-	 * @return string Country code
-	 */
-	protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
-
-		if ( is_wp_error( $geolocation_response ) || empty( $geolocation_response['body'] ) ) {
-			return '';
-		}
-
-		if ( $geolocation_service === 'ipinfo.io' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) ? '' : $data->country;
-		}
-
-		if ( $geolocation_service === 'ip-api.com' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) ? '' : $data->countryCode;
-		}
-
-		return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
-
-	}
+    /**
+     * Holds the current user's IP Address.
+     *
+     * @var string
+     */
+    public static $current_user_ip;
+
+    /**
+     * API endpoints for looking up a user IP address.
+     *
+     * For example, in case a user is on localhost.
+     *
+     * @var array
+     */
+    protected static $ip_lookup_apis = array(
+        'ipify'             => 'http://api.ipify.org/',
+        'ipecho'            => 'http://ipecho.net/plain',
+        'ident'             => 'http://ident.me',
+        'whatismyipaddress' => 'http://bot.whatismyipaddress.com',
+    );
+
+    /**
+     * API endpoints for geolocating an IP address
+     *
+     * @var array
+     */
+    protected static $geoip_apis = array(
+        'ipinfo.io'  => 'https://ipinfo.io/%s/json',
+        'ip-api.com' => 'http://ip-api.com/json/%s',
+    );
+
+    /**
+     * Get current user IP Address.
+     *
+     * @return string
+     */
+    public static function get_ip_address() {
+        return wpinv_get_ip();
+    }
+
+    /**
+     * Get user IP Address using an external service.
+     * This can be used as a fallback for users on localhost where
+     * get_ip_address() will be a local IP and non-geolocatable.
+     *
+     * @return string
+     */
+    public static function get_external_ip_address() {
+
+        $transient_name = 'external_ip_address_0.0.0.0';
+
+        if ( '' !== self::get_ip_address() ) {
+            $transient_name      = 'external_ip_address_' . self::get_ip_address();
+        }
+
+        // Try retrieving from cache.
+        $external_ip_address = get_transient( $transient_name );
+
+        if ( false === $external_ip_address ) {
+            $external_ip_address     = '0.0.0.0';
+            $ip_lookup_services      = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
+            $ip_lookup_services_keys = array_keys( $ip_lookup_services );
+            shuffle( $ip_lookup_services_keys );
+
+            foreach ( $ip_lookup_services_keys as $service_name ) {
+                $service_endpoint = $ip_lookup_services[ $service_name ];
+                $response         = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
+
+                if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
+                    $external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
+                    break;
+                }
+
+            }
+
+            set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
+        }
+
+        return $external_ip_address;
+    }
+
+    /**
+     * Geolocate an IP address.
+     *
+     * @param  string $ip_address   IP Address.
+     * @param  bool   $fallback     If true, fallbacks to alternative IP detection (can be slower).
+     * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
+     * @return array
+     */
+    public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
+
+        if ( empty( $ip_address ) ) {
+            $ip_address = self::get_ip_address();
+        }
+
+        // Update the current user's IP Address.
+        self::$current_user_ip = $ip_address;
+
+        // Filter to allow custom geolocation of the IP address.
+        $country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
+
+        if ( false !== $country_code ) {
+
+            return array(
+                'country'  => $country_code,
+                'state'    => '',
+                'city'     => '',
+                'postcode' => '',
+            );
+
+        }
+
+        $country_code = self::get_country_code_from_headers();
+
+        /**
+         * Get geolocation filter.
+         *
+         * @since 1.0.19
+         * @param array  $geolocation Geolocation data, including country, state, city, and postcode.
+         * @param string $ip_address  IP Address.
+         */
+        $geolocation  = apply_filters(
+            'getpaid_get_geolocation',
+            array(
+                'country'  => $country_code,
+                'state'    => '',
+                'city'     => '',
+                'postcode' => '',
+            ),
+            $ip_address
+        );
+
+        // If we still haven't found a country code, let's consider doing an API lookup.
+        if ( '' === $geolocation['country'] && $api_fallback ) {
+            $geolocation['country'] = self::geolocate_via_api( $ip_address );
+        }
+
+        // It's possible that we're in a local environment, in which case the geolocation needs to be done from the
+        // external address.
+        if ( '' === $geolocation['country'] && $fallback ) {
+            $external_ip_address = self::get_external_ip_address();
+
+            // Only bother with this if the external IP differs.
+            if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
+                return self::geolocate_ip( $external_ip_address, false, $api_fallback );
+            }
+
+        }
+
+        return array(
+            'country'  => $geolocation['country'],
+            'state'    => $geolocation['state'],
+            'city'     => $geolocation['city'],
+            'postcode' => $geolocation['postcode'],
+        );
+
+    }
+
+    /**
+     * Fetches the country code from the request headers, if one is available.
+     *
+     * @since 1.0.19
+     * @return string The country code pulled from the headers, or empty string if one was not found.
+     */
+    protected static function get_country_code_from_headers() {
+        $country_code = '';
+
+        $headers = array(
+            'MM_COUNTRY_CODE',
+            'GEOIP_COUNTRY_CODE',
+            'HTTP_CF_IPCOUNTRY',
+            'HTTP_X_COUNTRY_CODE',
+        );
+
+        foreach ( $headers as $header ) {
+            if ( empty( $_SERVER[ $header ] ) ) {
+                continue;
+            }
+
+            $country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
+            break;
+        }
+
+        return $country_code;
+    }
+
+    /**
+     * Use APIs to Geolocate the user.
+     *
+     * Geolocation APIs can be added through the use of the getpaid_geolocation_geoip_apis filter.
+     * Provide a name=>value pair for service-slug=>endpoint.
+     *
+     * If APIs are defined, one will be chosen at random to fulfil the request. After completing, the result
+     * will be cached in a transient.
+     *
+     * @param  string $ip_address IP address.
+     * @return string
+     */
+    protected static function geolocate_via_api( $ip_address ) {
+
+        // Retrieve from cache...
+        $country_code = get_transient( 'geoip_' . $ip_address );
+
+        // If missing, retrieve from the API.
+        if ( false === $country_code ) {
+            $geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
+
+            if ( empty( $geoip_services ) ) {
+                return '';
+            }
+
+            $geoip_services_keys = array_keys( $geoip_services );
+
+            shuffle( $geoip_services_keys );
+
+            foreach ( $geoip_services_keys as $service_name ) {
+
+                $service_endpoint = $geoip_services[ $service_name ];
+                $response         = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
+                $country_code     = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
+
+                if ( ! empty( $country_code ) ) {
+                    break;
+                }
+
+            }
+
+            set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
+        }
+
+        return $country_code;
+    }
+
+    /**
+     * Handles geolocation response
+     *
+     * @param  WP_Error|String $geolocation_response
+     * @param  String $geolocation_service
+     * @return string Country code
+     */
+    protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
+
+        if ( is_wp_error( $geolocation_response ) || empty( $geolocation_response['body'] ) ) {
+            return '';
+        }
+
+        if ( $geolocation_service === 'ipinfo.io' ) {
+            $data = json_decode( $geolocation_response['body'] );
+            return empty( $data ) ? '' : $data->country;
+        }
+
+        if ( $geolocation_service === 'ip-api.com' ) {
+            $data = json_decode( $geolocation_response['body'] );
+            return empty( $data ) ? '' : $data->countryCode;
+        }
+
+        return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
+
+    }
 
 }

includes/geolocation/class-getpaid-maxmind-database-service.php

Indentation +147 added lines, -147 removed lines

@@ -13,152 +13,152 @@
  */
 class GetPaid_MaxMind_Database_Service {
 
-	/**
-	 * The name of the MaxMind database to utilize.
-	 */
-	const DATABASE = 'GeoLite2-Country';
-
-	/**
-	 * The extension for the MaxMind database.
-	 */
-	const DATABASE_EXTENSION = '.mmdb';
-
-	/**
-	 * A prefix for the MaxMind database filename.
-	 *
-	 * @var string
-	 */
-	private $database_prefix;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param string|null $database_prefix A prefix for the MaxMind database filename.
-	 */
-	public function __construct( $database_prefix ) {
-		$this->database_prefix = $database_prefix;
-	}
-
-	/**
-	 * Fetches the path that the database should be stored.
-	 *
-	 * @return string The local database path.
-	 */
-	public function get_database_path() {
-		$uploads_dir = wp_upload_dir();
-
-		$database_path = trailingslashit( $uploads_dir['basedir'] ) . 'invoicing/';
-		if ( ! empty( $this->database_prefix ) ) {
-			$database_path .= $this->database_prefix . '-';
-		}
-		$database_path .= self::DATABASE . self::DATABASE_EXTENSION;
-
-		// Filter the geolocation database storage path.
-		return apply_filters( 'getpaid_maxmind_geolocation_database_path', $database_path );
-	}
-
-	/**
-	 * Fetches the database from the MaxMind service.
-	 *
-	 * @param string $license_key The license key to be used when downloading the database.
-	 * @return string|WP_Error The path to the database file or an error if invalid.
-	 */
-	public function download_database( $license_key ) {
-
-		$download_uri = add_query_arg(
-			array(
-				'edition_id'  => self::DATABASE,
-				'license_key' => urlencode( wpinv_clean( $license_key ) ),
-				'suffix'      => 'tar.gz',
-			),
-			'https://download.maxmind.com/app/geoip_download'
-		);
-
-		// Needed for the download_url call right below.
-		require_once ABSPATH . 'wp-admin/includes/file.php';
-
-		$tmp_archive_path = download_url( esc_url_raw( $download_uri ) );
-
-		if ( is_wp_error( $tmp_archive_path ) ) {
-			// Transform the error into something more informative.
-			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) && $error_data['code'] == 401 ) {
-				return new WP_Error(
-					'getpaid_maxmind_geolocation_database_license_key',
-					__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
-				);
-			}
-
-			return new WP_Error( 'getpaid_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
-		}
-
-		// Extract the database from the archive.
-		return $this->extract_downloaded_database( $tmp_archive_path );
-
-	}
-
-	/**
-	 * Extracts the downloaded database.
-	 *
-	 * @param string $tmp_archive_path The database archive path.
-	 * @return string|WP_Error The path to the database file or an error if invalid.
-	 */
-	protected function extract_downloaded_database( $tmp_archive_path ) {
-
-		// Extract the database from the archive.
-		try {
-
-			$file              = new PharData( $tmp_archive_path );
-			$tmp_database_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION;
-
-			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION,
-				true
-			);
-
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
-		} finally {
-			// Remove the archive since we only care about a single file in it.
-			unlink( $tmp_archive_path );
-		}
-
-		return $tmp_database_path;
-	}
-
-	/**
-	 * Fetches the ISO country code associated with an IP address.
-	 *
-	 * @param string $ip_address The IP address to find the country code for.
-	 * @return string The country code for the IP address, or empty if not found.
-	 */
-	public function get_iso_country_code_for_ip( $ip_address ) {
-		$country_code = '';
-
-		if ( ! class_exists( 'MaxMind\Db\Reader' ) ) {
-			return $country_code;
-		}
-
-		$database_path = $this->get_database_path();
-		if ( ! file_exists( $database_path ) ) {
-			return $country_code;
-		}
-
-		try {
-			$reader = new MaxMind\Db\Reader( $database_path );
-			$data   = $reader->get( $ip_address );
-
-			if ( isset( $data['country']['iso_code'] ) ) {
-				$country_code = $data['country']['iso_code'];
-			}
-
-			$reader->close();
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), 'SOURCE: MaxMind GeoLocation' );
-		}
-
-		return $country_code;
-	}
+    /**
+     * The name of the MaxMind database to utilize.
+     */
+    const DATABASE = 'GeoLite2-Country';
+
+    /**
+     * The extension for the MaxMind database.
+     */
+    const DATABASE_EXTENSION = '.mmdb';
+
+    /**
+     * A prefix for the MaxMind database filename.
+     *
+     * @var string
+     */
+    private $database_prefix;
+
+    /**
+     * Class constructor.
+     *
+     * @param string|null $database_prefix A prefix for the MaxMind database filename.
+     */
+    public function __construct( $database_prefix ) {
+        $this->database_prefix = $database_prefix;
+    }
+
+    /**
+     * Fetches the path that the database should be stored.
+     *
+     * @return string The local database path.
+     */
+    public function get_database_path() {
+        $uploads_dir = wp_upload_dir();
+
+        $database_path = trailingslashit( $uploads_dir['basedir'] ) . 'invoicing/';
+        if ( ! empty( $this->database_prefix ) ) {
+            $database_path .= $this->database_prefix . '-';
+        }
+        $database_path .= self::DATABASE . self::DATABASE_EXTENSION;
+
+        // Filter the geolocation database storage path.
+        return apply_filters( 'getpaid_maxmind_geolocation_database_path', $database_path );
+    }
+
+    /**
+     * Fetches the database from the MaxMind service.
+     *
+     * @param string $license_key The license key to be used when downloading the database.
+     * @return string|WP_Error The path to the database file or an error if invalid.
+     */
+    public function download_database( $license_key ) {
+
+        $download_uri = add_query_arg(
+            array(
+                'edition_id'  => self::DATABASE,
+                'license_key' => urlencode( wpinv_clean( $license_key ) ),
+                'suffix'      => 'tar.gz',
+            ),
+            'https://download.maxmind.com/app/geoip_download'
+        );
+
+        // Needed for the download_url call right below.
+        require_once ABSPATH . 'wp-admin/includes/file.php';
+
+        $tmp_archive_path = download_url( esc_url_raw( $download_uri ) );
+
+        if ( is_wp_error( $tmp_archive_path ) ) {
+            // Transform the error into something more informative.
+            $error_data = $tmp_archive_path->get_error_data();
+            if ( isset( $error_data['code'] ) && $error_data['code'] == 401 ) {
+                return new WP_Error(
+                    'getpaid_maxmind_geolocation_database_license_key',
+                    __( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+                );
+            }
+
+            return new WP_Error( 'getpaid_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
+        }
+
+        // Extract the database from the archive.
+        return $this->extract_downloaded_database( $tmp_archive_path );
+
+    }
+
+    /**
+     * Extracts the downloaded database.
+     *
+     * @param string $tmp_archive_path The database archive path.
+     * @return string|WP_Error The path to the database file or an error if invalid.
+     */
+    protected function extract_downloaded_database( $tmp_archive_path ) {
+
+        // Extract the database from the archive.
+        try {
+
+            $file              = new PharData( $tmp_archive_path );
+            $tmp_database_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION;
+
+            $file->extractTo(
+                dirname( $tmp_archive_path ),
+                trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION,
+                true
+            );
+
+        } catch ( Exception $exception ) {
+            return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+        } finally {
+            // Remove the archive since we only care about a single file in it.
+            unlink( $tmp_archive_path );
+        }
+
+        return $tmp_database_path;
+    }
+
+    /**
+     * Fetches the ISO country code associated with an IP address.
+     *
+     * @param string $ip_address The IP address to find the country code for.
+     * @return string The country code for the IP address, or empty if not found.
+     */
+    public function get_iso_country_code_for_ip( $ip_address ) {
+        $country_code = '';
+
+        if ( ! class_exists( 'MaxMind\Db\Reader' ) ) {
+            return $country_code;
+        }
+
+        $database_path = $this->get_database_path();
+        if ( ! file_exists( $database_path ) ) {
+            return $country_code;
+        }
+
+        try {
+            $reader = new MaxMind\Db\Reader( $database_path );
+            $data   = $reader->get( $ip_address );
+
+            if ( isset( $data['country']['iso_code'] ) ) {
+                $country_code = $data['country']['iso_code'];
+            }
+
+            $reader->close();
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), 'SOURCE: MaxMind GeoLocation' );
+        }
+
+        return $country_code;
+    }
 
 }

includes/class-getpaid-daily-maintenance.php

Indentation +103 added lines, -103 removed lines

@@ -12,108 +12,108 @@
  */
 class GetPaid_Daily_Maintenance {
 
-	/**
-	 * Class constructor.
-	 */
-	public function __construct(){
-
-		// Clear deprecated events.
-		add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
-
-		// (Maybe) schedule a cron that runs daily.
-		add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
-
-		// Fired everyday at 7 a.m (this might vary for sites with few visitors)
-		add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
-
-	}
-
-	/**
-	 * Schedules a cron to run every day at 7 a.m
-	 *
-	 */
-	public function maybe_create_scheduled_event() {
-
-		if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
-			$timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
-			wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
-		}
-
-	}
-
-	/**
-	 * Clears deprecated events.
-	 *
-	 */
-	public function maybe_clear_deprecated_events() {
-
-		if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
-			update_option( 'wpinv_cleared_old_events', 1 );
-		}
-
-	}
-
-	/**
-	 * Fires the old hook for backwards compatibility.
-	 *
-	 */
-	public function backwards_compat() {
-		do_action( 'wpinv_register_schedule_event_daily' );
-	}
-
-	/**
-	 * Expires expired subscriptions.
-	 *
-	 */
-	public function maybe_expire_subscriptions() {
-
-		// Fetch expired subscriptions (skips those that expire today).
-		$args  = array(
-			'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active failing cancelled',
-			'date_expires_query' => array(
-				'before'    => 'today',
-				'inclusive' => false,
-			),
-		);
-
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
-
-		foreach ( $subscriptions->get_results() as $subscription ) {
-			if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', true, $subscription ) ) {
-				$subscription->set_status( 'expired' );
-				$subscription->save();
-			}
-		}
-
-	}
-
-	/**
-	 * Logs cron runs.
-	 *
-	 */
-	public function log_cron_run() {
-		wpinv_error_log( 'GetPaid Daily Cron' );
-	}
-
-	/**
-	 * Updates GeoIP databases.
-	 *
-	 */
-	public function maybe_update_geoip_databases() {
-		$updated = get_transient( 'getpaid_updated_geoip_databases' );
-
-		if ( false === $updated ) {
-			set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
-			do_action( 'getpaid_update_geoip_databases' );
-		}
-
-	}
+    /**
+     * Class constructor.
+     */
+    public function __construct(){
+
+        // Clear deprecated events.
+        add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
+
+        // (Maybe) schedule a cron that runs daily.
+        add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
+
+        // Fired everyday at 7 a.m (this might vary for sites with few visitors)
+        add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
+
+    }
+
+    /**
+     * Schedules a cron to run every day at 7 a.m
+     *
+     */
+    public function maybe_create_scheduled_event() {
+
+        if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
+            $timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
+            wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
+        }
+
+    }
+
+    /**
+     * Clears deprecated events.
+     *
+     */
+    public function maybe_clear_deprecated_events() {
+
+        if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
+            wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
+            wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
+            update_option( 'wpinv_cleared_old_events', 1 );
+        }
+
+    }
+
+    /**
+     * Fires the old hook for backwards compatibility.
+     *
+     */
+    public function backwards_compat() {
+        do_action( 'wpinv_register_schedule_event_daily' );
+    }
+
+    /**
+     * Expires expired subscriptions.
+     *
+     */
+    public function maybe_expire_subscriptions() {
+
+        // Fetch expired subscriptions (skips those that expire today).
+        $args  = array(
+            'number'             => -1,
+            'count_total'        => false,
+            'status'             => 'trialling active failing cancelled',
+            'date_expires_query' => array(
+                'before'    => 'today',
+                'inclusive' => false,
+            ),
+        );
+
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
+
+        foreach ( $subscriptions->get_results() as $subscription ) {
+            if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', true, $subscription ) ) {
+                $subscription->set_status( 'expired' );
+                $subscription->save();
+            }
+        }
+
+    }
+
+    /**
+     * Logs cron runs.
+     *
+     */
+    public function log_cron_run() {
+        wpinv_error_log( 'GetPaid Daily Cron' );
+    }
+
+    /**
+     * Updates GeoIP databases.
+     *
+     */
+    public function maybe_update_geoip_databases() {
+        $updated = get_transient( 'getpaid_updated_geoip_databases' );
+
+        if ( false === $updated ) {
+            set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
+            do_action( 'getpaid_update_geoip_databases' );
+        }
+
+    }
 
 }

includes/payments/class-getpaid-payment-form-submission-taxes.php

Indentation +212 added lines, -212 removed lines

@@ -12,231 +12,231 @@
  */
 class GetPaid_Payment_Form_Submission_Taxes {
 
-	/**
-	 * Submission taxes.
-	 * @var array
-	 */
-	public $taxes = array();
-
-	/**
-	 * Initial tax.
-	 * @var float
-	 */
-	protected $initial_tax = 0;
-
-	/**
-	 * Recurring tax.
-	 * @var float
-	 */
-	protected $recurring_tax = 0;
+    /**
+     * Submission taxes.
+     * @var array
+     */
+    public $taxes = array();
+
+    /**
+     * Initial tax.
+     * @var float
+     */
+    protected $initial_tax = 0;
+
+    /**
+     * Recurring tax.
+     * @var float
+     */
+    protected $recurring_tax = 0;
+
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Validate VAT number.
+        $this->validate_vat( $submission );
+
+        foreach ( $submission->get_items() as $item ) {
+            $this->process_item_tax( $item, $submission );
+        }
+
+        // Process any existing invoice taxes.
+        if ( $submission->has_invoice() ) {
+            $this->taxes = $submission->get_invoice()->get_taxes();
+        }
+
+        // Add VAT.
+        $this->taxes['vat'] = array(
+            'name'          => 'vat',
+            'initial_tax'   => $this->initial_tax,
+            'recurring_tax' => $this->recurring_tax,
+        );
+
+    }
+
+    /**
+     * Maybe process tax.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_item_tax( $item, $submission ) {
+
+        $rate     = wpinv_get_tax_rate( $submission->country, $submission->state, $item->get_id() );
+        $price    = $item->get_sub_total();
+        $item_tax = $price * $rate * 0.01;
+
+        if ( wpinv_prices_include_tax() ) {
+            $item_tax = $price - ( $price - $price * $rate * 0.01 );
+        }
+
+        $this->initial_tax += $item_tax;
+
+        if ( $item->is_recurring() ) {
+            $this->recurring_tax += $item_tax;
+        }
+
+    }
+
+    /**
+     * Checks if the submission has a digital item.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_digital_item( $submission ) {
+
+        foreach ( $submission->get_items() as $item ) {
+
+            if ( 'digital' == $item->get_vat_rule() ) {
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks if this is an eu store.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_store() {
+        return $this->is_eu_country( wpinv_get_default_country() );
+    }
+
+    /**
+     * Checks if this is an eu country.
+     *
+     * @param string $country
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_country( $country ) {
+        return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
+    }
+
+    /**
+     * Checks if this is an eu purchase.
+     *
+     * @param string $customer_country
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_transaction( $customer_country ) {
+        return $this->is_eu_country( $customer_country ) && $this->is_eu_store();
+    }
+
+    /**
+     * Retrieves the vat number.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_vat_number( $submission ) {
+
+        // Retrieve from the posted number.
+        $vat_number = $submission->get_field( 'wpinv_vat_number' );
+        if ( ! empty( $vat_number ) ) {
+            return wpinv_clean( $vat_number );
+        }
+
+        // Retrieve from the invoice.
+        return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
+    }
+
+    /**
+     * Retrieves the company.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_company( $submission ) {
+
+        // Retrieve from the posted data.
+        $company = $submission->get_field( 'wpinv_company' );
+        if ( ! empty( $company ) ) {
+            return wpinv_clean( $company );
+        }
+
+        // Retrieve from the invoice.
+        return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
+    }
+
+    /**
+     * Checks if we requires a VAT number.
+     *
+     * @param bool $ip_in_eu Whether the customer IP is from the EU
+     * @param bool $country_in_eu Whether the customer country is from the EU
+     * @since 1.0.19
+     * @return string
+     */
+    public function requires_vat( $ip_in_eu, $country_in_eu ) {
+
+        $prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
+        $prevent_b2c = ! empty( $prevent_b2c );
+        $is_eu       = $ip_in_eu || $country_in_eu;
+
+        return $prevent_b2c && $is_eu;
+    }
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Validate VAT number.
-		$this->validate_vat( $submission );
-
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
-		}
-
-		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = $submission->get_invoice()->get_taxes();
-		}
-
-		// Add VAT.
-		$this->taxes['vat'] = array(
-			'name'          => 'vat',
-			'initial_tax'   => $this->initial_tax,
-			'recurring_tax' => $this->recurring_tax,
-		);
-
-	}
-
-	/**
-	 * Maybe process tax.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_item_tax( $item, $submission ) {
-
-		$rate     = wpinv_get_tax_rate( $submission->country, $submission->state, $item->get_id() );
-		$price    = $item->get_sub_total();
-		$item_tax = $price * $rate * 0.01;
-
-		if ( wpinv_prices_include_tax() ) {
-			$item_tax = $price - ( $price - $price * $rate * 0.01 );
-		}
-
-		$this->initial_tax += $item_tax;
-
-		if ( $item->is_recurring() ) {
-			$this->recurring_tax += $item_tax;
-		}
-
-	}
-
-	/**
-	 * Checks if the submission has a digital item.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_digital_item( $submission ) {
-
-		foreach ( $submission->get_items() as $item ) {
-
-			if ( 'digital' == $item->get_vat_rule() ) {
-				return true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if this is an eu store.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_store() {
-		return $this->is_eu_country( wpinv_get_default_country() );
-	}
-
-	/**
-	 * Checks if this is an eu country.
-	 *
-	 * @param string $country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
-	}
-
-	/**
-	 * Checks if this is an eu purchase.
-	 *
-	 * @param string $customer_country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_transaction( $customer_country ) {
-		return $this->is_eu_country( $customer_country ) && $this->is_eu_store();
-	}
-
-	/**
-	 * Retrieves the vat number.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_vat_number( $submission ) {
-
-		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number' );
-		if ( ! empty( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
-		}
-
-		// Retrieve from the invoice.
-		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
-	}
-
-	/**
-	 * Retrieves the company.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_company( $submission ) {
-
-		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
-		}
-
-		// Retrieve from the invoice.
-		return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
-	}
-
-	/**
-	 * Checks if we requires a VAT number.
-	 *
-	 * @param bool $ip_in_eu Whether the customer IP is from the EU
-	 * @param bool $country_in_eu Whether the customer country is from the EU
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
-
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
-		$is_eu       = $ip_in_eu || $country_in_eu;
-
-		return $prevent_b2c && $is_eu;
-	}
-
-	/**
-	 * Validate VAT data.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 */
-	public function validate_vat( $submission ) {
-
-		$has_digital = $this->has_digital_item( $submission );
-		$in_eu       = $this->is_eu_transaction( $submission->country );
-
-		// Abort if we are not validating vat numbers.
-		if ( ! $has_digital && ! $in_eu ) {
+     * Validate VAT data.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     */
+    public function validate_vat( $submission ) {
+
+        $has_digital = $this->has_digital_item( $submission );
+        $in_eu       = $this->is_eu_transaction( $submission->country );
+
+        // Abort if we are not validating vat numbers.
+        if ( ! $has_digital && ! $in_eu ) {
             return;
-		}
+        }
 
-		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
-		$company     = $this->get_company( $submission );
-		$ip_country  = getpaid_get_ip_country();
+        // Prepare variables.
+        $vat_number  = $this->get_vat_number( $submission );
+        $company     = $this->get_company( $submission );
+        $ip_country  = getpaid_get_ip_country();
         $is_eu       = $this->is_eu_country( $submission->country );
         $is_ip_eu    = $this->is_eu_country( $ip_country );
 
-		// If we're preventing business to consumer purchases, ensure
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+        // If we're preventing business to consumer purchases, ensure
+        if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
 
-			// Ensure that a vat number has been specified.
-			throw new Exception(
-				wp_sprintf(
-					__( 'Please enter your %s number to verify your purchase is by an EU business.', 'invoicing' ),
-					getpaid_vat_name()
-				)
-			);
+            // Ensure that a vat number has been specified.
+            throw new Exception(
+                wp_sprintf(
+                    __( 'Please enter your %s number to verify your purchase is by an EU business.', 'invoicing' ),
+                    getpaid_vat_name()
+                )
+            );
 
-		}
+        }
 
-		// Abort if we are not validating vat (vat number should exist, user should be in eu and business too).
-		if ( ! $is_eu || ! $in_eu || empty( $vat_number ) ) {
+        // Abort if we are not validating vat (vat number should exist, user should be in eu and business too).
+        if ( ! $is_eu || ! $in_eu || empty( $vat_number ) ) {
             return;
-		}
+        }
 
-		$is_valid = WPInv_EUVat::validate_vat_number( $vat_number, $company, $submission->country );
+        $is_valid = WPInv_EUVat::validate_vat_number( $vat_number, $company, $submission->country );
 
-		if ( is_string( $is_valid ) ) {
-			throw new Exception( $is_valid );
-		}
+        if ( is_string( $is_valid ) ) {
+            throw new Exception( $is_valid );
+        }
 
-	}
+    }
 
 }

includes/libraries/wpinv-euvat/class-wpinv-euvat.php

Indentation +10 added lines, -10 removed lines

@@ -350,23 +350,23 @@ 
     }
 
     /**
-	 *
-	 * @deprecated
-	 */
+     *
+     * @deprecated
+     */
     public static function maxmind_folder() {
         return false;
     }
 
     /**
-	 *
-	 * @deprecated
-	 */
+     *
+     * @deprecated
+     */
     public static function geoip2_download_database() {}
 
     /**
-	 *
-	 * @deprecated
-	 */
+     *
+     * @deprecated
+     */
     public static function geoip2_download_file() {}
 
     /**
@@ -1517,7 +1517,7 @@ 
         $valid_company = $vies_company && $company && ( $vies_company == '---' || strcasecmp( trim( $vies_company ), trim( $company ) ) == 0 ) ? true : false;
 
         if ( ! $valid_company && ! empty( $wpinv_options['vat_disable_company_name_check'] ) ) {
-           return wp_sprintf(
+            return wp_sprintf(
                 __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ),
                 getpaid_vat_name()
             );