AyeCode / invoicing

widgets/buy-item.php

Indentation +43 added lines, -43 removed lines

@@ -38,29 +38,29 @@ 
                     'advanced'    => false
                 ),
                 'buy_items'  => array(
-	                'title'       => __( 'Items to buy', 'invoicing' ),
-	                'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
-	                'type'        => 'text',
-	                'desc_tip'    => true,
-	                'default'     => '',
-	                'placeholder' => __('Items to buy','invoicing'),
-	                'advanced'    => false
+                    'title'       => __( 'Items to buy', 'invoicing' ),
+                    'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'placeholder' => __('Items to buy','invoicing'),
+                    'advanced'    => false
                 ),
                 'button_label'  => array(
-	                'title'       => __( 'Button Label', 'invoicing' ),
-	                'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
-	                'type'        => 'text',
-	                'desc_tip'    => true,
-	                'default'     => '',
-	                'advanced'    => true
+                    'title'       => __( 'Button Label', 'invoicing' ),
+                    'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'advanced'    => true
                 ),
                 'post_id'  => array(
-	                'title'       => __( 'Post ID', 'invoicing' ),
-	                'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
-	                'type'        => 'number',
-	                'desc_tip'    => true,
-	                'default'     => '',
-	                'advanced'    => true
+                    'title'       => __( 'Post ID', 'invoicing' ),
+                    'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
+                    'type'        => 'number',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'advanced'    => true
                 ),
             )
 
@@ -70,36 +70,36 @@ 
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return string
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return string
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    $defaults = array(
-		    'buy_items'     => '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
-		    'button_label'  => __( 'Buy Now', 'invoicing' ), // the button title
-		    'post_id'   => '', // any related post_id
-	    );
+        $defaults = array(
+            'buy_items'     => '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
+            'button_label'  => __( 'Buy Now', 'invoicing' ), // the button title
+            'post_id'   => '', // any related post_id
+        );
 
-	    /**
-	     * Parse incoming $args into an array and merge it with $defaults
-	     */
-	    $args = wp_parse_args( $args, $defaults );
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
 
-	    $post_id = isset( $args['post_id'] ) ? (int)$args['post_id'] : 0;
+        $post_id = isset( $args['post_id'] ) ? (int)$args['post_id'] : 0;
 
-	    $html = '<div class="wpi-buy-button-wrapper wpi-g">';
-	    $html .= '<button class="button button-primary wpi-buy-button" type="button" onclick="wpi_buy(this,\'' . $args['buy_items'] . '\',' . $post_id . ');">' . $args['button_label'] . '</button>';
-	    $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
-	    $html .= '</div>';
+        $html = '<div class="wpi-buy-button-wrapper wpi-g">';
+        $html .= '<button class="button button-primary wpi-buy-button" type="button" onclick="wpi_buy(this,\'' . $args['buy_items'] . '\',' . $post_id . ');">' . $args['button_label'] . '</button>';
+        $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
+        $html .= '</div>';
 
-	    return $html;
+        return $html;
 
     }
 

Spacing +18 added lines, -18 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,40 +23,40 @@ 
             'block-keywords'=> "['invoicing','buy', 'buy item']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_buy',
-            'name'          => __('Invoicing > Buy Item Button','invoicing'),
+            'name'          => __('Invoicing > Buy Item Button', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-buy-item-class',
-                'description' => esc_html__('Displays buy invoicing item button.','invoicing'),
+                'description' => esc_html__('Displays buy invoicing item button.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
                     'advanced'    => false
                 ),
                 'buy_items'  => array(
-	                'title'       => __( 'Items to buy', 'invoicing' ),
-	                'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
+	                'title'       => __('Items to buy', 'invoicing'),
+	                'desc'        => __('Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing'),
 	                'type'        => 'text',
 	                'desc_tip'    => true,
 	                'default'     => '',
-	                'placeholder' => __('Items to buy','invoicing'),
+	                'placeholder' => __('Items to buy', 'invoicing'),
 	                'advanced'    => false
                 ),
                 'button_label'  => array(
-	                'title'       => __( 'Button Label', 'invoicing' ),
-	                'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
+	                'title'       => __('Button Label', 'invoicing'),
+	                'desc'        => __('Enter button label. Default "Buy Now".', 'invoicing'),
 	                'type'        => 'text',
 	                'desc_tip'    => true,
 	                'default'     => '',
 	                'advanced'    => true
                 ),
                 'post_id'  => array(
-	                'title'       => __( 'Post ID', 'invoicing' ),
-	                'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
+	                'title'       => __('Post ID', 'invoicing'),
+	                'desc'        => __('Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing'),
 	                'type'        => 'number',
 	                'desc_tip'    => true,
 	                'default'     => '',
@@ -67,7 +67,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -79,24 +79,24 @@ 
 	 *
 	 * @return string
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    $defaults = array(
 		    'buy_items'     => '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
-		    'button_label'  => __( 'Buy Now', 'invoicing' ), // the button title
+		    'button_label'  => __('Buy Now', 'invoicing'), // the button title
 		    'post_id'   => '', // any related post_id
 	    );
 
 	    /**
 	     * Parse incoming $args into an array and merge it with $defaults
 	     */
-	    $args = wp_parse_args( $args, $defaults );
+	    $args = wp_parse_args($args, $defaults);
 
-	    $post_id = isset( $args['post_id'] ) ? (int)$args['post_id'] : 0;
+	    $post_id = isset($args['post_id']) ? (int) $args['post_id'] : 0;
 
 	    $html = '<div class="wpi-buy-button-wrapper wpi-g">';
 	    $html .= '<button class="button button-primary wpi-buy-button" type="button" onclick="wpi_buy(this,\'' . $args['buy_items'] . '\',' . $post_id . ');">' . $args['button_label'] . '</button>';
-	    $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
+	    $html .= wp_nonce_field('wpinv_buy_items', 'wpinv_buy_nonce', true, false);
 	    $html .= '</div>';
 
 	    return $html;

includes/class-wpinv.php

Indentation +18 added lines, -18 removed lines

@@ -139,12 +139,12 @@ 
         require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
         require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
         require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
 
         if ( !class_exists( 'WPInv_EUVat' ) ) {
             require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
@@ -420,16 +420,16 @@ 
         require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
     }
 
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-		register_widget( "WPInv_Checkout_Widget" );
-		register_widget( "WPInv_History_Widget" );
-		register_widget( "WPInv_Receipt_Widget" );
-		register_widget( "WPInv_Subscriptions_Widget" );
-		register_widget( "WPInv_Buy_Item_Widget" );
-		register_widget( "WPInv_Messages_Widget" );
-	}
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+        register_widget( "WPInv_Checkout_Widget" );
+        register_widget( "WPInv_History_Widget" );
+        register_widget( "WPInv_Receipt_Widget" );
+        register_widget( "WPInv_Subscriptions_Widget" );
+        register_widget( "WPInv_Buy_Item_Widget" );
+        register_widget( "WPInv_Messages_Widget" );
+    }
 }
\ No newline at end of file

Spacing +203 added lines, -203 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -32,31 +32,31 @@ 
     }
     
     public function define_constants() {
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
     }
     
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        if ( class_exists( 'BuddyPress' ) ) {
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        if (class_exists('BuddyPress')) {
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
+        add_action('widgets_init', array(&$this, 'register_widgets'));
 
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_action('admin_body_class', array(&$this, 'admin_body_class'));
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -66,19 +66,19 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
     
     public function plugins_loaded() {
         /* Internationalize the text strings used. */
         $this->load_textdomain();
 
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
 
         // Fix oxygen page builder conflict
-        if ( function_exists( 'ct_css_output' ) ) {
+        if (function_exists('ct_css_output')) {
             wpinv_oxygen_fix_conflict();
         }
     }
@@ -88,228 +88,228 @@ 
      *
      * @since 1.0
      */
-    public function load_textdomain( $locale = NULL ) {
-        if ( empty( $locale ) ) {
-            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+    public function load_textdomain($locale = NULL) {
+        if (empty($locale)) {
+            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
         }
 
-        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+        $locale = apply_filters('plugin_locale', $locale, 'invoicing');
         
-        unload_textdomain( 'invoicing' );
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        unload_textdomain('invoicing');
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
         
         /**
          * Define language constants.
          */
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
     }
         
     public function includes() {
         global $wpinv_options;
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
         
-        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-
-        if ( !class_exists( 'WPInv_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+
+        if (!class_exists('WPInv_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
         
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
         
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
             // load the user class only on the users.php page
             global $pagenow;
-            if($pagenow=='users.php'){
+            if ($pagenow == 'users.php') {
                 new WPInv_Admin_Users();
             }
         }
 
         // Register cli commands
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        if (defined('WP_CLI') && WP_CLI) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+            WP_CLI::add_command('invoicing', 'WPInv_CLI');
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
     
     public function init() {
     }
     
     public function admin_init() {
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_front_style' );
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_front_style');
                
         // Register scripts
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  WPINV_VERSION );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), WPINV_VERSION);
 
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_separator();
         $localize['decimal_sep']          = wpinv_decimal_separator();
         $localize['decimals']             = wpinv_decimals();
-        $localize['txtComplete']          = __( 'Complete', 'invoicing' );
+        $localize['txtComplete']          = __('Complete', 'invoicing');
         $localize['UseTaxes']             = wpinv_use_taxes();
-        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
 
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
+        wp_enqueue_script('jquery-blockui');
         $autofill_api = wpinv_get_option('address_autofill_api');
         $autofill_active = wpinv_get_option('address_autofill_active');
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-                wp_dequeue_script( 'google-maps-api' );
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+            if (wp_script_is('google-maps-api', 'enqueued')) {
+                wp_dequeue_script('google-maps-api');
             }
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('wpinv-front-script');
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
     }
 
     public function admin_enqueue_scripts() {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
+        $suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
 
         $jquery_ui_css = false;
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $jquery_ui_css = true;
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
             $jquery_ui_css = true;
         }
-        if ( $jquery_ui_css ) {
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-            wp_enqueue_style( 'jquery-ui-css' );
+        if ($jquery_ui_css) {
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+            wp_enqueue_style('jquery-ui-css');
         }
 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_admin_style' );
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_admin_style');
 
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
+        if ($page == 'wpinv-subscriptions') {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
 
         if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $autofill_api = wpinv_get_option('address_autofill_api');
@@ -320,20 +320,20 @@ 
             }
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  WPINV_VERSION );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), WPINV_VERSION);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -341,69 +341,69 @@ 
         $localize['thousand_sep']               = wpinv_thousands_separator();
         $localize['decimal_sep']                = wpinv_decimal_separator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
-
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
-
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
-
-        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' );
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
+        $localize['action_edit']                = __('Edit', 'invoicing');
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
+
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
+
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
+
+        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');
         }
     }
     
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow, $post, $current_screen;
         
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote' ) ) {
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote')) {
             $classes .= ' wpinv-cpt';
         }
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
-        if ( $add_class ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
+        if ($add_class) {
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
             return $classes .= ' wpinv';
         }
         
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
             $classes .= ' wpi-editable-n';
         }
 
@@ -415,21 +415,21 @@ 
     }
     
     public function wpinv_actions() {
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        if (isset($_REQUEST['wpi_action'])) {
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         return $wp_query;
     }
     
     public function bp_invoicing_init() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
     }
 
 	/**
@@ -437,11 +437,11 @@ 
 	 *
 	 */
 	public function register_widgets() {
-		register_widget( "WPInv_Checkout_Widget" );
-		register_widget( "WPInv_History_Widget" );
-		register_widget( "WPInv_Receipt_Widget" );
-		register_widget( "WPInv_Subscriptions_Widget" );
-		register_widget( "WPInv_Buy_Item_Widget" );
-		register_widget( "WPInv_Messages_Widget" );
+		register_widget("WPInv_Checkout_Widget");
+		register_widget("WPInv_History_Widget");
+		register_widget("WPInv_Receipt_Widget");
+		register_widget("WPInv_Subscriptions_Widget");
+		register_widget("WPInv_Buy_Item_Widget");
+		register_widget("WPInv_Messages_Widget");
 	}
 }
\ No newline at end of file

includes/wpinv-helper-functions.php

Indentation +5 added lines, -5 removed lines

@@ -700,7 +700,7 @@ 
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+    return ini_get( 'arg_separator.output' );
 }
 
 function wpinv_rgb_from_hex( $color ) {
@@ -1038,9 +1038,9 @@ 
  * @return array Sanitized array of values.
  */
 function wpinv_parse_list( $list ) {
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
-	}
+    if ( ! is_array( $list ) ) {
+        return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+    }
 
-	return $list;
+    return $list;
 }
\ No newline at end of file

Spacing +392 added lines, -392 removed lines

@@ -7,132 +7,132 @@ 
  */
 
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_item_quantities_enabled() {
-    $ret = wpinv_get_option( 'item_quantities', true );
+    $ret = wpinv_get_option('item_quantities', true);
 
-    return (bool) apply_filters( 'wpinv_item_quantities_enabled', $ret );
+    return (bool) apply_filters('wpinv_item_quantities_enabled', $ret);
 }
 
 function wpinv_get_ip() {
     $ip = '127.0.0.1';
 
-    if ( !empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_CLIENT_IP'] );
-    } elseif ( !empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_X_FORWARDED_FOR'] );
-    } elseif( !empty( $_SERVER['REMOTE_ADDR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_CLIENT_IP']);
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_X_FORWARDED_FOR']);
+    } elseif (!empty($_SERVER['REMOTE_ADDR'])) {
+        $ip = sanitize_text_field($_SERVER['REMOTE_ADDR']);
     }
 
-    return apply_filters( 'wpinv_get_ip', $ip );
+    return apply_filters('wpinv_get_ip', $ip);
 }
 
 function wpinv_get_user_agent() {
-    if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
-        $user_agent = sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] );
+    if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+        $user_agent = sanitize_text_field($_SERVER['HTTP_USER_AGENT']);
     } else {
         $user_agent = '';
     }
 
-    return apply_filters( 'wpinv_get_user_agent', $user_agent );
+    return apply_filters('wpinv_get_user_agent', $user_agent);
 }
 
-function wpinv_sanitize_amount( $amount, $decimals = NULL ) {
+function wpinv_sanitize_amount($amount, $decimals = NULL) {
     $is_negative   = false;
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
     // Sanitize the amount
-    if ( $decimal_sep == ',' && false !== ( $found = strpos( $amount, $decimal_sep ) ) ) {
-        if ( ( $thousands_sep == '.' || $thousands_sep == ' ' ) && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-            $amount = str_replace( $thousands_sep, '', $amount );
-        } elseif( empty( $thousands_sep ) && false !== ( $found = strpos( $amount, '.' ) ) ) {
-            $amount = str_replace( '.', '', $amount );
+    if ($decimal_sep == ',' && false !== ($found = strpos($amount, $decimal_sep))) {
+        if (($thousands_sep == '.' || $thousands_sep == ' ') && false !== ($found = strpos($amount, $thousands_sep))) {
+            $amount = str_replace($thousands_sep, '', $amount);
+        } elseif (empty($thousands_sep) && false !== ($found = strpos($amount, '.'))) {
+            $amount = str_replace('.', '', $amount);
         }
 
-        $amount = str_replace( $decimal_sep, '.', $amount );
-    } elseif( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( $thousands_sep, '', $amount );
+        $amount = str_replace($decimal_sep, '.', $amount);
+    } elseif ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace($thousands_sep, '', $amount);
     }
 
-    if( $amount < 0 ) {
+    if ($amount < 0) {
         $is_negative = true;
     }
 
-    $amount   = preg_replace( '/[^0-9\.]/', '', $amount );
+    $amount   = preg_replace('/[^0-9\.]/', '', $amount);
 
-    $decimals = apply_filters( 'wpinv_sanitize_amount_decimals', absint( $decimals ), $amount );
-    $amount   = number_format( (double) $amount, absint( $decimals ), '.', '' );
+    $decimals = apply_filters('wpinv_sanitize_amount_decimals', absint($decimals), $amount);
+    $amount   = number_format((double) $amount, absint($decimals), '.', '');
 
-    if( $is_negative ) {
+    if ($is_negative) {
         $amount *= -1;
     }
 
-    return apply_filters( 'wpinv_sanitize_amount', $amount, $decimals );
+    return apply_filters('wpinv_sanitize_amount', $amount, $decimals);
 }
-add_filter( 'wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_round_amount( $amount, $decimals = NULL ) {
-    if ( $decimals === NULL ) {
+function wpinv_round_amount($amount, $decimals = NULL) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
     
-    $amount = round( (double)$amount, wpinv_currency_decimal_filter( absint( $decimals ) ) );
+    $amount = round((double) $amount, wpinv_currency_decimal_filter(absint($decimals)));
 
-    return apply_filters( 'wpinv_round_amount', $amount, $decimals );
+    return apply_filters('wpinv_round_amount', $amount, $decimals);
 }
 
-function wpinv_get_invoice_statuses( $draft = false, $trashed = false, $invoice = false ) {
+function wpinv_get_invoice_statuses($draft = false, $trashed = false, $invoice = false) {
     global $post;
 
     $invoice_statuses = array(
-        'wpi-pending' => __( 'Pending Payment', 'invoicing' ),
-        'publish' => __( 'Paid', 'invoicing'),
-        'wpi-processing' => __( 'Processing', 'invoicing' ),
-        'wpi-onhold' => __( 'On Hold', 'invoicing' ),
-        'wpi-refunded' => __( 'Refunded', 'invoicing' ),
-        'wpi-cancelled' => __( 'Cancelled', 'invoicing' ),
-        'wpi-failed' => __( 'Failed', 'invoicing' ),
-        'wpi-renewal' => __( 'Renewal Payment', 'invoicing' )
+        'wpi-pending' => __('Pending Payment', 'invoicing'),
+        'publish' => __('Paid', 'invoicing'),
+        'wpi-processing' => __('Processing', 'invoicing'),
+        'wpi-onhold' => __('On Hold', 'invoicing'),
+        'wpi-refunded' => __('Refunded', 'invoicing'),
+        'wpi-cancelled' => __('Cancelled', 'invoicing'),
+        'wpi-failed' => __('Failed', 'invoicing'),
+        'wpi-renewal' => __('Renewal Payment', 'invoicing')
     );
 
-    if ( $draft ) {
-        $invoice_statuses['draft'] = __( 'Draft', 'invoicing' );
+    if ($draft) {
+        $invoice_statuses['draft'] = __('Draft', 'invoicing');
     }
 
-    if ( $trashed ) {
-        $invoice_statuses['trash'] = __( 'Trash', 'invoicing' );
+    if ($trashed) {
+        $invoice_statuses['trash'] = __('Trash', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_statuses', $invoice_statuses, $invoice );
+    return apply_filters('wpinv_statuses', $invoice_statuses, $invoice);
 }
 
-function wpinv_status_nicename( $status ) {
-    $statuses = wpinv_get_invoice_statuses( true, true );
-    $status   = isset( $statuses[$status] ) ? $statuses[$status] : __( $status, 'invoicing' );
+function wpinv_status_nicename($status) {
+    $statuses = wpinv_get_invoice_statuses(true, true);
+    $status   = isset($statuses[$status]) ? $statuses[$status] : __($status, 'invoicing');
 
     return $status;
 }
 
 function wpinv_get_currency() {
-    $currency = wpinv_get_option( 'currency', 'USD' );
+    $currency = wpinv_get_option('currency', 'USD');
     
-    return apply_filters( 'wpinv_currency', $currency );
+    return apply_filters('wpinv_currency', $currency);
 }
 
-function wpinv_currency_symbol( $currency = '' ) {
-    if ( empty( $currency ) ) {
+function wpinv_currency_symbol($currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
     
-    $symbols = apply_filters( 'wpinv_currency_symbols', array(
+    $symbols = apply_filters('wpinv_currency_symbols', array(
         'AED' => '&#x62f;.&#x625;',
         'AFN' => '&#x60b;',
         'ALL' => 'L',
@@ -295,209 +295,209 @@ 
         'YER' => '&#xfdfc;',
         'ZAR' => '&#82;',
         'ZMW' => 'ZK',
-    ) );
+    ));
 
-    $currency_symbol = isset( $symbols[$currency] ) ? $symbols[$currency] : $currency;
+    $currency_symbol = isset($symbols[$currency]) ? $symbols[$currency] : $currency;
 
-    return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
+    return apply_filters('wpinv_currency_symbol', $currency_symbol, $currency);
 }
 
 function wpinv_currency_position() {
-    $position = wpinv_get_option( 'currency_position', 'left' );
+    $position = wpinv_get_option('currency_position', 'left');
     
-    return apply_filters( 'wpinv_currency_position', $position );
+    return apply_filters('wpinv_currency_position', $position);
 }
 
 function wpinv_thousands_separator() {
-    $thousand_sep = wpinv_get_option( 'thousands_separator', ',' );
+    $thousand_sep = wpinv_get_option('thousands_separator', ',');
     
-    return apply_filters( 'wpinv_thousands_separator', $thousand_sep );
+    return apply_filters('wpinv_thousands_separator', $thousand_sep);
 }
 
 function wpinv_decimal_separator() {
-    $decimal_sep = wpinv_get_option( 'decimal_separator', '.' );
+    $decimal_sep = wpinv_get_option('decimal_separator', '.');
     
-    return apply_filters( 'wpinv_decimal_separator', $decimal_sep );
+    return apply_filters('wpinv_decimal_separator', $decimal_sep);
 }
 
 function wpinv_decimals() {
-    $decimals = apply_filters( 'wpinv_decimals', wpinv_get_option( 'decimals', 2 ) );
+    $decimals = apply_filters('wpinv_decimals', wpinv_get_option('decimals', 2));
     
-    return absint( $decimals );
+    return absint($decimals);
 }
 
 function wpinv_get_currencies() {
     $currencies = array(
-        'USD' => __( 'US Dollar', 'invoicing' ),
-        'EUR' => __( 'Euro', 'invoicing' ),
-        'GBP' => __( 'Pound Sterling', 'invoicing' ),
-        'AED' => __( 'United Arab Emirates', 'invoicing' ),
-        'AFN' => __( 'Afghan Afghani', 'invoicing' ),
-        'ALL' => __( 'Albanian Lek', 'invoicing' ),
-        'AMD' => __( 'Armenian Dram', 'invoicing' ),
-        'ANG' => __( 'Netherlands Antillean Guilder', 'invoicing' ),
-        'AOA' => __( 'Angolan Kwanza', 'invoicing' ),
-        'ARS' => __( 'Argentine Peso', 'invoicing' ),
-        'AUD' => __( 'Australian Dollar', 'invoicing' ),
-        'AWG' => __( 'Aruban Florin', 'invoicing' ),
-        'AZN' => __( 'Azerbaijani Manat', 'invoicing' ),
-        'BAM' => __( 'Bosnia and Herzegovina Convertible Marka', 'invoicing' ),
-        'BBD' => __( 'Barbadian Dollar', 'invoicing' ),
-        'BDT' => __( 'Bangladeshi Taka', 'invoicing' ),
-        'BGN' => __( 'Bulgarian Lev', 'invoicing' ),
-        'BHD' => __( 'Bahraini Dinar', 'invoicing' ),
-        'BIF' => __( 'Burundian Franc', 'invoicing' ),
-        'BMD' => __( 'Bermudian Dollar', 'invoicing' ),
-        'BND' => __( 'Brunei Dollar', 'invoicing' ),
-        'BOB' => __( 'Bolivian Boliviano', 'invoicing' ),
-        'BRL' => __( 'Brazilian Real', 'invoicing' ),
-        'BSD' => __( 'Bahamian Dollar', 'invoicing' ),
-        'BTC' => __( 'Bitcoin', 'invoicing' ),
-        'BTN' => __( 'Bhutanese Ngultrum', 'invoicing' ),
-        'BWP' => __( 'Botswana Pula', 'invoicing' ),
-        'BYN' => __( 'Belarusian Ruble', 'invoicing' ),
-        'BZD' => __( 'Belize Dollar', 'invoicing' ),
-        'CAD' => __( 'Canadian Dollar', 'invoicing' ),
-        'CDF' => __( 'Congolese Franc', 'invoicing' ),
-        'CHF' => __( 'Swiss Franc', 'invoicing' ),
-        'CLP' => __( 'Chilean Peso', 'invoicing' ),
-        'CNY' => __( 'Chinese Yuan', 'invoicing' ),
-        'COP' => __( 'Colombian Peso', 'invoicing' ),
-        'CRC' => __( 'Costa Rican Colon', 'invoicing' ),
-        'CUC' => __( 'Cuban Convertible Peso', 'invoicing' ),
-        'CUP' => __( 'Cuban Peso', 'invoicing' ),
-        'CVE' => __( 'Cape Verdean escudo', 'invoicing' ),
-        'CZK' => __( 'Czech Koruna', 'invoicing' ),
-        'DJF' => __( 'Djiboutian Franc', 'invoicing' ),
-        'DKK' => __( 'Danish Krone', 'invoicing' ),
-        'DOP' => __( 'Dominican Peso', 'invoicing' ),
-        'DZD' => __( 'Algerian Dinar', 'invoicing' ),
-        'EGP' => __( 'Egyptian Pound', 'invoicing' ),
-        'ERN' => __( 'Eritrean Nakfa', 'invoicing' ),
-        'ETB' => __( 'Ethiopian Irr', 'invoicing' ),
-        'FJD' => __( 'Fijian Dollar', 'invoicing' ),
-        'FKP' => __( 'Falkland Islands Pound', 'invoicing' ),
-        'GEL' => __( 'Georgian Lari', 'invoicing' ),
-        'GGP' => __( 'Guernsey Pound', 'invoicing' ),
-        'GHS' => __( 'Ghana Cedi', 'invoicing' ),
-        'GIP' => __( 'Gibraltar Pound', 'invoicing' ),
-        'GMD' => __( 'Gambian Dalasi', 'invoicing' ),
-        'GNF' => __( 'Guinean Franc', 'invoicing' ),
-        'GTQ' => __( 'Guatemalan Quetzal', 'invoicing' ),
-        'GYD' => __( 'Guyanese Dollar', 'invoicing' ),
-        'HKD' => __( 'Hong Kong Dollar', 'invoicing' ),
-        'HNL' => __( 'Honduran Lempira', 'invoicing' ),
-        'HRK' => __( 'Croatian Kuna', 'invoicing' ),
-        'HTG' => __( 'Haitian Gourde', 'invoicing' ),
-        'HUF' => __( 'Hungarian Forint', 'invoicing' ),
-        'IDR' => __( 'Indonesian Rupiah', 'invoicing' ),
-        'ILS' => __( 'Israeli New Shekel', 'invoicing' ),
-        'IMP' => __( 'Manx Pound', 'invoicing' ),
-        'INR' => __( 'Indian Rupee', 'invoicing' ),
-        'IQD' => __( 'Iraqi Dinar', 'invoicing' ),
-        'IRR' => __( 'Iranian Rial', 'invoicing' ),
-        'IRT' => __( 'Iranian Toman', 'invoicing' ),
-        'ISK' => __( 'Icelandic Krona', 'invoicing' ),
-        'JEP' => __( 'Jersey Pound', 'invoicing' ),
-        'JMD' => __( 'Jamaican Dollar', 'invoicing' ),
-        'JOD' => __( 'Jordanian Dinar', 'invoicing' ),
-        'JPY' => __( 'Japanese Yen', 'invoicing' ),
-        'KES' => __( 'Kenyan Shilling', 'invoicing' ),
-        'KGS' => __( 'Kyrgyzstani Som', 'invoicing' ),
-        'KHR' => __( 'Cambodian Riel', 'invoicing' ),
-        'KMF' => __( 'Comorian Franc', 'invoicing' ),
-        'KPW' => __( 'North Korean Won', 'invoicing' ),
-        'KRW' => __( 'South Korean Won', 'invoicing' ),
-        'KWD' => __( 'Kuwaiti Dinar', 'invoicing' ),
-        'KYD' => __( 'Cayman Islands Dollar', 'invoicing' ),
-        'KZT' => __( 'Kazakhstani Tenge', 'invoicing' ),
-        'LAK' => __( 'Lao Kip', 'invoicing' ),
-        'LBP' => __( 'Lebanese Pound', 'invoicing' ),
-        'LKR' => __( 'Sri Lankan Rupee', 'invoicing' ),
-        'LRD' => __( 'Liberian Dollar', 'invoicing' ),
-        'LSL' => __( 'Lesotho Loti', 'invoicing' ),
-        'LYD' => __( 'Libyan Dinar', 'invoicing' ),
-        'MAD' => __( 'Moroccan Dirham', 'invoicing' ),
-        'MDL' => __( 'Moldovan Leu', 'invoicing' ),
-        'MGA' => __( 'Malagasy Ariary', 'invoicing' ),
-        'MKD' => __( 'Macedonian Denar', 'invoicing' ),
-        'MMK' => __( 'Burmese Kyat', 'invoicing' ),
-        'MNT' => __( 'Mongolian Tughrik', 'invoicing' ),
-        'MOP' => __( 'Macanese Pataca', 'invoicing' ),
-        'MRO' => __( 'Mauritanian Ouguiya', 'invoicing' ),
-        'MUR' => __( 'Mauritian Rupee', 'invoicing' ),
-        'MVR' => __( 'Maldivian Rufiyaa', 'invoicing' ),
-        'MWK' => __( 'Malawian Kwacha', 'invoicing' ),
-        'MXN' => __( 'Mexican Peso', 'invoicing' ),
-        'MYR' => __( 'Malaysian Ringgit', 'invoicing' ),
-        'MZN' => __( 'Mozambican Metical', 'invoicing' ),
-        'NAD' => __( 'Namibian Dollar', 'invoicing' ),
-        'NGN' => __( 'Nigerian Naira', 'invoicing' ),
-        'NIO' => __( 'Nicaraguan Cordoba', 'invoicing' ),
-        'NOK' => __( 'Norwegian Krone', 'invoicing' ),
-        'NPR' => __( 'Nepalese Rupee', 'invoicing' ),
-        'NZD' => __( 'New Zealand Dollar', 'invoicing' ),
-        'OMR' => __( 'Omani Rial', 'invoicing' ),
-        'PAB' => __( 'Panamanian Balboa', 'invoicing' ),
-        'PEN' => __( 'Peruvian Nuevo Sol', 'invoicing' ),
-        'PGK' => __( 'Papua New Guinean Kina', 'invoicing' ),
-        'PHP' => __( 'Philippine Peso', 'invoicing' ),
-        'PKR' => __( 'Pakistani Rupee', 'invoicing' ),
-        'PLN' => __( 'Polish Zloty', 'invoicing' ),
-        'PRB' => __( 'Transnistrian Ruble', 'invoicing' ),
-        'PYG' => __( 'Paraguayan Guarani', 'invoicing' ),
-        'QAR' => __( 'Qatari Riyal', 'invoicing' ),
-        'RON' => __( 'Romanian Leu', 'invoicing' ),
-        'RSD' => __( 'Serbian Dinar', 'invoicing' ),
-        'RUB' => __( 'Russian Ruble', 'invoicing' ),
-        'RWF' => __( 'Rwandan Franc', 'invoicing' ),
-        'SAR' => __( 'Saudi Riyal', 'invoicing' ),
-        'SBD' => __( 'Solomon Islands Dollar', 'invoicing' ),
-        'SCR' => __( 'Seychellois Rupee', 'invoicing' ),
-        'SDG' => __( 'Sudanese Pound', 'invoicing' ),
-        'SEK' => __( 'Swedish Krona', 'invoicing' ),
-        'SGD' => __( 'Singapore Dollar', 'invoicing' ),
-        'SHP' => __( 'Saint Helena Pound', 'invoicing' ),
-        'SLL' => __( 'Sierra Leonean Leone', 'invoicing' ),
-        'SOS' => __( 'Somali Shilling', 'invoicing' ),
-        'SRD' => __( 'Surinamese Dollar', 'invoicing' ),
-        'SSP' => __( 'South Sudanese Pound', 'invoicing' ),
-        'STD' => __( 'Sao Tomean Dobra', 'invoicing' ),
-        'SYP' => __( 'Syrian Pound', 'invoicing' ),
-        'SZL' => __( 'Swazi Lilangeni', 'invoicing' ),
-        'THB' => __( 'Thai Baht', 'invoicing' ),
-        'TJS' => __( 'Tajikistani Somoni', 'invoicing' ),
-        'TMT' => __( 'Turkmenistan Manat', 'invoicing' ),
-        'TND' => __( 'Tunisian Dinar', 'invoicing' ),
-        'TOP' => __( 'Tongan Pa&#x2bb;anga', 'invoicing' ),
-        'TRY' => __( 'Turkish Lira', 'invoicing' ),
-        'TTD' => __( 'Trinidad and Tobago Dollar', 'invoicing' ),
-        'TWD' => __( 'New Taiwan Dollar', 'invoicing' ),
-        'TZS' => __( 'Tanzanian Shilling', 'invoicing' ),
-        'UAH' => __( 'Ukrainian Hryvnia', 'invoicing' ),
-        'UGX' => __( 'Ugandan Shilling', 'invoicing' ),
-        'UYU' => __( 'Uruguayan Peso', 'invoicing' ),
-        'UZS' => __( 'Uzbekistani Som', 'invoicing' ),
-        'VEF' => __( 'Venezuelan Bol&iacute;var', 'invoicing' ),
-        'VND' => __( 'Vietnamese Dong', 'invoicing' ),
-        'VUV' => __( 'Vanuatu Vatu', 'invoicing' ),
-        'WST' => __( 'Samoan Tala', 'invoicing' ),
-        'XAF' => __( 'Central African CFA Franc', 'invoicing' ),
-        'XCD' => __( 'East Caribbean Dollar', 'invoicing' ),
-        'XOF' => __( 'West African CFA Franc', 'invoicing' ),
-        'XPF' => __( 'CFP Franc', 'invoicing' ),
-        'YER' => __( 'Yemeni Rial', 'invoicing' ),
-        'ZAR' => __( 'South African Rand', 'invoicing' ),
-        'ZMW' => __( 'Zambian Kwacha', 'invoicing' ),
+        'USD' => __('US Dollar', 'invoicing'),
+        'EUR' => __('Euro', 'invoicing'),
+        'GBP' => __('Pound Sterling', 'invoicing'),
+        'AED' => __('United Arab Emirates', 'invoicing'),
+        'AFN' => __('Afghan Afghani', 'invoicing'),
+        'ALL' => __('Albanian Lek', 'invoicing'),
+        'AMD' => __('Armenian Dram', 'invoicing'),
+        'ANG' => __('Netherlands Antillean Guilder', 'invoicing'),
+        'AOA' => __('Angolan Kwanza', 'invoicing'),
+        'ARS' => __('Argentine Peso', 'invoicing'),
+        'AUD' => __('Australian Dollar', 'invoicing'),
+        'AWG' => __('Aruban Florin', 'invoicing'),
+        'AZN' => __('Azerbaijani Manat', 'invoicing'),
+        'BAM' => __('Bosnia and Herzegovina Convertible Marka', 'invoicing'),
+        'BBD' => __('Barbadian Dollar', 'invoicing'),
+        'BDT' => __('Bangladeshi Taka', 'invoicing'),
+        'BGN' => __('Bulgarian Lev', 'invoicing'),
+        'BHD' => __('Bahraini Dinar', 'invoicing'),
+        'BIF' => __('Burundian Franc', 'invoicing'),
+        'BMD' => __('Bermudian Dollar', 'invoicing'),
+        'BND' => __('Brunei Dollar', 'invoicing'),
+        'BOB' => __('Bolivian Boliviano', 'invoicing'),
+        'BRL' => __('Brazilian Real', 'invoicing'),
+        'BSD' => __('Bahamian Dollar', 'invoicing'),
+        'BTC' => __('Bitcoin', 'invoicing'),
+        'BTN' => __('Bhutanese Ngultrum', 'invoicing'),
+        'BWP' => __('Botswana Pula', 'invoicing'),
+        'BYN' => __('Belarusian Ruble', 'invoicing'),
+        'BZD' => __('Belize Dollar', 'invoicing'),
+        'CAD' => __('Canadian Dollar', 'invoicing'),
+        'CDF' => __('Congolese Franc', 'invoicing'),
+        'CHF' => __('Swiss Franc', 'invoicing'),
+        'CLP' => __('Chilean Peso', 'invoicing'),
+        'CNY' => __('Chinese Yuan', 'invoicing'),
+        'COP' => __('Colombian Peso', 'invoicing'),
+        'CRC' => __('Costa Rican Colon', 'invoicing'),
+        'CUC' => __('Cuban Convertible Peso', 'invoicing'),
+        'CUP' => __('Cuban Peso', 'invoicing'),
+        'CVE' => __('Cape Verdean escudo', 'invoicing'),
+        'CZK' => __('Czech Koruna', 'invoicing'),
+        'DJF' => __('Djiboutian Franc', 'invoicing'),
+        'DKK' => __('Danish Krone', 'invoicing'),
+        'DOP' => __('Dominican Peso', 'invoicing'),
+        'DZD' => __('Algerian Dinar', 'invoicing'),
+        'EGP' => __('Egyptian Pound', 'invoicing'),
+        'ERN' => __('Eritrean Nakfa', 'invoicing'),
+        'ETB' => __('Ethiopian Irr', 'invoicing'),
+        'FJD' => __('Fijian Dollar', 'invoicing'),
+        'FKP' => __('Falkland Islands Pound', 'invoicing'),
+        'GEL' => __('Georgian Lari', 'invoicing'),
+        'GGP' => __('Guernsey Pound', 'invoicing'),
+        'GHS' => __('Ghana Cedi', 'invoicing'),
+        'GIP' => __('Gibraltar Pound', 'invoicing'),
+        'GMD' => __('Gambian Dalasi', 'invoicing'),
+        'GNF' => __('Guinean Franc', 'invoicing'),
+        'GTQ' => __('Guatemalan Quetzal', 'invoicing'),
+        'GYD' => __('Guyanese Dollar', 'invoicing'),
+        'HKD' => __('Hong Kong Dollar', 'invoicing'),
+        'HNL' => __('Honduran Lempira', 'invoicing'),
+        'HRK' => __('Croatian Kuna', 'invoicing'),
+        'HTG' => __('Haitian Gourde', 'invoicing'),
+        'HUF' => __('Hungarian Forint', 'invoicing'),
+        'IDR' => __('Indonesian Rupiah', 'invoicing'),
+        'ILS' => __('Israeli New Shekel', 'invoicing'),
+        'IMP' => __('Manx Pound', 'invoicing'),
+        'INR' => __('Indian Rupee', 'invoicing'),
+        'IQD' => __('Iraqi Dinar', 'invoicing'),
+        'IRR' => __('Iranian Rial', 'invoicing'),
+        'IRT' => __('Iranian Toman', 'invoicing'),
+        'ISK' => __('Icelandic Krona', 'invoicing'),
+        'JEP' => __('Jersey Pound', 'invoicing'),
+        'JMD' => __('Jamaican Dollar', 'invoicing'),
+        'JOD' => __('Jordanian Dinar', 'invoicing'),
+        'JPY' => __('Japanese Yen', 'invoicing'),
+        'KES' => __('Kenyan Shilling', 'invoicing'),
+        'KGS' => __('Kyrgyzstani Som', 'invoicing'),
+        'KHR' => __('Cambodian Riel', 'invoicing'),
+        'KMF' => __('Comorian Franc', 'invoicing'),
+        'KPW' => __('North Korean Won', 'invoicing'),
+        'KRW' => __('South Korean Won', 'invoicing'),
+        'KWD' => __('Kuwaiti Dinar', 'invoicing'),
+        'KYD' => __('Cayman Islands Dollar', 'invoicing'),
+        'KZT' => __('Kazakhstani Tenge', 'invoicing'),
+        'LAK' => __('Lao Kip', 'invoicing'),
+        'LBP' => __('Lebanese Pound', 'invoicing'),
+        'LKR' => __('Sri Lankan Rupee', 'invoicing'),
+        'LRD' => __('Liberian Dollar', 'invoicing'),
+        'LSL' => __('Lesotho Loti', 'invoicing'),
+        'LYD' => __('Libyan Dinar', 'invoicing'),
+        'MAD' => __('Moroccan Dirham', 'invoicing'),
+        'MDL' => __('Moldovan Leu', 'invoicing'),
+        'MGA' => __('Malagasy Ariary', 'invoicing'),
+        'MKD' => __('Macedonian Denar', 'invoicing'),
+        'MMK' => __('Burmese Kyat', 'invoicing'),
+        'MNT' => __('Mongolian Tughrik', 'invoicing'),
+        'MOP' => __('Macanese Pataca', 'invoicing'),
+        'MRO' => __('Mauritanian Ouguiya', 'invoicing'),
+        'MUR' => __('Mauritian Rupee', 'invoicing'),
+        'MVR' => __('Maldivian Rufiyaa', 'invoicing'),
+        'MWK' => __('Malawian Kwacha', 'invoicing'),
+        'MXN' => __('Mexican Peso', 'invoicing'),
+        'MYR' => __('Malaysian Ringgit', 'invoicing'),
+        'MZN' => __('Mozambican Metical', 'invoicing'),
+        'NAD' => __('Namibian Dollar', 'invoicing'),
+        'NGN' => __('Nigerian Naira', 'invoicing'),
+        'NIO' => __('Nicaraguan Cordoba', 'invoicing'),
+        'NOK' => __('Norwegian Krone', 'invoicing'),
+        'NPR' => __('Nepalese Rupee', 'invoicing'),
+        'NZD' => __('New Zealand Dollar', 'invoicing'),
+        'OMR' => __('Omani Rial', 'invoicing'),
+        'PAB' => __('Panamanian Balboa', 'invoicing'),
+        'PEN' => __('Peruvian Nuevo Sol', 'invoicing'),
+        'PGK' => __('Papua New Guinean Kina', 'invoicing'),
+        'PHP' => __('Philippine Peso', 'invoicing'),
+        'PKR' => __('Pakistani Rupee', 'invoicing'),
+        'PLN' => __('Polish Zloty', 'invoicing'),
+        'PRB' => __('Transnistrian Ruble', 'invoicing'),
+        'PYG' => __('Paraguayan Guarani', 'invoicing'),
+        'QAR' => __('Qatari Riyal', 'invoicing'),
+        'RON' => __('Romanian Leu', 'invoicing'),
+        'RSD' => __('Serbian Dinar', 'invoicing'),
+        'RUB' => __('Russian Ruble', 'invoicing'),
+        'RWF' => __('Rwandan Franc', 'invoicing'),
+        'SAR' => __('Saudi Riyal', 'invoicing'),
+        'SBD' => __('Solomon Islands Dollar', 'invoicing'),
+        'SCR' => __('Seychellois Rupee', 'invoicing'),
+        'SDG' => __('Sudanese Pound', 'invoicing'),
+        'SEK' => __('Swedish Krona', 'invoicing'),
+        'SGD' => __('Singapore Dollar', 'invoicing'),
+        'SHP' => __('Saint Helena Pound', 'invoicing'),
+        'SLL' => __('Sierra Leonean Leone', 'invoicing'),
+        'SOS' => __('Somali Shilling', 'invoicing'),
+        'SRD' => __('Surinamese Dollar', 'invoicing'),
+        'SSP' => __('South Sudanese Pound', 'invoicing'),
+        'STD' => __('Sao Tomean Dobra', 'invoicing'),
+        'SYP' => __('Syrian Pound', 'invoicing'),
+        'SZL' => __('Swazi Lilangeni', 'invoicing'),
+        'THB' => __('Thai Baht', 'invoicing'),
+        'TJS' => __('Tajikistani Somoni', 'invoicing'),
+        'TMT' => __('Turkmenistan Manat', 'invoicing'),
+        'TND' => __('Tunisian Dinar', 'invoicing'),
+        'TOP' => __('Tongan Pa&#x2bb;anga', 'invoicing'),
+        'TRY' => __('Turkish Lira', 'invoicing'),
+        'TTD' => __('Trinidad and Tobago Dollar', 'invoicing'),
+        'TWD' => __('New Taiwan Dollar', 'invoicing'),
+        'TZS' => __('Tanzanian Shilling', 'invoicing'),
+        'UAH' => __('Ukrainian Hryvnia', 'invoicing'),
+        'UGX' => __('Ugandan Shilling', 'invoicing'),
+        'UYU' => __('Uruguayan Peso', 'invoicing'),
+        'UZS' => __('Uzbekistani Som', 'invoicing'),
+        'VEF' => __('Venezuelan Bol&iacute;var', 'invoicing'),
+        'VND' => __('Vietnamese Dong', 'invoicing'),
+        'VUV' => __('Vanuatu Vatu', 'invoicing'),
+        'WST' => __('Samoan Tala', 'invoicing'),
+        'XAF' => __('Central African CFA Franc', 'invoicing'),
+        'XCD' => __('East Caribbean Dollar', 'invoicing'),
+        'XOF' => __('West African CFA Franc', 'invoicing'),
+        'XPF' => __('CFP Franc', 'invoicing'),
+        'YER' => __('Yemeni Rial', 'invoicing'),
+        'ZAR' => __('South African Rand', 'invoicing'),
+        'ZMW' => __('Zambian Kwacha', 'invoicing'),
     );
     
     //asort( $currencies ); // this
 
-    return apply_filters( 'wpinv_currencies', $currencies );
+    return apply_filters('wpinv_currencies', $currencies);
 }
 
-function wpinv_price( $amount = '', $currency = '' ) {
-    if( empty( $currency ) ) {
+function wpinv_price($amount = '', $currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
@@ -505,14 +505,14 @@ 
 
     $negative = $amount < 0;
 
-    if ( $negative ) {
-        $amount = substr( $amount, 1 );
+    if ($negative) {
+        $amount = substr($amount, 1);
     }
 
-    $symbol = wpinv_currency_symbol( $currency );
+    $symbol = wpinv_currency_symbol($currency);
 
-    if ( $position == 'left' || $position == 'left_space' ) {
-        switch ( $currency ) {
+    if ($position == 'left' || $position == 'left_space') {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -524,15 +524,15 @@ 
             case "NZD" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
             default :
                 //$price = $currency . ' ' . $amount;
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
         }
     } else {
-        switch ( $currency ) {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -543,83 +543,83 @@ 
             case "MXN" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
             default :
                 //$price = $amount . ' ' . $currency;
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
         }
     }
     
-    if ( $negative ) {
+    if ($negative) {
         $price = '-' . $price;
     }
     
-    $price = apply_filters( 'wpinv_' . strtolower( $currency ) . '_currency_filter_' . $position, $price, $currency, $amount );
+    $price = apply_filters('wpinv_' . strtolower($currency) . '_currency_filter_' . $position, $price, $currency, $amount);
 
     return $price;
 }
 
-function wpinv_format_amount( $amount, $decimals = NULL, $calculate = false ) {
+function wpinv_format_amount($amount, $decimals = NULL, $calculate = false) {
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
 
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
-    if ( $decimal_sep == ',' && false !== ( $sep_found = strpos( $amount, $decimal_sep ) ) ) {
-        $whole = substr( $amount, 0, $sep_found );
-        $part = substr( $amount, $sep_found + 1, ( strlen( $amount ) - 1 ) );
+    if ($decimal_sep == ',' && false !== ($sep_found = strpos($amount, $decimal_sep))) {
+        $whole = substr($amount, 0, $sep_found);
+        $part = substr($amount, $sep_found + 1, (strlen($amount) - 1));
         $amount = $whole . '.' . $part;
     }
 
-    if ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ',', '', $amount );
+    if ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(',', '', $amount);
     }
 
-    if ( $thousands_sep == ' ' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ' ', '', $amount );
+    if ($thousands_sep == ' ' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(' ', '', $amount);
     }
 
-    if ( empty( $amount ) ) {
+    if (empty($amount)) {
         $amount = 0;
     }
     
-    $decimals  = apply_filters( 'wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate );
-    $formatted = number_format( (float)$amount, $decimals, $decimal_sep, $thousands_sep );
+    $decimals  = apply_filters('wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate);
+    $formatted = number_format((float) $amount, $decimals, $decimal_sep, $thousands_sep);
     
-    if ( $calculate ) {
-        if ( $thousands_sep === "," ) {
-            $formatted = str_replace( ",", "", $formatted );
+    if ($calculate) {
+        if ($thousands_sep === ",") {
+            $formatted = str_replace(",", "", $formatted);
         }
         
-        if ( $decimal_sep === "," ) {
-            $formatted = str_replace( ",", ".", $formatted );
+        if ($decimal_sep === ",") {
+            $formatted = str_replace(",", ".", $formatted);
         }
     }
 
-    return apply_filters( 'wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate );
+    return apply_filters('wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate);
 }
-add_filter( 'wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_sanitize_key( $key ) {
+function wpinv_sanitize_key($key) {
     $raw_key = $key;
-    $key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
+    $key = preg_replace('/[^a-zA-Z0-9_\-\.\:\/]/', '', $key);
 
-    return apply_filters( 'wpinv_sanitize_key', $key, $raw_key );
+    return apply_filters('wpinv_sanitize_key', $key, $raw_key);
 }
 
-function wpinv_get_file_extension( $str ) {
-    $parts = explode( '.', $str );
-    return end( $parts );
+function wpinv_get_file_extension($str) {
+    $parts = explode('.', $str);
+    return end($parts);
 }
 
-function wpinv_string_is_image_url( $str ) {
-    $ext = wpinv_get_file_extension( $str );
+function wpinv_string_is_image_url($str) {
+    $ext = wpinv_get_file_extension($str);
 
-    switch ( strtolower( $ext ) ) {
+    switch (strtolower($ext)) {
         case 'jpeg';
         case 'jpg';
             $return = true;
@@ -635,32 +635,32 @@ 
             break;
     }
 
-    return (bool)apply_filters( 'wpinv_string_is_image', $return, $str );
+    return (bool) apply_filters('wpinv_string_is_image', $return, $str);
 }
 
-function wpinv_error_log( $log, $title = '', $file = '', $line = '', $exit = false ) {
-    $should_log = apply_filters( 'wpinv_log_errors', WP_DEBUG );
+function wpinv_error_log($log, $title = '', $file = '', $line = '', $exit = false) {
+    $should_log = apply_filters('wpinv_log_errors', WP_DEBUG);
     
-    if ( true === $should_log ) {
+    if (true === $should_log) {
         $label = '';
-        if ( $file && $file !== '' ) {
-            $label .= basename( $file ) . ( $line ? '(' . $line . ')' : '' );
+        if ($file && $file !== '') {
+            $label .= basename($file) . ($line ? '(' . $line . ')' : '');
         }
         
-        if ( $title && $title !== '' ) {
+        if ($title && $title !== '') {
             $label = $label !== '' ? $label . ' ' : '';
             $label .= $title . ' ';
         }
         
-        $label = $label !== '' ? trim( $label ) . ' : ' : '';
+        $label = $label !== '' ? trim($label) . ' : ' : '';
         
-        if ( is_array( $log ) || is_object( $log ) ) {
-            error_log( $label . print_r( $log, true ) );
+        if (is_array($log) || is_object($log)) {
+            error_log($label . print_r($log, true));
         } else {
-            error_log( $label . $log );
+            error_log($label . $log);
         }
         
-        if ( $exit ) {
+        if ($exit) {
             exit;
         }
     }
@@ -668,65 +668,65 @@ 
 
 function wpinv_is_ajax_disabled() {
     $retval = false;
-    return apply_filters( 'wpinv_is_ajax_disabled', $retval );
+    return apply_filters('wpinv_is_ajax_disabled', $retval);
 }
 
-function wpinv_get_current_page_url( $nocache = false ) {
+function wpinv_get_current_page_url($nocache = false) {
     global $wp;
 
-    if ( get_option( 'permalink_structure' ) ) {
-        $base = trailingslashit( home_url( $wp->request ) );
+    if (get_option('permalink_structure')) {
+        $base = trailingslashit(home_url($wp->request));
     } else {
-        $base = add_query_arg( $wp->query_string, '', trailingslashit( home_url( $wp->request ) ) );
-        $base = remove_query_arg( array( 'post_type', 'name' ), $base );
+        $base = add_query_arg($wp->query_string, '', trailingslashit(home_url($wp->request)));
+        $base = remove_query_arg(array('post_type', 'name'), $base);
     }
 
     $scheme = is_ssl() ? 'https' : 'http';
-    $uri    = set_url_scheme( $base, $scheme );
+    $uri    = set_url_scheme($base, $scheme);
 
-    if ( is_front_page() ) {
-        $uri = home_url( '/' );
-    } elseif ( wpinv_is_checkout( array(), false ) ) {
+    if (is_front_page()) {
+        $uri = home_url('/');
+    } elseif (wpinv_is_checkout(array(), false)) {
         $uri = wpinv_get_checkout_uri();
     }
 
-    $uri = apply_filters( 'wpinv_get_current_page_url', $uri );
+    $uri = apply_filters('wpinv_get_current_page_url', $uri);
 
-    if ( $nocache ) {
-        $uri = wpinv_add_cache_busting( $uri );
+    if ($nocache) {
+        $uri = wpinv_add_cache_busting($uri);
     }
 
     return $uri;
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
-function wpinv_rgb_from_hex( $color ) {
-    $color = str_replace( '#', '', $color );
+function wpinv_rgb_from_hex($color) {
+    $color = str_replace('#', '', $color);
     // Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-    $color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
+    $color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
 
     $rgb      = array();
-    $rgb['R'] = hexdec( $color{0}.$color{1} );
-    $rgb['G'] = hexdec( $color{2}.$color{3} );
-    $rgb['B'] = hexdec( $color{4}.$color{5} );
+    $rgb['R'] = hexdec($color{0} . $color{1} );
+    $rgb['G'] = hexdec($color{2} . $color{3} );
+    $rgb['B'] = hexdec($color{4} . $color{5} );
 
     return $rgb;
 }
 
-function wpinv_hex_darker( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_darker($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = $v / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v - $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -735,18 +735,18 @@ 
     return $color;
 }
 
-function wpinv_hex_lighter( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_lighter($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = 255 - $v;
         $amount      = $amount / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v + $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -755,22 +755,22 @@ 
     return $color;
 }
 
-function wpinv_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
-    $hex = str_replace( '#', '', $color );
+function wpinv_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
+    $hex = str_replace('#', '', $color);
 
-    $c_r = hexdec( substr( $hex, 0, 2 ) );
-    $c_g = hexdec( substr( $hex, 2, 2 ) );
-    $c_b = hexdec( substr( $hex, 4, 2 ) );
+    $c_r = hexdec(substr($hex, 0, 2));
+    $c_g = hexdec(substr($hex, 2, 2));
+    $c_b = hexdec(substr($hex, 4, 2));
 
-    $brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+    $brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
     return $brightness > 155 ? $dark : $light;
 }
 
-function wpinv_format_hex( $hex ) {
-    $hex = trim( str_replace( '#', '', $hex ) );
+function wpinv_format_hex($hex) {
+    $hex = trim(str_replace('#', '', $hex));
 
-    if ( strlen( $hex ) == 3 ) {
+    if (strlen($hex) == 3) {
         $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
     }
 
@@ -790,12 +790,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function wpinv_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
     
-    return wpinv_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return wpinv_utf8_substr($str, $start, $width, $encoding) . $trimmaker;
 }
 
 /**
@@ -807,28 +807,28 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function wpinv_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function wpinv_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
         
-    return strlen( $str );
+    return strlen($str);
 }
 
-function wpinv_utf8_strtolower( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtolower' ) ) {
-        return mb_strtolower( $str, $encoding );
+function wpinv_utf8_strtolower($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtolower')) {
+        return mb_strtolower($str, $encoding);
     }
     
-    return strtolower( $str );
+    return strtolower($str);
 }
 
-function wpinv_utf8_strtoupper( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtoupper' ) ) {
-        return mb_strtoupper( $str, $encoding );
+function wpinv_utf8_strtoupper($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtoupper($str, $encoding);
     }
     
-    return strtoupper( $str );
+    return strtoupper($str);
 }
 
 /**
@@ -842,12 +842,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function wpinv_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
         
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -861,12 +861,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function wpinv_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
         
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -881,16 +881,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+function wpinv_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, wpinv_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
         
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -902,48 +902,48 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function wpinv_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strwidth' ) ) {
-        return mb_strwidth( $str, $encoding );
+function wpinv_utf8_strwidth($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strwidth')) {
+        return mb_strwidth($str, $encoding);
     }
     
-    return wpinv_utf8_strlen( $str, $encoding );
+    return wpinv_utf8_strlen($str, $encoding);
 }
 
-function wpinv_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = wpinv_utf8_strtoupper( wpinv_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function wpinv_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = wpinv_utf8_strtoupper(wpinv_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = wpinv_utf8_strtolower( wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = wpinv_utf8_strtolower(wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding);
         }
 
         return $first_letter . $str_end;
     }
     
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
-function wpinv_utf8_ucwords( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_convert_case' ) ) {
-        return mb_convert_case( $str, MB_CASE_TITLE, $encoding );
+function wpinv_utf8_ucwords($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_convert_case')) {
+        return mb_convert_case($str, MB_CASE_TITLE, $encoding);
     }
     
-    return ucwords( $str );
+    return ucwords($str);
 }
 
-function wpinv_period_in_days( $period, $unit ) {
-    $period = absint( $period );
+function wpinv_period_in_days($period, $unit) {
+    $period = absint($period);
     
-    if ( $period > 0 ) {
-        if ( in_array( strtolower( $unit ), array( 'w', 'week', 'weeks' ) ) ) {
+    if ($period > 0) {
+        if (in_array(strtolower($unit), array('w', 'week', 'weeks'))) {
             $period = $period * 7;
-        } else if ( in_array( strtolower( $unit ), array( 'm', 'month', 'months' ) ) ) {
+        } else if (in_array(strtolower($unit), array('m', 'month', 'months'))) {
             $period = $period * 30;
-        } else if ( in_array( strtolower( $unit ), array( 'y', 'year', 'years' ) ) ) {
+        } else if (in_array(strtolower($unit), array('y', 'year', 'years'))) {
             $period = $period * 365;
         }
     }
@@ -951,14 +951,14 @@ 
     return $period;
 }
 
-function wpinv_cal_days_in_month( $calendar, $month, $year ) {
-    if ( function_exists( 'cal_days_in_month' ) ) {
-        return cal_days_in_month( $calendar, $month, $year );
+function wpinv_cal_days_in_month($calendar, $month, $year) {
+    if (function_exists('cal_days_in_month')) {
+        return cal_days_in_month($calendar, $month, $year);
     }
 
     // Fallback in case the calendar extension is not loaded in PHP
     // Only supports Gregorian calendar
-    return date( 't', mktime( 0, 0, 0, $month, 1, $year ) );
+    return date('t', mktime(0, 0, 0, $month, 1, $year));
 }
 
 /**
@@ -969,11 +969,11 @@ 
  *
  * @return string
  */
-function wpi_help_tip( $tip, $allow_html = false ) {
-    if ( $allow_html ) {
-        $tip = wpi_sanitize_tooltip( $tip );
+function wpi_help_tip($tip, $allow_html = false) {
+    if ($allow_html) {
+        $tip = wpi_sanitize_tooltip($tip);
     } else {
-        $tip = esc_attr( $tip );
+        $tip = esc_attr($tip);
     }
 
     return '<span class="wpi-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
@@ -987,8 +987,8 @@ 
  * @param string $var
  * @return string
  */
-function wpi_sanitize_tooltip( $var ) {
-    return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+function wpi_sanitize_tooltip($var) {
+    return htmlspecialchars(wp_kses(html_entity_decode($var), array(
         'br'     => array(),
         'em'     => array(),
         'strong' => array(),
@@ -998,7 +998,7 @@ 
         'li'     => array(),
         'ol'     => array(),
         'p'      => array(),
-    ) ) );
+    )));
 }
 
 /**
@@ -1008,7 +1008,7 @@ 
  */
 function wpinv_get_screen_ids() {
 
-    $screen_id = sanitize_title( __( 'Invoicing', 'invoicing' ) );
+    $screen_id = sanitize_title(__('Invoicing', 'invoicing'));
 
     $screen_ids = array(
         'toplevel_page_' . $screen_id,
@@ -1026,7 +1026,7 @@ 
         'invoicing_page_wpi-addons',
     );
 
-    return apply_filters( 'wpinv_screen_ids', $screen_ids );
+    return apply_filters('wpinv_screen_ids', $screen_ids);
 }
 
 /**
@@ -1037,9 +1037,9 @@ 
  * @param array|string $list List of values.
  * @return array Sanitized array of values.
  */
-function wpinv_parse_list( $list ) {
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+function wpinv_parse_list($list) {
+	if (!is_array($list)) {
+		return preg_split('/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY);
 	}
 
 	return $list;

includes/admin/wpinv-admin-functions.php

Indentation +45 added lines, -45 removed lines

@@ -101,9 +101,9 @@ 
         case 'status' :
             $value   = $wpi_invoice->get_status( true ) . ( $wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '' );
             $is_viewed = wpinv_is_invoice_viewed( $wpi_invoice->ID );
-	        $gateway_title = wpinv_get_gateway_admin_label( $wpi_invoice->get_gateway() );
-	        $offline_gateways = apply_filters('wpinv_offline_payments', array('bank_transfer', 'cheque', 'cod'));
-	        $is_offline_payment = in_array($wpi_invoice->get_gateway(), $offline_gateways) ? true : false;
+            $gateway_title = wpinv_get_gateway_admin_label( $wpi_invoice->get_gateway() );
+            $offline_gateways = apply_filters('wpinv_offline_payments', array('bank_transfer', 'cheque', 'cod'));
+            $is_offline_payment = in_array($wpi_invoice->get_gateway(), $offline_gateways) ? true : false;
 
             if ( 1 == $is_viewed ) {
                 $value .= '&nbsp;&nbsp;<i class="fa fa-eye" title="'.__( 'Viewed by Customer', 'invoicing' ).'"></i>';
@@ -174,69 +174,69 @@ 
 }
 
 function wpinv_admin_messages() {
-	global $wpinv_options, $pagenow, $post;
+    global $wpinv_options, $pagenow, $post;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
+    if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
     }
     
     if ( isset( $_GET['wpinv-message'] ) && 'email_fail' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+        add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
     }
 
     if ( isset( $_GET['wpinv-message'] ) && 'invoice-note-deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
         add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
     }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
+    }
     
-	if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
-		$message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
+    if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
+        $message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
 
-		if ( !empty( $message ) ) {
-			add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
-		}
-	}
+        if ( !empty( $message ) ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
+        }
+    }
 
-	settings_errors( 'wpinv-notices' );
+    settings_errors( 'wpinv-notices' );
 }
 add_action( 'admin_notices', 'wpinv_admin_messages' );
 
@@ -326,7 +326,7 @@ 
         break;
         case 'id' :
            echo $post->ID;
-           echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
+            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
                     <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
                     if ( $wpinv_euvat->allow_vat_rules() ) {
                         echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';

Spacing +228 added lines, -228 removed lines

@@ -7,245 +7,245 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_columns( $columns ) {
+function wpinv_columns($columns) {
     $columns = array(
         'cb'                => $columns['cb'],
-        'number'            => __( 'Number', 'invoicing' ),
-        'customer'          => __( 'Customer', 'invoicing' ),
-        'amount'            => __( 'Amount', 'invoicing' ),
-        'invoice_date'      => __( 'Created Date', 'invoicing' ),
-        'payment_date'      => __( 'Payment Date', 'invoicing' ),
-        'status'            => __( 'Status', 'invoicing' ),
-        'ID'                => __( 'ID', 'invoicing' ),
-        'wpi_actions'       => __( 'Actions', 'invoicing' ),
+        'number'            => __('Number', 'invoicing'),
+        'customer'          => __('Customer', 'invoicing'),
+        'amount'            => __('Amount', 'invoicing'),
+        'invoice_date'      => __('Created Date', 'invoicing'),
+        'payment_date'      => __('Payment Date', 'invoicing'),
+        'status'            => __('Status', 'invoicing'),
+        'ID'                => __('ID', 'invoicing'),
+        'wpi_actions'       => __('Actions', 'invoicing'),
     );
 
-    return apply_filters( 'wpi_invoice_table_columns', $columns );
+    return apply_filters('wpi_invoice_table_columns', $columns);
 }
-add_filter( 'manage_wpi_invoice_posts_columns', 'wpinv_columns' );
+add_filter('manage_wpi_invoice_posts_columns', 'wpinv_columns');
 
-function wpinv_bulk_actions( $actions ) {
-    if ( isset( $actions['edit'] ) ) {
-        unset( $actions['edit'] );
+function wpinv_bulk_actions($actions) {
+    if (isset($actions['edit'])) {
+        unset($actions['edit']);
     }
 
     return $actions;
 }
-add_filter( 'bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions' );
-add_filter( 'bulk_actions-edit-wpi_item', 'wpinv_bulk_actions' );
+add_filter('bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions');
+add_filter('bulk_actions-edit-wpi_item', 'wpinv_bulk_actions');
 
-function wpinv_sortable_columns( $columns ) {
+function wpinv_sortable_columns($columns) {
     $columns = array(
-        'ID'            => array( 'ID', true ),
-        'number'        => array( 'number', false ),
-        'amount'        => array( 'amount', false ),
-        'invoice_date'  => array( 'date', false ),
-        'payment_date'  => array( 'payment_date', true ),
-        'customer'      => array( 'customer', false ),
-        'status'        => array( 'status', false ),
+        'ID'            => array('ID', true),
+        'number'        => array('number', false),
+        'amount'        => array('amount', false),
+        'invoice_date'  => array('date', false),
+        'payment_date'  => array('payment_date', true),
+        'customer'      => array('customer', false),
+        'status'        => array('status', false),
     );
     
-    return apply_filters( 'wpi_invoice_table_sortable_columns', $columns );
+    return apply_filters('wpi_invoice_table_sortable_columns', $columns);
 }
-add_filter( 'manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns' );
+add_filter('manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns');
 
-add_action( 'manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
-function wpinv_posts_custom_column( $column_name, $post_id = 0 ) {
+add_action('manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
+function wpinv_posts_custom_column($column_name, $post_id = 0) {
     global $post, $wpi_invoice;
     
-    if ( empty( $wpi_invoice ) || ( !empty( $wpi_invoice ) && $post->ID != $wpi_invoice->ID ) ) {
-        $wpi_invoice = new WPInv_Invoice( $post->ID );
+    if (empty($wpi_invoice) || (!empty($wpi_invoice) && $post->ID != $wpi_invoice->ID)) {
+        $wpi_invoice = new WPInv_Invoice($post->ID);
     }
 
     $value = NULL;
     
-    switch ( $column_name ) {
+    switch ($column_name) {
         case 'email' :
-            $value   = $wpi_invoice->get_email();
+            $value = $wpi_invoice->get_email();
             break;
         case 'customer' :
             $customer_name = $wpi_invoice->get_user_full_name();
-            $customer_name = $customer_name != '' ? $customer_name : __( 'Customer', 'invoicing' );
-            $value = '<a href="' . esc_url( get_edit_user_link( $wpi_invoice->get_user_id() ) ) . '">' . $customer_name . '</a>';
-            if ( $email = $wpi_invoice->get_email() ) {
+            $customer_name = $customer_name != '' ? $customer_name : __('Customer', 'invoicing');
+            $value = '<a href="' . esc_url(get_edit_user_link($wpi_invoice->get_user_id())) . '">' . $customer_name . '</a>';
+            if ($email = $wpi_invoice->get_email()) {
                 $value .= '<br><a class="email" href="mailto:' . $email . '">' . $email . '</a>';
             }
             break;
         case 'amount' :
-            echo $wpi_invoice->get_total( true );
+            echo $wpi_invoice->get_total(true);
             break;
         case 'invoice_date' :
-            $date_format = get_option( 'date_format' );
+            $date_format = get_option('date_format');
             
             $m_time = $post->post_date;
-            $h_time = mysql2date( $date_format, $m_time );
+            $h_time = mysql2date($date_format, $m_time);
             
-            $value   = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
+            $value = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
             break;
         case 'payment_date' :
-            if ( $date_completed = $wpi_invoice->get_meta( '_wpinv_completed_date', true ) ) {
-                $date_format = get_option( 'date_format' );
+            if ($date_completed = $wpi_invoice->get_meta('_wpinv_completed_date', true)) {
+                $date_format = get_option('date_format');
                 
                 $m_time = $date_completed;
-                $h_time = mysql2date( $date_format, $m_time );
+                $h_time = mysql2date($date_format, $m_time);
                 
-                $value   = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
+                $value = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
             } else {
                 $value = '-';
             }
             break;
         case 'status' :
-            $value   = $wpi_invoice->get_status( true ) . ( $wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '' );
-            $is_viewed = wpinv_is_invoice_viewed( $wpi_invoice->ID );
-	        $gateway_title = wpinv_get_gateway_admin_label( $wpi_invoice->get_gateway() );
+            $value = $wpi_invoice->get_status(true) . ($wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '');
+            $is_viewed = wpinv_is_invoice_viewed($wpi_invoice->ID);
+	        $gateway_title = wpinv_get_gateway_admin_label($wpi_invoice->get_gateway());
 	        $offline_gateways = apply_filters('wpinv_offline_payments', array('bank_transfer', 'cheque', 'cod'));
 	        $is_offline_payment = in_array($wpi_invoice->get_gateway(), $offline_gateways) ? true : false;
 
-            if ( 1 == $is_viewed ) {
-                $value .= '&nbsp;&nbsp;<i class="fa fa-eye" title="'.__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+            if (1 == $is_viewed) {
+                $value .= '&nbsp;&nbsp;<i class="fa fa-eye" title="' . __('Viewed by Customer', 'invoicing') . '"></i>';
             }
-            if ( ( $wpi_invoice->is_paid() || $wpi_invoice->is_refunded() || $is_offline_payment ) && ( isset( $gateway_title ) ) ) {
-                $value .= '<br><small class="meta gateway">' . wp_sprintf( __( 'Via %s', 'invoicing' ), $gateway_title ) . '</small>';
+            if (($wpi_invoice->is_paid() || $wpi_invoice->is_refunded() || $is_offline_payment) && (isset($gateway_title))) {
+                $value .= '<br><small class="meta gateway">' . wp_sprintf(__('Via %s', 'invoicing'), $gateway_title) . '</small>';
             }
             break;
         case 'number' :
-            $edit_link = get_edit_post_link( $post->ID );
-            $value = '<a title="' . esc_attr__( 'View Invoice Details', 'invoicing' ) . '" href="' . esc_url( $edit_link ) . '">' . $wpi_invoice->get_number() . '</a>';
+            $edit_link = get_edit_post_link($post->ID);
+            $value = '<a title="' . esc_attr__('View Invoice Details', 'invoicing') . '" href="' . esc_url($edit_link) . '">' . $wpi_invoice->get_number() . '</a>';
             break;
         case 'wpi_actions' :
             $value = '';
-            if ( !empty( $post->post_name ) ) {
-                $value .= '<a title="' . esc_attr__( 'Print invoice', 'invoicing' ) . '" href="' . esc_url( get_permalink( $post->ID ) ) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
+            if (!empty($post->post_name)) {
+                $value .= '<a title="' . esc_attr__('Print invoice', 'invoicing') . '" href="' . esc_url(get_permalink($post->ID)) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
             }
             
-            if ( $email = $wpi_invoice->get_email() ) {
-                $value .= '<a title="' . esc_attr__( 'Send invoice to customer', 'invoicing' ) . '" href="' . esc_url( add_query_arg( array( 'wpi_action' => 'send_invoice', 'invoice_id' => $post->ID ) ) ) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
+            if ($email = $wpi_invoice->get_email()) {
+                $value .= '<a title="' . esc_attr__('Send invoice to customer', 'invoicing') . '" href="' . esc_url(add_query_arg(array('wpi_action' => 'send_invoice', 'invoice_id' => $post->ID))) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
             }
             
             break;
         default:
-            $value = isset( $post->$column_name ) ? $post->$column_name : '';
+            $value = isset($post->$column_name) ? $post->$column_name : '';
             break;
 
     }
-    $value = apply_filters( 'wpinv_payments_table_column', $value, $post->ID, $column_name );
+    $value = apply_filters('wpinv_payments_table_column', $value, $post->ID, $column_name);
     
-    if ( $value !== NULL ) {
+    if ($value !== NULL) {
         echo $value;
     }
 }
 
-function wpinv_admin_post_id( $id = 0 ) {
+function wpinv_admin_post_id($id = 0) {
     global $post;
 
-    if ( isset( $id ) && ! empty( $id ) ) {
-        return (int)$id;
-    } else if ( get_the_ID() ) {
+    if (isset($id) && !empty($id)) {
+        return (int) $id;
+    } else if (get_the_ID()) {
         return (int) get_the_ID();
-    } else if ( isset( $post->ID ) && !empty( $post->ID ) ) {
+    } else if (isset($post->ID) && !empty($post->ID)) {
         return (int) $post->ID;
-    } else if ( isset( $_GET['post'] ) && !empty( $_GET['post'] ) ) {
+    } else if (isset($_GET['post']) && !empty($_GET['post'])) {
         return (int) $_GET['post'];
-    } else if ( isset( $_GET['id'] ) && !empty( $_GET['id'] ) ) {
+    } else if (isset($_GET['id']) && !empty($_GET['id'])) {
         return (int) $_GET['id'];
-    } else if ( isset( $_POST['id'] ) && !empty( $_POST['id'] ) ) {
+    } else if (isset($_POST['id']) && !empty($_POST['id'])) {
         return (int) $_POST['id'];
     } 
 
     return null;
 }
     
-function wpinv_admin_post_type( $id = 0 ) {
-    if ( !$id ) {
+function wpinv_admin_post_type($id = 0) {
+    if (!$id) {
         $id = wpinv_admin_post_id();
     }
     
-    $type = get_post_type( $id );
+    $type = get_post_type($id);
     
-    if ( !$type ) {
-        $type = isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) ? $_GET['post_type'] : null;
+    if (!$type) {
+        $type = isset($_GET['post_type']) && !empty($_GET['post_type']) ? $_GET['post_type'] : null;
     }
     
-    return apply_filters( 'wpinv_admin_post_type', $type, $id );
+    return apply_filters('wpinv_admin_post_type', $type, $id);
 }
 
 function wpinv_admin_messages() {
 	global $wpinv_options, $pagenow, $post;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-added', __('Discount code added.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_add_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-add-fail', __('There was a problem adding your discount code, please try again.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_exists' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-exists', __('A discount with that code already exists, please use a different code.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-updated', __('Discount code updated.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_update_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-updated-fail', __('There was a problem updating your discount code, please try again.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice_deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-deleted', __('The invoice has been deleted.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'email_disabled' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-sent-fail', __('Email notification is disabled. Please check settings.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'email_sent' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-sent', __('The email has been sent to customer.', 'invoicing'), 'updated');
     }
     
-    if ( isset( $_GET['wpinv-message'] ) && 'email_fail' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+    if (isset($_GET['wpinv-message']) && 'email_fail' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-sent-fail', __('Fail to send email to the customer.', 'invoicing'), 'error');
     }
 
-    if ( isset( $_GET['wpinv-message'] ) && 'invoice-note-deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-        add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
+    if (isset($_GET['wpinv-message']) && 'invoice-note-deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+        add_settings_error('wpinv-notices', 'wpinv-note-deleted', __('The invoice note has been deleted.', 'invoicing'), 'updated');
     }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'settings-imported' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-settings-imported', __('The settings have been imported.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'note-added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-note-added', __('The invoice note has been added successfully.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice-updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-updated', __('The invoice has been successfully updated.', 'invoicing'), 'updated');
 	}
     
-	if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
-		$message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
+	if ($pagenow == 'post.php' && !empty($post->post_type) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable($post)) {
+		$message = apply_filters('wpinv_item_non_editable_message', __('This item in not editable.', 'invoicing'), $post->ID);
 
-		if ( !empty( $message ) ) {
-			add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
+		if (!empty($message)) {
+			add_settings_error('wpinv-notices', 'wpinv-edit-n', $message, 'updated');
 		}
 	}
 
-	settings_errors( 'wpinv-notices' );
+	settings_errors('wpinv-notices');
 }
-add_action( 'admin_notices', 'wpinv_admin_messages' );
+add_action('admin_notices', 'wpinv_admin_messages');
 
-add_action( 'admin_init', 'wpinv_show_test_payment_gateway_notice' );
-function wpinv_show_test_payment_gateway_notice(){
-    add_action( 'admin_notices', 'wpinv_test_payment_gateway_messages' );
+add_action('admin_init', 'wpinv_show_test_payment_gateway_notice');
+function wpinv_show_test_payment_gateway_notice() {
+    add_action('admin_notices', 'wpinv_test_payment_gateway_messages');
 }
 
-function wpinv_test_payment_gateway_messages(){
+function wpinv_test_payment_gateway_messages() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $name = array(); $test_gateways = '';
     if ($gateways) {
@@ -256,9 +256,9 @@ 
         }
         $test_gateways = implode(', ', $name);
     }
-    if(isset($test_gateways) && !empty($test_gateways)){
+    if (isset($test_gateways) && !empty($test_gateways)) {
         $link = admin_url('admin.php?page=wpinv-settings&tab=gateways');
-        $notice = wp_sprintf( __('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link );
+        $notice = wp_sprintf(__('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link);
         ?>
         <div class="notice notice-warning is-dismissible">
             <p><?php echo $notice; ?></p>
@@ -267,29 +267,29 @@ 
     }
 }
 
-function wpinv_items_columns( $existing_columns ) {
+function wpinv_items_columns($existing_columns) {
     global $wpinv_euvat;
     
     $columns                = array();
     $columns['cb']          = $existing_columns['cb'];
-    $columns['title']       = __( 'Title', 'invoicing' );
-    $columns['price']       = __( 'Price', 'invoicing' );
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        $columns['vat_rule']    = __( 'VAT rule type', 'invoicing' );
+    $columns['title']       = __('Title', 'invoicing');
+    $columns['price']       = __('Price', 'invoicing');
+    if ($wpinv_euvat->allow_vat_rules()) {
+        $columns['vat_rule']    = __('VAT rule type', 'invoicing');
     }
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        $columns['vat_class']   = __( 'VAT class', 'invoicing' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        $columns['vat_class']   = __('VAT class', 'invoicing');
     }
-    $columns['type']        = __( 'Type', 'invoicing' );
-    $columns['recurring']   = __( 'Recurring', 'invoicing' );
-    $columns['date']        = __( 'Date', 'invoicing' );
-    $columns['id']          = __( 'ID', 'invoicing' );
+    $columns['type']        = __('Type', 'invoicing');
+    $columns['recurring']   = __('Recurring', 'invoicing');
+    $columns['date']        = __('Date', 'invoicing');
+    $columns['id']          = __('ID', 'invoicing');
 
-    return apply_filters( 'wpinv_items_columns', $columns );
+    return apply_filters('wpinv_items_columns', $columns);
 }
-add_filter( 'manage_wpi_item_posts_columns', 'wpinv_items_columns' );
+add_filter('manage_wpi_item_posts_columns', 'wpinv_items_columns');
 
-function wpinv_items_sortable_columns( $columns ) {
+function wpinv_items_sortable_columns($columns) {
     $columns['price']       = 'price';
     $columns['vat_rule']    = 'vat_rule';
     $columns['vat_class']   = 'vat_class';
@@ -299,151 +299,151 @@ 
 
     return $columns;
 }
-add_filter( 'manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns' );
+add_filter('manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns');
 
-function wpinv_items_table_custom_column( $column ) {
+function wpinv_items_table_custom_column($column) {
     global $wpinv_euvat, $post, $wpi_item;
     
-    if ( empty( $wpi_item ) || ( !empty( $wpi_item ) && $post->ID != $wpi_item->ID ) ) {
-        $wpi_item = new WPInv_Item( $post->ID );
+    if (empty($wpi_item) || (!empty($wpi_item) && $post->ID != $wpi_item->ID)) {
+        $wpi_item = new WPInv_Item($post->ID);
     }
 
-    switch ( $column ) {
+    switch ($column) {
         case 'price' :
-            echo wpinv_item_price( $post->ID );
+            echo wpinv_item_price($post->ID);
         break;
         case 'vat_rule' :
-            echo $wpinv_euvat->item_rule_label( $post->ID );
+            echo $wpinv_euvat->item_rule_label($post->ID);
         break;
         case 'vat_class' :
-            echo $wpinv_euvat->item_class_label( $post->ID );
+            echo $wpinv_euvat->item_class_label($post->ID);
         break;
         case 'type' :
-            echo wpinv_item_type( $post->ID ) . '<span class="meta">' . $wpi_item->get_custom_singular_name() . '</span>';
+            echo wpinv_item_type($post->ID) . '<span class="meta">' . $wpi_item->get_custom_singular_name() . '</span>';
         break;
         case 'recurring' :
-            echo ( wpinv_is_recurring_item( $post->ID ) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>' );
+            echo (wpinv_is_recurring_item($post->ID) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>');
         break;
         case 'id' :
            echo $post->ID;
            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
-                    <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
-                    if ( $wpinv_euvat->allow_vat_rules() ) {
-                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';
+                    <div class="price">' . wpinv_get_item_price($post->ID) . '</div>';
+                    if ($wpinv_euvat->allow_vat_rules()) {
+                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule($post->ID) . '</div>';
                     }
-                    if ( $wpinv_euvat->allow_vat_classes() ) {
-                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class( $post->ID ) . '</div>';
+                    if ($wpinv_euvat->allow_vat_classes()) {
+                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class($post->ID) . '</div>';
                     }
-                    echo '<div class="type">' . wpinv_get_item_type( $post->ID ) . '</div>
+                    echo '<div class="type">' . wpinv_get_item_type($post->ID) . '</div>
                 </div>';
         break;
     }
     
-    do_action( 'wpinv_items_table_column_item_' . $column, $wpi_item, $post );
+    do_action('wpinv_items_table_column_item_' . $column, $wpi_item, $post);
 }
-add_action( 'manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column' );
+add_action('manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column');
 
 function wpinv_add_items_filters() {
     global $wpinv_euvat, $typenow;
 
     // Checks if the current post type is 'item'
-    if ( $typenow == 'wpi_item') {
-        if ( $wpinv_euvat->allow_vat_rules() ) {
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT rules', 'invoicing' ) ), $wpinv_euvat->get_rules() ),
+    if ($typenow == 'wpi_item') {
+        if ($wpinv_euvat->allow_vat_rules()) {
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT rules', 'invoicing')), $wpinv_euvat->get_rules()),
                     'name'             => 'vat_rule',
                     'id'               => 'vat_rule',
-                    'selected'         => ( isset( $_GET['vat_rule'] ) ? $_GET['vat_rule'] : '' ),
+                    'selected'         => (isset($_GET['vat_rule']) ? $_GET['vat_rule'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpi_select2',
-                ) );
+                ));
         }
         
-        if ( $wpinv_euvat->allow_vat_classes() ) {
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT classes', 'invoicing' ) ), $wpinv_euvat->get_all_classes() ),
+        if ($wpinv_euvat->allow_vat_classes()) {
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT classes', 'invoicing')), $wpinv_euvat->get_all_classes()),
                     'name'             => 'vat_class',
                     'id'               => 'vat_class',
-                    'selected'         => ( isset( $_GET['vat_class'] ) ? $_GET['vat_class'] : '' ),
+                    'selected'         => (isset($_GET['vat_class']) ? $_GET['vat_class'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpi_select2',
-                ) );
+                ));
         }
             
-        echo wpinv_html_select( array(
-                'options'          => array_merge( array( '' => __( 'All item types', 'invoicing' ) ), wpinv_get_item_types() ),
+        echo wpinv_html_select(array(
+                'options'          => array_merge(array('' => __('All item types', 'invoicing')), wpinv_get_item_types()),
                 'name'             => 'type',
                 'id'               => 'type',
-                'selected'         => ( isset( $_GET['type'] ) ? $_GET['type'] : '' ),
+                'selected'         => (isset($_GET['type']) ? $_GET['type'] : ''),
                 'show_option_all'  => false,
                 'show_option_none' => false,
                 'class'            => 'gdmbx2-text-medium',
-            ) );
+            ));
 
-        if ( isset( $_REQUEST['all_posts'] ) && '1' === $_REQUEST['all_posts'] ) {
+        if (isset($_REQUEST['all_posts']) && '1' === $_REQUEST['all_posts']) {
             echo '<input type="hidden" name="all_posts" value="1" />';
         }
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_add_items_filters', 100 );
+add_action('restrict_manage_posts', 'wpinv_add_items_filters', 100);
 
-function wpinv_send_invoice_after_save( $invoice ) {
-    if ( empty( $_POST['wpi_save_send'] ) ) {
+function wpinv_send_invoice_after_save($invoice) {
+    if (empty($_POST['wpi_save_send'])) {
         return;
     }
     
-    if ( !empty( $invoice->ID ) && !empty( $invoice->post_type ) && 'wpi_invoice' == $invoice->post_type ) {
-        wpinv_user_invoice_notification( $invoice->ID );
+    if (!empty($invoice->ID) && !empty($invoice->post_type) && 'wpi_invoice' == $invoice->post_type) {
+        wpinv_user_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1 );
+add_action('wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1);
 
-function wpinv_send_register_new_user( $data, $postarr ) {
-    if ( wpinv_current_user_can_manage_invoicing() && !empty( $data['post_type'] ) && ( 'wpi_invoice' == $data['post_type'] || 'wpi_quote' == $data['post_type'] ) ) {
-        $is_new_user = !empty( $postarr['wpinv_new_user'] ) ? true : false;
-        $email = !empty( $postarr['wpinv_email'] ) && $postarr['wpinv_email'] && is_email( $postarr['wpinv_email'] ) ? $postarr['wpinv_email'] : NULL;
+function wpinv_send_register_new_user($data, $postarr) {
+    if (wpinv_current_user_can_manage_invoicing() && !empty($data['post_type']) && ('wpi_invoice' == $data['post_type'] || 'wpi_quote' == $data['post_type'])) {
+        $is_new_user = !empty($postarr['wpinv_new_user']) ? true : false;
+        $email = !empty($postarr['wpinv_email']) && $postarr['wpinv_email'] && is_email($postarr['wpinv_email']) ? $postarr['wpinv_email'] : NULL;
         
-        if ( $is_new_user && $email && !email_exists( $email ) ) {
-            $first_name = !empty( $postarr['wpinv_first_name'] ) ? sanitize_text_field( $postarr['wpinv_first_name'] ) : '';
-            $last_name = !empty( $postarr['wpinv_last_name'] ) ? sanitize_text_field( $postarr['wpinv_last_name'] ) : '';
-            $display_name = $first_name || $last_name ? trim( $first_name . ' ' . $last_name ) : '';
-            $user_nicename = $display_name ? trim( $display_name ) : $email;
-            $user_company = !empty( $postarr['wpinv_company'] ) ? sanitize_text_field( $postarr['wpinv_company'] ) : '';
+        if ($is_new_user && $email && !email_exists($email)) {
+            $first_name = !empty($postarr['wpinv_first_name']) ? sanitize_text_field($postarr['wpinv_first_name']) : '';
+            $last_name = !empty($postarr['wpinv_last_name']) ? sanitize_text_field($postarr['wpinv_last_name']) : '';
+            $display_name = $first_name || $last_name ? trim($first_name . ' ' . $last_name) : '';
+            $user_nicename = $display_name ? trim($display_name) : $email;
+            $user_company = !empty($postarr['wpinv_company']) ? sanitize_text_field($postarr['wpinv_company']) : '';
             
-            $user_login = sanitize_user( str_replace( ' ', '', $display_name ), true );
-            if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+            $user_login = sanitize_user(str_replace(' ', '', $display_name), true);
+            if (!(validate_username($user_login) && !username_exists($user_login))) {
                 $new_user_login = strstr($email, '@', true);
-                if ( validate_username( $user_login ) && username_exists( $user_login ) ) {
-                    $user_login = sanitize_user($new_user_login, true );
+                if (validate_username($user_login) && username_exists($user_login)) {
+                    $user_login = sanitize_user($new_user_login, true);
                 }
-                if ( validate_username( $user_login ) && username_exists( $user_login ) ) {
-                    $user_append_text = rand(10,1000);
-                    $user_login = sanitize_user($new_user_login.$user_append_text, true );
+                if (validate_username($user_login) && username_exists($user_login)) {
+                    $user_append_text = rand(10, 1000);
+                    $user_login = sanitize_user($new_user_login . $user_append_text, true);
                 }
                 
-                if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+                if (!(validate_username($user_login) && !username_exists($user_login))) {
                     $user_login = $email;
                 }
             }
             
             $userdata = array(
                 'user_login' => $user_login,
-                'user_pass' => wp_generate_password( 12, false ),
-                'user_email' => sanitize_text_field( $email ),
+                'user_pass' => wp_generate_password(12, false),
+                'user_email' => sanitize_text_field($email),
                 'first_name' => $first_name,
                 'last_name' => $last_name,
-                'user_nicename' => wpinv_utf8_substr( $user_nicename, 0, 50 ),
+                'user_nicename' => wpinv_utf8_substr($user_nicename, 0, 50),
                 'nickname' => $display_name,
                 'display_name' => $display_name,
             );
 
-            $userdata = apply_filters( 'wpinv_register_new_user_data', $userdata );
+            $userdata = apply_filters('wpinv_register_new_user_data', $userdata);
             
-            $new_user_id = wp_insert_user( $userdata );
+            $new_user_id = wp_insert_user($userdata);
             
-            if ( !is_wp_error( $new_user_id ) ) {
+            if (!is_wp_error($new_user_id)) {
                 $data['post_author'] = $new_user_id;
                 $_POST['post_author'] = $new_user_id;
                 $_POST['post_author_override'] = $new_user_id;
@@ -464,72 +464,72 @@ 
                 
                 $meta = array();
                 ///$meta['_wpinv_user_id'] = $new_user_id;
-                foreach ( $meta_fields as $field ) {
-                    $meta['_wpinv_' . $field] = isset( $postarr['wpinv_' . $field] ) ? sanitize_text_field( $postarr['wpinv_' . $field] ) : '';
+                foreach ($meta_fields as $field) {
+                    $meta['_wpinv_' . $field] = isset($postarr['wpinv_' . $field]) ? sanitize_text_field($postarr['wpinv_' . $field]) : '';
                 }
                 
-                $meta = apply_filters( 'wpinv_register_new_user_meta', $meta, $new_user_id );
+                $meta = apply_filters('wpinv_register_new_user_meta', $meta, $new_user_id);
 
                 // Update user meta.
-                foreach ( $meta as $key => $value ) {
-                    update_user_meta( $new_user_id, $key, $value );
+                foreach ($meta as $key => $value) {
+                    update_user_meta($new_user_id, $key, $value);
                 }
                 
-                if ( function_exists( 'wp_send_new_user_notifications' ) ) {
+                if (function_exists('wp_send_new_user_notifications')) {
                     // Send email notifications related to the creation of new user.
-                    wp_send_new_user_notifications( $new_user_id, 'user' );
+                    wp_send_new_user_notifications($new_user_id, 'user');
                 }
             } else {
-                wpinv_error_log( $new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__ );
+                wpinv_error_log($new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__);
             }
         }
     }
     
     return $data;
 }
-add_filter( 'wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2 );
+add_filter('wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2);
 
-function wpinv_show_recurring_supported_gateways( $item_ID ) {
+function wpinv_show_recurring_supported_gateways($item_ID) {
     $all_gateways = wpinv_get_payment_gateways();
 
-    if ( !empty( $all_gateways ) ) {
+    if (!empty($all_gateways)) {
         $gateways = array();
 
-        foreach ( $all_gateways as $key => $gateway ) {
-            if ( wpinv_gateway_support_subscription( $key ) ) {
+        foreach ($all_gateways as $key => $gateway) {
+            if (wpinv_gateway_support_subscription($key)) {
                 $gateways[] = $gateway['admin_label'];
             }
         }
 
-        if ( !empty( $gateways ) ) {
+        if (!empty($gateways)) {
             ?>
-            <span class="description"><?php echo wp_sprintf( __( 'Recurring payments only supported by: %s', 'invoicing' ), implode( ', ', $gateways ) ); ?></span>
+            <span class="description"><?php echo wp_sprintf(__('Recurring payments only supported by: %s', 'invoicing'), implode(', ', $gateways)); ?></span>
             <?php
         }
     }
 }
-add_action( 'wpinv_item_price_field', 'wpinv_show_recurring_supported_gateways', -10, 1 );
+add_action('wpinv_item_price_field', 'wpinv_show_recurring_supported_gateways', -10, 1);
 
-function wpinv_post_updated_messages( $messages ) {
+function wpinv_post_updated_messages($messages) {
     global $post, $post_ID;
 
     $messages['wpi_discount'] = array(
         0   => '',
-        1   => __( 'Discount updated.', 'invoicing' ),
-        2   => __( 'Custom field updated.', 'invoicing' ),
-        3   => __( 'Custom field deleted.', 'invoicing' ),
-        4   => __( 'Discount updated.', 'invoicing' ),
-        5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-        6   => __( 'Discount updated.', 'invoicing' ),
-        7   => __( 'Discount saved.', 'invoicing' ),
-        8   => __( 'Discount submitted.', 'invoicing' ),
-        9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-        10  => __( 'Discount draft updated.', 'invoicing' ),
+        1   => __('Discount updated.', 'invoicing'),
+        2   => __('Custom field updated.', 'invoicing'),
+        3   => __('Custom field deleted.', 'invoicing'),
+        4   => __('Discount updated.', 'invoicing'),
+        5   => isset($_GET['revision']) ? wp_sprintf(__('Discount restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+        6   => __('Discount updated.', 'invoicing'),
+        7   => __('Discount saved.', 'invoicing'),
+        8   => __('Discount submitted.', 'invoicing'),
+        9   => wp_sprintf(__('Discount scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+        10  => __('Discount draft updated.', 'invoicing'),
     );
 
     return $messages;
 }
-add_filter( 'post_updated_messages', 'wpinv_post_updated_messages', 10, 1 );
+add_filter('post_updated_messages', 'wpinv_post_updated_messages', 10, 1);
 
 add_action('admin_init', 'admin_init_example_type');
 
@@ -539,7 +539,7 @@ 
 function admin_init_example_type() {
     global $typenow;
 
-    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote' ) {
+    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote') {
         add_filter('posts_search', 'posts_search_example_type', 10, 2);
     }
 }
@@ -554,9 +554,9 @@ 
     global $wpdb;
 
     if ($query->is_main_query() && !empty($query->query['s'])) {
-        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql( $query->query['s'] ) . "%' )";
-        if ( ! empty( $search ) ) {
-            $search = preg_replace( '/^ AND /', '', $search );
+        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql($query->query['s']) . "%' )";
+        if (!empty($search)) {
+            $search = preg_replace('/^ AND /', '', $search);
             $search = " AND ( {$search} OR ( {$conditions_str} ) )";
         } else {
             $search = " AND ( {$conditions_str} )";
@@ -566,9 +566,9 @@ 
     return $search;
 }
 
-add_action( 'admin_init', 'wpinv_reset_invoice_count' );
-function wpinv_reset_invoice_count(){
-    if(isset($_GET['reset_invoice_count']) && 1 == $_GET['reset_invoice_count'] && isset($_GET['_nonce']) && wp_verify_nonce($_GET['_nonce'], 'reset_invoice_count')) {
+add_action('admin_init', 'wpinv_reset_invoice_count');
+function wpinv_reset_invoice_count() {
+    if (isset($_GET['reset_invoice_count']) && 1 == $_GET['reset_invoice_count'] && isset($_GET['_nonce']) && wp_verify_nonce($_GET['_nonce'], 'reset_invoice_count')) {
         wpinv_update_option('invoice_sequence_start', 1);
         delete_option('wpinv_last_invoice_number');
         $url = add_query_arg(array('reset_invoice_done' => 1));
@@ -579,8 +579,8 @@ 
 }
 
 add_action('admin_notices', 'wpinv_invoice_count_reset_message');
-function wpinv_invoice_count_reset_message(){
-    if(isset($_GET['reset_invoice_done']) && 1 == $_GET['reset_invoice_done']) {
+function wpinv_invoice_count_reset_message() {
+    if (isset($_GET['reset_invoice_done']) && 1 == $_GET['reset_invoice_done']) {
         $notice = __('Invoice number sequence reset successfully.', 'invoicing');
         ?>
         <div class="notice notice-success is-dismissible">

includes/api/class-wpinv-rest-items-controller.php

Indentation +987 added lines, -987 removed lines

@@ -20,91 +20,91 @@ 
 class WPInv_REST_Items_Controller extends WP_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
-	protected $post_type = 'wpi_item';
+     * Post type.
+     *
+     * @var string
+     */
+    protected $post_type = 'wpi_item';
 	
-	/**
-	 * Cached results of get_item_schema.
-	 *
-	 * @since 1.0.13
-	 * @var array
-	 */
-	protected $schema;
+    /**
+     * Cached results of get_item_schema.
+     *
+     * @since 1.0.13
+     * @var array
+     */
+    protected $schema;
 
     /**
-	 * Constructor.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $namespace Api Namespace
-	 */
-	public function __construct( $namespace ) {
+     * Constructor.
+     *
+     * @since 1.0.13
+     *
+     * @param string $namespace Api Namespace
+     */
+    public function __construct( $namespace ) {
         
         // Set api namespace...
-		$this->namespace = $namespace;
+        $this->namespace = $namespace;
 
         // ... and the rest base
         $this->rest_base = 'items';
 		
     }
 	
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_routes() {
-
-		parent::register_routes();
-
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base . '/item-types',
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_item_types' ),
-				),
-			)
-		);
-
-	}
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 1.0.13
+     *
+     * @see register_rest_route()
+     */
+    public function register_routes() {
+
+        parent::register_routes();
+
+        register_rest_route(
+            $this->namespace,
+            '/' . $this->rest_base . '/item-types',
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_item_types' ),
+                ),
+            )
+        );
+
+    }
 
     /**
-	 * Checks if a given request has access to read items.
+     * Checks if a given request has access to read items.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
-	 */
-	public function get_items_permissions_check( $request ) {
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+     */
+    public function get_items_permissions_check( $request ) {
 	
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
-			return true;
-		}
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+            return true;
+        }
 
-		return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to view invoice items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to view invoice items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
 
     }
     
     /**
-	 * Retrieves a collection of invoice items.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_items( $request ) {
+     * Retrieves a collection of invoice items.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_items( $request ) {
 		
-		// Retrieve the list of registered item query parameters.
+        // Retrieve the list of registered item query parameters.
         $registered = $this->get_collection_params();
         
         $args       = array();
@@ -117,54 +117,54 @@ 
 
         }
 
-		/**
-		 * Filters the wpinv_get_items arguments for items rest requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $args    Key value array of query var to query value.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        /**
+         * Filters the wpinv_get_items arguments for items rest requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $args    Key value array of query var to query value.
+         * @param WP_REST_Request $request The request used.
+         */
         $args       = apply_filters( "wpinv_rest_get_items_arguments", $args, $request, $this );
 		
-		// Special args
-		$args[ 'return' ]   = 'objects';
-		$args[ 'paginate' ] = true;
+        // Special args
+        $args[ 'return' ]   = 'objects';
+        $args[ 'paginate' ] = true;
 
         // Run the query.
-		$query = wpinv_get_all_items( $args );
+        $query = wpinv_get_all_items( $args );
 		
-		// Prepare the retrieved items
-		$items = array();
-		foreach( $query->items as $item ) {
-
-			if ( ! $this->check_read_permission( $item ) ) {
-				continue;
-			}
-
-			$data       = $this->prepare_item_for_response( $item, $request );
-			$items[]    = $this->prepare_response_for_collection( $data );
-
-		}
-
-		// Prepare the response.
-		$response = rest_ensure_response( $items );
-		$response->header( 'X-WP-Total', (int) $query->total );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
-
-		/**
-		 * Filters the responses for item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param arrWP_REST_Response $response    Response object.
-		 * @param WP_REST_Request     $request The request used.
+        // Prepare the retrieved items
+        $items = array();
+        foreach( $query->items as $item ) {
+
+            if ( ! $this->check_read_permission( $item ) ) {
+                continue;
+            }
+
+            $data       = $this->prepare_item_for_response( $item, $request );
+            $items[]    = $this->prepare_response_for_collection( $data );
+
+        }
+
+        // Prepare the response.
+        $response = rest_ensure_response( $items );
+        $response->header( 'X-WP-Total', (int) $query->total );
+        $response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+
+        /**
+         * Filters the responses for item requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param arrWP_REST_Response $response    Response object.
+         * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the items
-		 */
+         */
         $response       = apply_filters( "wpinv_rest_items_response", $response, $request, $args );
 
         return rest_ensure_response( $response );
@@ -172,25 +172,25 @@ 
     }
 
     /**
-	 * Get the post, if the ID is valid.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param int $item_id Supplied ID.
-	 * @return WPInv_Item|WP_Error Item object if ID is valid, WP_Error otherwise.
-	 */
-	protected function get_post( $item_id ) {
+     * Get the post, if the ID is valid.
+     *
+     * @since 1.0.13
+     *
+     * @param int $item_id Supplied ID.
+     * @return WPInv_Item|WP_Error Item object if ID is valid, WP_Error otherwise.
+     */
+    protected function get_post( $item_id ) {
 		
-		$error     = new WP_Error( 'rest_item_invalid_id', __( 'Invalid item ID.', 'invoicing' ), array( 'status' => 404 ) );
+        $error     = new WP_Error( 'rest_item_invalid_id', __( 'Invalid item ID.', 'invoicing' ), array( 'status' => 404 ) );
 
         // Ids start from 1
         if ( (int) $item_id <= 0 ) {
-			return $error;
-		}
+            return $error;
+        }
 
-		$item = wpinv_get_item_by( 'id', (int) $item_id );
-		if ( empty( $item ) ) {
-			return $error;
+        $item = wpinv_get_item_by( 'id', (int) $item_id );
+        if ( empty( $item ) ) {
+            return $error;
         }
 
         return $item;
@@ -198,27 +198,27 @@ 
     }
 
     /**
-	 * Checks if a given request has access to read an invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the invoice item, WP_Error object otherwise.
-	 */
-	public function get_item_permissions_check( $request ) {
+     * Checks if a given request has access to read an invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return bool|WP_Error True if the request has read access for the invoice item, WP_Error object otherwise.
+     */
+    public function get_item_permissions_check( $request ) {
 
         // Retrieve the item object.
         $item = $this->get_post( $request['id'] );
         
         // Ensure it is valid.
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
 
-		$post_type = get_post_type_object( $this->post_type );
+        $post_type = get_post_type_object( $this->post_type );
 
-		if ( ! current_user_can(  $post_type->cap->read_post, $item->ID  ) ) {
-			return new WP_Error( 
+        if ( ! current_user_can(  $post_type->cap->read_post, $item->ID  ) ) {
+            return new WP_Error( 
                 'rest_cannot_edit', 
                 __( 'Sorry, you are not allowed to view this item.', 'invoicing' ), 
                 array( 
@@ -227,61 +227,61 @@ 
             );
         }
 
-		return $this->check_read_permission( $item );
+        return $this->check_read_permission( $item );
     }
     
     /**
-	 * Checks if an item can be read.
-	 * 
-	 * An item can be read by site admins.
-	 *
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Item $item WPInv_Item object.
-	 * @return bool Whether the post can be read.
-	 */
-	public function check_read_permission( $item ) {
-
-		// An item can be read by an admin...
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
-			return true;
-		}
-
-		return false;
+     * Checks if an item can be read.
+     * 
+     * An item can be read by site admins.
+     *
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Item $item WPInv_Item object.
+     * @return bool Whether the post can be read.
+     */
+    public function check_read_permission( $item ) {
+
+        // An item can be read by an admin...
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+            return true;
+        }
+
+        return false;
     }
     
     /**
-	 * Retrieves a single invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item( $request ) {
+     * Retrieves a single invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_item( $request ) {
 
         // Fetch the item.
         $item = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
-
-		/**
-		 * Filters the responses for single invoice item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 * @var WP_HTTP_Response
-		 *
-		 * @param WP_HTTP_Response $response Response.
-		 * @param WP_REST_Request  $request The request used.
-		 */
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $item, $request );
+
+        /**
+         * Filters the responses for single invoice item requests.
+         *
+         *
+         * @since 1.0.13
+         * @var WP_HTTP_Response
+         *
+         * @param WP_HTTP_Response $response Response.
+         * @param WP_REST_Request  $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_get_item_response", $response, $request );
 
         return rest_ensure_response( $response );
@@ -289,26 +289,26 @@ 
     }
     
     /**
-	 * Checks if a given request has access to create an invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
-	 */
-	public function create_item_permissions_check( $request ) {
+     * Checks if a given request has access to create an invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
+     */
+    public function create_item_permissions_check( $request ) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_item_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_item_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
-			return true;
-		}
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+            return true;
+        }
 
-		$post_type = get_post_type_object( $this->post_type );
-		if ( ! current_user_can( $post_type->cap->create_posts ) ) {
-			return new WP_Error( 
+        $post_type = get_post_type_object( $this->post_type );
+        if ( ! current_user_can( $post_type->cap->create_posts ) ) {
+            return new WP_Error( 
                 'rest_cannot_create', 
                 __( 'Sorry, you are not allowed to create invoice items as this user.', 'invoicing' ), 
                 array( 
@@ -317,253 +317,253 @@ 
             );
         }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Creates a single invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function create_item( $request ) {
-
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_item_exists', __( 'Cannot create existing invoice item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+     * Creates a single invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function create_item( $request ) {
+
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_item_exists', __( 'Cannot create existing invoice item.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$item_data = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $item_data = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $item_data ) ) {
-			return $item_data;
-		}
+        if ( is_wp_error( $item_data ) ) {
+            return $item_data;
+        }
 
-		// Try creating the item.
+        // Try creating the item.
         $item = wpinv_create_item( $item_data, true );
 
-		if ( is_wp_error( $item ) ) {
+        if ( is_wp_error( $item ) ) {
             return $item;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
-
-		/**
-		 * Fires after a single invoice item is created or updated via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPinv_Item   $item  Inserted or updated item object.
-		 * @param WP_REST_Request $request  Request object.
-		 * @param bool            $creating True when creating a post, false when updating.
-		 */
-		do_action( "wpinv_rest_insert_item", $item, $request, true );
-
-		/**
-		 * Filters the responses for creating single item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $item_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $item, $request );
+
+        /**
+         * Fires after a single invoice item is created or updated via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param WPinv_Item   $item  Inserted or updated item object.
+         * @param WP_REST_Request $request  Request object.
+         * @param bool            $creating True when creating a post, false when updating.
+         */
+        do_action( "wpinv_rest_insert_item", $item, $request, true );
+
+        /**
+         * Filters the responses for creating single item requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $item_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_create_item_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to update an item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
-	 */
-	public function update_item_permissions_check( $request ) {
-
-		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
-
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
-			return true;
-		}
-
-		return new WP_Error( 
-			'rest_cannot_edit', 
-			__( 'Sorry, you are not allowed to update this item.', 'invoicing' ), 
-			array( 
-				'status' => rest_authorization_required_code(),
-			)
-		);
-
-	}
-
-	/**
-	 * Updates a single item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function update_item( $request ) {
+    }
+
+    /**
+     * Checks if a given request has access to update an item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
+     */
+    public function update_item_permissions_check( $request ) {
+
+        // Retrieve the item.
+        $item = $this->get_post( $request['id'] );
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
+
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+            return true;
+        }
+
+        return new WP_Error( 
+            'rest_cannot_edit', 
+            __( 'Sorry, you are not allowed to update this item.', 'invoicing' ), 
+            array( 
+                'status' => rest_authorization_required_code(),
+            )
+        );
+
+    }
+
+    /**
+     * Updates a single item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function update_item( $request ) {
 		
-		// Ensure the item exists.
+        // Ensure the item exists.
         $valid_check = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
-			return $valid_check;
-		}
+        if ( is_wp_error( $valid_check ) ) {
+            return $valid_check;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $data_to_update = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $data_to_update ) ) {
-			return $data_to_update;
-		}
+        if ( is_wp_error( $data_to_update ) ) {
+            return $data_to_update;
+        }
 
-		// Abort if no item data is provided
+        // Abort if no item data is provided
         if( empty( $data_to_update ) ) {
             return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
         }
 
-		// Include the item ID
-		$data_to_update['ID'] = $request['id'];
-
-		// Update the item
-		$updated_item = wpinv_update_item( $data_to_update, true );
-
-		// Incase the update operation failed...
-		if ( is_wp_error( $updated_item ) ) {
-			return $updated_item;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_item, $request );
-
-		/** This action is documented in includes/class-wpinv-rest-item-controller.php */
-		do_action( "wpinv_rest_insert_item", $updated_item, $request, false );
-
-		/**
-		 * Filters the responses for updating single item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $item_data Item properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        // Include the item ID
+        $data_to_update['ID'] = $request['id'];
+
+        // Update the item
+        $updated_item = wpinv_update_item( $data_to_update, true );
+
+        // Incase the update operation failed...
+        if ( is_wp_error( $updated_item ) ) {
+            return $updated_item;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $updated_item, $request );
+
+        /** This action is documented in includes/class-wpinv-rest-item-controller.php */
+        do_action( "wpinv_rest_insert_item", $updated_item, $request, false );
+
+        /**
+         * Filters the responses for updating single item requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $item_data Item properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_update_item_response", $response,  $data_to_update, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to delete an item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
-	 */
-	public function delete_item_permissions_check( $request ) {
-
-		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
-
-		// 
-
-		// Ensure the current user can delete the item
-		if (! wpinv_can_delete_item( $request['id'] ) ) {
-			return new WP_Error( 
+    }
+
+    /**
+     * Checks if a given request has access to delete an item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
+     */
+    public function delete_item_permissions_check( $request ) {
+
+        // Retrieve the item.
+        $item = $this->get_post( $request['id'] );
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
+
+        // 
+
+        // Ensure the current user can delete the item
+        if (! wpinv_can_delete_item( $request['id'] ) ) {
+            return new WP_Error( 
                 'rest_cannot_delete', 
                 __( 'Sorry, you are not allowed to delete this item.', 'invoicing' ), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
             );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes a single item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function delete_item( $request ) {
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes a single item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function delete_item( $request ) {
 		
-		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
+        // Retrieve the item.
+        $item = $this->get_post( $request['id'] );
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the item id
-		$id    = $item->ID;
+        // Prepare the item id
+        $id    = $item->ID;
 
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $item, $request );
 
-		// Check if the user wants to bypass the trash...
-		$force_delete = (bool) $request['force'];
+        // Check if the user wants to bypass the trash...
+        $force_delete = (bool) $request['force'];
 
-		// Try deleting the item.
-		$deleted = wp_delete_post( $id, $force_delete );
+        // Try deleting the item.
+        $deleted = wp_delete_post( $id, $force_delete );
 
-		// Abort early if we can't delete the item.
-		if ( ! $deleted ) {
-			return new WP_Error( 'rest_cannot_delete', __( 'The item cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
-		}
+        // Abort early if we can't delete the item.
+        if ( ! $deleted ) {
+            return new WP_Error( 'rest_cannot_delete', __( 'The item cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+        }
 
-		/**
-		 * Fires immediately after a single item is deleted or trashed via the REST API.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPInv_Item    $item  The deleted or trashed item.
-		 * @param WP_REST_Request  $request  The request sent to the API.
-		 */
-		do_action( "wpinv_rest_delete_item", $item, $request );
+        /**
+         * Fires immediately after a single item is deleted or trashed via the REST API.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param WPInv_Item    $item  The deleted or trashed item.
+         * @param WP_REST_Request  $request  The request sent to the API.
+         */
+        do_action( "wpinv_rest_delete_item", $item, $request );
 
-		return $response;
+        return $response;
 
-	}
+    }
     
     
     /**
-	 * Retrieves the query params for the items collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
+     * Retrieves the query params for the items collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
         
         $query_params               = array(
 
@@ -577,27 +577,27 @@ 
             
             // Item types
             'type'                  => array(
-				'description'       => __( 'Type of items to fetch.', 'invoicing' ),
-				'type'              => 'array',
-				'default'           => wpinv_item_types(),
-				'items'             => array(
+                'description'       => __( 'Type of items to fetch.', 'invoicing' ),
+                'type'              => 'array',
+                'default'           => wpinv_item_types(),
+                'items'             => array(
                     'enum'          => wpinv_item_types(),
                     'type'          => 'string',
                 ),
-			),
+            ),
 			
-			// Number of results per page
+            // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of items to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+                'description'       => __( 'Number of items to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => (int) get_option( 'posts_per_page' ),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => 1,
+                'description'       => __( 'Current page to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => 1,
             ),
 
             // Exclude certain items
@@ -620,9 +620,9 @@ 
                     'date',
                     'ID',
                     'modified',
-					'title',
-					'relevance',
-					'rand'
+                    'title',
+                    'relevance',
+                    'rand'
                 ),
             ),
 
@@ -632,617 +632,617 @@ 
                 'type'        => 'string',
                 'default'     => 'DESC',
                 'enum'        => array( 'ASC', 'DESC' ),
-			),
+            ),
 			
-			// Search term
+            // Search term
             'search'                => array(
-				'description'       => __( 'Return items that match the search term.', 'invoicing' ),
-				'type'              => 'string',
+                'description'       => __( 'Return items that match the search term.', 'invoicing' ),
+                'type'              => 'string',
             ),
         );
 
-		/**
-		 * Filter collection parameters for the items controller.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $query_params JSON Schema-formatted collection parameters.
-		 */
-		return apply_filters( "wpinv_rest_items_collection_params", $query_params );
+        /**
+         * Filter collection parameters for the items controller.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param array        $query_params JSON Schema-formatted collection parameters.
+         */
+        return apply_filters( "wpinv_rest_items_collection_params", $query_params );
     }
     
     /**
-	 * Checks if a given post type can be viewed or managed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param object|string $post_type Post type name or object.
-	 * @return bool Whether the post type is allowed in REST.
-	 */
-	protected function check_is_post_type_allowed( $post_type ) {
-		return true;
-	}
-
-	/**
-	 * Prepares a single item for create or update.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array|WP_Error Invoice Properties or WP_Error.
-	 */
-	protected function prepare_item_for_database( $request ) {
-		$prepared_item = new stdClass();
-
-		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_item = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_item ) ) {
-				return $existing_item;
-			}
-
-			$prepared_item->ID 		  = $existing_item->ID;
-		}
-
-		$schema = $this->get_item_schema();
-
-		// item title.
-		if ( ! empty( $schema['properties']['name'] ) && isset( $request['name'] ) ) {
-			$prepared_item->title = sanitize_text_field( $request['name'] );
-		}
-
-		// item summary.
-		if ( ! empty( $schema['properties']['summary'] ) && isset( $request['summary'] ) ) {
-			$prepared_item->excerpt = wp_kses_post( $request['summary'] );
-		}
-
-		// item price.
-		if ( ! empty( $schema['properties']['price'] ) && isset( $request['price'] ) ) {
-			$prepared_item->price = floatval( $request['price'] );
-		}
-
-		// minimum price (for dynamc items).
-		if ( ! empty( $schema['properties']['minimum_price'] ) && isset( $request['minimum_price'] ) ) {
-			$prepared_item->minimum_price = floatval( $request['minimum_price'] );
-		}
-
-		// item status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
-			$prepared_item->status = 'publish' === $request['status'] ? 'publish' : 'pending';
-		}
-
-		// item type.
-		if ( ! empty( $schema['properties']['type'] ) && isset( $request['type'] ) ) {
-			$prepared_item->type = in_array( $request['type'], wpinv_item_types() ) ? trim( strtolower( $request['type'] ) ) : 'custom';
-		}
-
-		// VAT rule.
-		if ( ! empty( $schema['properties']['vat_rule'] ) && isset( $request['vat_rule'] ) ) {
-			$prepared_item->vat_rule = 'digital' === $request['vat_rule'] ? 'digital' : 'physical';
-		}
-
-		// Simple strings.
-		foreach( array( 'custom_id', 'custom_name', 'custom_singular_name' ) as $property ) {
-
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = sanitize_text_field( $request[$property] );
-			}
-
-		}
-
-		// Simple integers.
-		foreach( array( 'is_recurring', 'recurring_interval', 'recurring_limit', 'free_trial', 'trial_interval', 'dynamic_pricing', 'editable' ) as $property ) {
-
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = intval( $request[$property] );
-			}
-
-		}
-
-		// Time periods.
-		foreach( array( 'recurring_period',  'trial_period' ) as $property ) {
-
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = in_array( $request[$property], array( 'D', 'W', 'M', 'Y' ) ) ? trim( strtoupper( $request[$property] ) ) : 'D';
-			}
-
-		}
-
-		$item_data = (array) wp_unslash( $prepared_item );
-
-		/**
-		 * Filters an item before it is inserted via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $item_data An array of item data
-		 * @param WP_REST_Request $request       Request object.
-		 */
-		return apply_filters( "wpinv_rest_pre_insert_item", $item_data, $request );
-
-	}
-
-	/**
-	 * Prepares a single item output for response.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Item   $item    item object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response Response object.
-	 */
-	public function prepare_item_for_response( $item, $request ) {
+     * Checks if a given post type can be viewed or managed.
+     *
+     * @since 1.0.13
+     *
+     * @param object|string $post_type Post type name or object.
+     * @return bool Whether the post type is allowed in REST.
+     */
+    protected function check_is_post_type_allowed( $post_type ) {
+        return true;
+    }
 
-		$GLOBALS['post'] = get_post( $item->get_ID() );
+    /**
+     * Prepares a single item for create or update.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array|WP_Error Invoice Properties or WP_Error.
+     */
+    protected function prepare_item_for_database( $request ) {
+        $prepared_item = new stdClass();
+
+        // Post ID.
+        if ( isset( $request['id'] ) ) {
+            $existing_item = $this->get_post( $request['id'] );
+            if ( is_wp_error( $existing_item ) ) {
+                return $existing_item;
+            }
 
-		setup_postdata( $item->get_ID() );
+            $prepared_item->ID 		  = $existing_item->ID;
+        }
 
-		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
+        $schema = $this->get_item_schema();
 
-		// Base fields for every item.
-		$data = array();
+        // item title.
+        if ( ! empty( $schema['properties']['name'] ) && isset( $request['name'] ) ) {
+            $prepared_item->title = sanitize_text_field( $request['name'] );
+        }
 
-		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
-			$data['id'] = $item->get_ID();
-		}
+        // item summary.
+        if ( ! empty( $schema['properties']['summary'] ) && isset( $request['summary'] ) ) {
+            $prepared_item->excerpt = wp_kses_post( $request['summary'] );
+        }
 
+        // item price.
+        if ( ! empty( $schema['properties']['price'] ) && isset( $request['price'] ) ) {
+            $prepared_item->price = floatval( $request['price'] );
+        }
 
-		// Item properties
-		$item_properties = array(
-			'name', 'summary', 'price', 'status', 'type',
-			'vat_rule', 'vat_class',
-			'custom_id', 'custom_name', 'custom_singular_name', 
-			'editable'
-		);
+        // minimum price (for dynamc items).
+        if ( ! empty( $schema['properties']['minimum_price'] ) && isset( $request['minimum_price'] ) ) {
+            $prepared_item->minimum_price = floatval( $request['minimum_price'] );
+        }
+
+        // item status.
+        if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
+            $prepared_item->status = 'publish' === $request['status'] ? 'publish' : 'pending';
+        }
 
-		foreach( $item_properties as $property ) {
+        // item type.
+        if ( ! empty( $schema['properties']['type'] ) && isset( $request['type'] ) ) {
+            $prepared_item->type = in_array( $request['type'], wpinv_item_types() ) ? trim( strtolower( $request['type'] ) ) : 'custom';
+        }
 
-			if ( rest_is_field_included( $property, $fields ) && method_exists( $item, 'get_' . $property ) ) {
-				$data[$property] = call_user_func( array( $item, 'get_' . $property ) );
-			}
+        // VAT rule.
+        if ( ! empty( $schema['properties']['vat_rule'] ) && isset( $request['vat_rule'] ) ) {
+            $prepared_item->vat_rule = 'digital' === $request['vat_rule'] ? 'digital' : 'physical';
+        }
 
-		}
+        // Simple strings.
+        foreach( array( 'custom_id', 'custom_name', 'custom_singular_name' ) as $property ) {
 
-		// Dynamic pricing.
-		if( $item->supports_dynamic_pricing() ) {
+            if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
+                $prepared_item->$property = sanitize_text_field( $request[$property] );
+            }
 
-			if( rest_is_field_included( 'dynamic_pricing', $fields ) ) {
-				$data['dynamic_pricing'] = $item->get_is_dynamic_pricing();
-			}
+        }
 
-			if( rest_is_field_included( 'minimum_price', $fields ) ) {
-				$data['minimum_price'] = $item->get_minimum_price();
-			}
-		}
+        // Simple integers.
+        foreach( array( 'is_recurring', 'recurring_interval', 'recurring_limit', 'free_trial', 'trial_interval', 'dynamic_pricing', 'editable' ) as $property ) {
 
-		// Subscriptions.
-		if( rest_is_field_included( 'is_recurring', $fields ) ) {
-			$data['is_recurring'] = $item->get_is_recurring();
-		}
+            if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
+                $prepared_item->$property = intval( $request[$property] );
+            }
 
-		if( $item->is_recurring() ) {
+        }
 
-			$recurring_fields = array( 'is_recurring', 'recurring_period', 'recurring_interval', 'recurring_limit', 'free_trial' );
-			foreach( $recurring_fields as $field ) {
+        // Time periods.
+        foreach( array( 'recurring_period',  'trial_period' ) as $property ) {
 
-				if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
-					$data[$field] = call_user_func( array( $item, 'get_' . $field ) );
-				}
+            if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
+                $prepared_item->$property = in_array( $request[$property], array( 'D', 'W', 'M', 'Y' ) ) ? trim( strtoupper( $request[$property] ) ) : 'D';
+            }
+
+        }
+
+        $item_data = (array) wp_unslash( $prepared_item );
+
+        /**
+         * Filters an item before it is inserted via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param array        $item_data An array of item data
+         * @param WP_REST_Request $request       Request object.
+         */
+        return apply_filters( "wpinv_rest_pre_insert_item", $item_data, $request );
+
+    }
+
+    /**
+     * Prepares a single item output for response.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Item   $item    item object.
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response Response object.
+     */
+    public function prepare_item_for_response( $item, $request ) {
+
+        $GLOBALS['post'] = get_post( $item->get_ID() );
+
+        setup_postdata( $item->get_ID() );
+
+        // Fetch the fields to include in this response.
+        $fields = $this->get_fields_for_response( $request );
+
+        // Base fields for every item.
+        $data = array();
+
+        // Set up ID
+        if ( rest_is_field_included( 'id', $fields ) ) {
+            $data['id'] = $item->get_ID();
+        }
+
+
+        // Item properties
+        $item_properties = array(
+            'name', 'summary', 'price', 'status', 'type',
+            'vat_rule', 'vat_class',
+            'custom_id', 'custom_name', 'custom_singular_name', 
+            'editable'
+        );
+
+        foreach( $item_properties as $property ) {
+
+            if ( rest_is_field_included( $property, $fields ) && method_exists( $item, 'get_' . $property ) ) {
+                $data[$property] = call_user_func( array( $item, 'get_' . $property ) );
+            }
+
+        }
+
+        // Dynamic pricing.
+        if( $item->supports_dynamic_pricing() ) {
+
+            if( rest_is_field_included( 'dynamic_pricing', $fields ) ) {
+                $data['dynamic_pricing'] = $item->get_is_dynamic_pricing();
+            }
+
+            if( rest_is_field_included( 'minimum_price', $fields ) ) {
+                $data['minimum_price'] = $item->get_minimum_price();
+            }
+        }
+
+        // Subscriptions.
+        if( rest_is_field_included( 'is_recurring', $fields ) ) {
+            $data['is_recurring'] = $item->get_is_recurring();
+        }
+
+        if( $item->is_recurring() ) {
+
+            $recurring_fields = array( 'is_recurring', 'recurring_period', 'recurring_interval', 'recurring_limit', 'free_trial' );
+            foreach( $recurring_fields as $field ) {
+
+                if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
+                    $data[$field] = call_user_func( array( $item, 'get_' . $field ) );
+                }
 	
-			}
+            }
 
-			if( $item->has_free_trial() ) {
+            if( $item->has_free_trial() ) {
 
-				$trial_fields = array( 'trial_period', 'trial_interval' );
-				foreach( $trial_fields as $field ) {
+                $trial_fields = array( 'trial_period', 'trial_interval' );
+                foreach( $trial_fields as $field ) {
 
-					if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
-						$data[$field] = call_user_func( array( $item, 'get_' . $field ) );
-					}
+                    if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
+                        $data[$field] = call_user_func( array( $item, 'get_' . $field ) );
+                    }
 	
-				}
-
-			}
-
-		}
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-
-		$links = $this->prepare_links( $item );
-		$response->add_links( $links );
-
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $item, $request );
-
-			$self = $links['self']['href'];
-
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
-			}
-		}
-
-		/**
-		 * Filters the item data for a response.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WP_REST_Response $response The response object.
-		 * @param WPInv_Item    $item  The item object.
-		 * @param WP_REST_Request  $request  Request object.
-		 */
-		return apply_filters( "wpinv_rest_prepare_item", $response, $item, $request );
-	}
-
-	/**
-	 * Gets an array of fields to be included on the response.
-	 *
-	 * Included fields are based on item schema and `_fields=` request argument.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array Fields to be included in the response.
-	 */
-	public function get_fields_for_response( $request ) {
-		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
-
-		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
-			// For back-compat, include any field with an empty schema
-			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
-			}
-		}
-
-		// Exclude fields that specify a different context than the request context.
-		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
-				}
-			}
-		}
-
-		$fields = array_keys( $properties );
-
-		if ( ! isset( $request['_fields'] ) ) {
-			return $fields;
-		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
-			return $fields;
-		}
-		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
-		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
-			$requested_fields[] = 'id';
-		}
-		// Return the list of all requested fields which appear in the schema.
-		return array_reduce(
-			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
-					$response_fields[] = $field;
-					return $response_fields;
-				}
-				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
-				// A nested field is included so long as its top-level property is
-				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
-					$response_fields[] = $field;
-				}
-				return $response_fields;
-			},
-			array()
-		);
-	}
-
-	/**
-	 * Retrieves the item's schema, conforming to JSON Schema.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Item schema data.
-	 */
-	public function get_item_schema() {
-
-		// Maybe retrieve the schema from cache.
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
-		}
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => $this->post_type,
-			'type'       => 'object',
-
-			// Base properties for every Item.
-			'properties' 		  => array(
-
-				'id'           => array(
-					'description' => __( 'Unique identifier for the item.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'name'			  => array(
-					'description' => __( 'The name for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'summary'        => array(
-					'description' => __( 'A summary for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'price'        => array(
-					'description' => __( 'The price for the item.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'status'       => array(
-					'description' => __( 'A named status for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array_keys( get_post_stati( array( 'internal' => false ) ) ),
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'type'       => array(
-					'description' => __( 'The item type.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => wpinv_item_types(),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'vat_rule'       => array(
-					'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array( 'digital', 'physical' ),
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'vat_class'       => array(
-					'description' => __( 'VAT class for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-
-				'custom_id'       => array(
-					'description' => __( 'Custom id for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
+                }
+
+            }
+
+        }
+
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+
+        $links = $this->prepare_links( $item );
+        $response->add_links( $links );
+
+        if ( ! empty( $links['self']['href'] ) ) {
+            $actions = $this->get_available_actions( $item, $request );
+
+            $self = $links['self']['href'];
+
+            foreach ( $actions as $rel ) {
+                $response->add_link( $rel, $self );
+            }
+        }
+
+        /**
+         * Filters the item data for a response.
+         *
+         * @since 1.0.13
+         *
+         * @param WP_REST_Response $response The response object.
+         * @param WPInv_Item    $item  The item object.
+         * @param WP_REST_Request  $request  Request object.
+         */
+        return apply_filters( "wpinv_rest_prepare_item", $response, $item, $request );
+    }
+
+    /**
+     * Gets an array of fields to be included on the response.
+     *
+     * Included fields are based on item schema and `_fields=` request argument.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array Fields to be included in the response.
+     */
+    public function get_fields_for_response( $request ) {
+        $schema     = $this->get_item_schema();
+        $properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+
+        $additional_fields = $this->get_additional_fields();
+        foreach ( $additional_fields as $field_name => $field_options ) {
+            // For back-compat, include any field with an empty schema
+            // because it won't be present in $this->get_item_schema().
+            if ( is_null( $field_options['schema'] ) ) {
+                $properties[ $field_name ] = $field_options;
+            }
+        }
+
+        // Exclude fields that specify a different context than the request context.
+        $context = $request['context'];
+        if ( $context ) {
+            foreach ( $properties as $name => $options ) {
+                if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
+                    unset( $properties[ $name ] );
+                }
+            }
+        }
+
+        $fields = array_keys( $properties );
+
+        if ( ! isset( $request['_fields'] ) ) {
+            return $fields;
+        }
+        $requested_fields = wpinv_parse_list( $request['_fields'] );
+        if ( 0 === count( $requested_fields ) ) {
+            return $fields;
+        }
+        // Trim off outside whitespace from the comma delimited list.
+        $requested_fields = array_map( 'trim', $requested_fields );
+        // Always persist 'id', because it can be needed for add_additional_fields_to_object().
+        if ( in_array( 'id', $fields, true ) ) {
+            $requested_fields[] = 'id';
+        }
+        // Return the list of all requested fields which appear in the schema.
+        return array_reduce(
+            $requested_fields,
+            function( $response_fields, $field ) use ( $fields ) {
+                if ( in_array( $field, $fields, true ) ) {
+                    $response_fields[] = $field;
+                    return $response_fields;
+                }
+                // Check for nested fields if $field is not a direct match.
+                $nested_fields = explode( '.', $field );
+                // A nested field is included so long as its top-level property is
+                // present in the schema.
+                if ( in_array( $nested_fields[0], $fields, true ) ) {
+                    $response_fields[] = $field;
+                }
+                return $response_fields;
+            },
+            array()
+        );
+    }
+
+    /**
+     * Retrieves the item's schema, conforming to JSON Schema.
+     *
+     * @since 1.0.13
+     *
+     * @return array Item schema data.
+     */
+    public function get_item_schema() {
+
+        // Maybe retrieve the schema from cache.
+        if ( $this->schema ) {
+            return $this->add_additional_fields_schema( $this->schema );
+        }
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+
+            // Base properties for every Item.
+            'properties' 		  => array(
+
+                'id'           => array(
+                    'description' => __( 'Unique identifier for the item.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'name'			  => array(
+                    'description' => __( 'The name for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'summary'        => array(
+                    'description' => __( 'A summary for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'price'        => array(
+                    'description' => __( 'The price for the item.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'status'       => array(
+                    'description' => __( 'A named status for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array_keys( get_post_stati( array( 'internal' => false ) ) ),
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'type'       => array(
+                    'description' => __( 'The item type.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => wpinv_item_types(),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'vat_rule'       => array(
+                    'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array( 'digital', 'physical' ),
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'vat_class'       => array(
+                    'description' => __( 'VAT class for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+
+                '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' ),
-				),
-
-				'dynamic_pricing'        => array(
-					'description' => __( 'Whether the item allows a user to set their own price.', 'invoicing' ),
-					'type'        => 'integer',
-					'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 the item is a subscription item.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'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' ),
-				),
-
-				'free_trial'        => array(
-					'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'trial_period'        => array(
-					'description' => __( 'The trial period of a recurring item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'enum'        => array( 'D', 'W', 'M', 'Y' ),
-				),
-
-				'trial_interval'        => array(
-					'description' => __( 'The trial interval for a subscription item.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'editable'        => array(
-					'description' => __( 'Whether or not the item is editable.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit' ),
-				),
-
-			),
-		);
-
-		// Add helpful links to the item schem.
-		$schema['links'] = $this->get_schema_links();
-
-		/**
-		 * Filters the item schema for the REST API.
-		 *
-		 * Enables adding extra properties to items.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $schema    The item schema.
-		 */
+                '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' ),
+                ),
+
+                'dynamic_pricing'        => array(
+                    'description' => __( 'Whether the item allows a user to set their own price.', 'invoicing' ),
+                    'type'        => 'integer',
+                    '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 the item is a subscription item.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                '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' ),
+                ),
+
+                'free_trial'        => array(
+                    'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'trial_period'        => array(
+                    'description' => __( 'The trial period of a recurring item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'enum'        => array( 'D', 'W', 'M', 'Y' ),
+                ),
+
+                'trial_interval'        => array(
+                    'description' => __( 'The trial interval for a subscription item.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'editable'        => array(
+                    'description' => __( 'Whether or not the item is editable.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+            ),
+        );
+
+        // Add helpful links to the item schem.
+        $schema['links'] = $this->get_schema_links();
+
+        /**
+         * Filters the item schema for the REST API.
+         *
+         * Enables adding extra properties to items.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $schema    The item schema.
+         */
         $schema = apply_filters( "wpinv_rest_item_schema", $schema );
 
-		//  Cache the item schema.
-		$this->schema = $schema;
+        //  Cache the item schema.
+        $this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
-	}
-
-	/**
-	 * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array
-	 */
-	protected function get_schema_links() {
-
-		$href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
-
-		$links = array();
-
-		$links[] = array(
-			'rel'          => 'https://api.w.org/action-publish',
-			'title'        => __( 'The current user can publish this item.' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties' => array(
-					'status' => array(
-						'type' => 'string',
-						'enum' => array( 'publish', 'future' ),
-					),
-				),
-			),
-		);
-
-		return $links;
-	}
-
-	/**
-	 * Prepares links for the request.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Item $item Item Object.
-	 * @return array Links for the given item.
-	 */
-	protected function prepare_links( $item ) {
-
-		// Prepare the base REST API endpoint for items.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
-
-		// Entity meta.
-		$links = array(
-			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $item->ID ),
-			),
-			'collection' => array(
-				'href' => rest_url( $base ),
-			),
-		);
-
-		/**
-		 * Filters the returned item links for the REST API.
-		 *
-		 * Enables adding extra links to item API responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $links    Rest links.
-		 */
-		return apply_filters( "wpinv_rest_item_links", $links );
-
-	}
-
-	/**
-	 * Get the link relations available for the post and current user.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Item   $item    Item object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array List of link relations.
-	 */
-	protected function get_available_actions( $item, $request ) {
-
-		if ( 'edit' !== $request['context'] ) {
-			return array();
-		}
-
-		$rels = array();
-
-		// Retrieve the post type object.
-		$post_type = get_post_type_object( $item->post_type );
-
-		// Mark item as published.
-		if ( current_user_can( $post_type->cap->publish_posts ) ) {
-			$rels[] = 'https://api.w.org/action-publish';
-		}
-
-		/**
-		 * Filters the available item link relations for the REST API.
-		 *
-		 * Enables adding extra link relation for the current user and request to item responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $rels    Available link relations.
-		 */
-		return apply_filters( "wpinv_rest_item_link_relations", $rels );
-	}
-
-	/**
-	 * Handles rest requests for item types.
-	 *
-	 * @since 1.0.13
-	 * 
-	 * 
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item_types() {
-		return rest_ensure_response( wpinv_get_item_types() );
-	}
+        return $this->add_additional_fields_schema( $this->schema );
+    }
+
+    /**
+     * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array
+     */
+    protected function get_schema_links() {
+
+        $href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
+
+        $links = array();
+
+        $links[] = array(
+            'rel'          => 'https://api.w.org/action-publish',
+            'title'        => __( 'The current user can publish this item.' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties' => array(
+                    'status' => array(
+                        'type' => 'string',
+                        'enum' => array( 'publish', 'future' ),
+                    ),
+                ),
+            ),
+        );
+
+        return $links;
+    }
+
+    /**
+     * Prepares links for the request.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Item $item Item Object.
+     * @return array Links for the given item.
+     */
+    protected function prepare_links( $item ) {
+
+        // Prepare the base REST API endpoint for items.
+        $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+
+        // Entity meta.
+        $links = array(
+            'self'       => array(
+                'href' => rest_url( trailingslashit( $base ) . $item->ID ),
+            ),
+            'collection' => array(
+                'href' => rest_url( $base ),
+            ),
+        );
+
+        /**
+         * Filters the returned item links for the REST API.
+         *
+         * Enables adding extra links to item API responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $links    Rest links.
+         */
+        return apply_filters( "wpinv_rest_item_links", $links );
+
+    }
+
+    /**
+     * Get the link relations available for the post and current user.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Item   $item    Item object.
+     * @param WP_REST_Request $request Request object.
+     * @return array List of link relations.
+     */
+    protected function get_available_actions( $item, $request ) {
+
+        if ( 'edit' !== $request['context'] ) {
+            return array();
+        }
+
+        $rels = array();
+
+        // Retrieve the post type object.
+        $post_type = get_post_type_object( $item->post_type );
+
+        // Mark item as published.
+        if ( current_user_can( $post_type->cap->publish_posts ) ) {
+            $rels[] = 'https://api.w.org/action-publish';
+        }
+
+        /**
+         * Filters the available item link relations for the REST API.
+         *
+         * Enables adding extra link relation for the current user and request to item responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $rels    Available link relations.
+         */
+        return apply_filters( "wpinv_rest_item_link_relations", $rels );
+    }
+
+    /**
+     * Handles rest requests for item types.
+     *
+     * @since 1.0.13
+     * 
+     * 
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_item_types() {
+        return rest_ensure_response( wpinv_get_item_types() );
+    }
 
     
 }
\ No newline at end of file

Spacing +254 added lines, -254 removed lines

@@ -8,7 +8,7 @@ 
  * @since    1.0.13
  */
 
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -41,7 +41,7 @@ 
 	 *
 	 * @param string $namespace Api Namespace
 	 */
-	public function __construct( $namespace ) {
+	public function __construct($namespace) {
         
         // Set api namespace...
 		$this->namespace = $namespace;
@@ -68,7 +68,7 @@ 
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_item_types' ),
+					'callback'            => array($this, 'get_item_types'),
 				),
 			)
 		);
@@ -84,13 +84,13 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
 	 */
-	public function get_items_permissions_check( $request ) {
+	public function get_items_permissions_check($request) {
 	
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+		if (current_user_can('manage_options') || current_user_can('manage_invoicing')) {
 			return true;
 		}
 
-		return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to view invoice items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		return new WP_Error('rest_forbidden_context', __('Sorry, you are not allowed to view invoice items.', 'invoicing'), array('status' => rest_authorization_required_code()));
 
     }
     
@@ -102,17 +102,17 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 		
 		// Retrieve the list of registered item query parameters.
         $registered = $this->get_collection_params();
         
         $args       = array();
 
-        foreach( array_keys( $registered ) as $key ) {
+        foreach (array_keys($registered) as $key) {
 
-            if( isset( $request[ $key] ) ) {
-                $args[ $key ] = $request[ $key];
+            if (isset($request[$key])) {
+                $args[$key] = $request[$key];
             }
 
         }
@@ -127,32 +127,32 @@ 
 		 * @param array           $args    Key value array of query var to query value.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $args       = apply_filters( "wpinv_rest_get_items_arguments", $args, $request, $this );
+        $args = apply_filters("wpinv_rest_get_items_arguments", $args, $request, $this);
 		
 		// Special args
-		$args[ 'return' ]   = 'objects';
-		$args[ 'paginate' ] = true;
+		$args['return']   = 'objects';
+		$args['paginate'] = true;
 
         // Run the query.
-		$query = wpinv_get_all_items( $args );
+		$query = wpinv_get_all_items($args);
 		
 		// Prepare the retrieved items
 		$items = array();
-		foreach( $query->items as $item ) {
+		foreach ($query->items as $item) {
 
-			if ( ! $this->check_read_permission( $item ) ) {
+			if (!$this->check_read_permission($item)) {
 				continue;
 			}
 
-			$data       = $this->prepare_item_for_response( $item, $request );
-			$items[]    = $this->prepare_response_for_collection( $data );
+			$data       = $this->prepare_item_for_response($item, $request);
+			$items[]    = $this->prepare_response_for_collection($data);
 
 		}
 
 		// Prepare the response.
-		$response = rest_ensure_response( $items );
-		$response->header( 'X-WP-Total', (int) $query->total );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+		$response = rest_ensure_response($items);
+		$response->header('X-WP-Total', (int) $query->total);
+		$response->header('X-WP-TotalPages', (int) $query->max_num_pages);
 
 		/**
 		 * Filters the responses for item requests.
@@ -165,9 +165,9 @@ 
 		 * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the items
 		 */
-        $response       = apply_filters( "wpinv_rest_items_response", $response, $request, $args );
+        $response = apply_filters("wpinv_rest_items_response", $response, $request, $args);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
         
     }
 
@@ -179,17 +179,17 @@ 
 	 * @param int $item_id Supplied ID.
 	 * @return WPInv_Item|WP_Error Item object if ID is valid, WP_Error otherwise.
 	 */
-	protected function get_post( $item_id ) {
+	protected function get_post($item_id) {
 		
-		$error     = new WP_Error( 'rest_item_invalid_id', __( 'Invalid item ID.', 'invoicing' ), array( 'status' => 404 ) );
+		$error = new WP_Error('rest_item_invalid_id', __('Invalid item ID.', 'invoicing'), array('status' => 404));
 
         // Ids start from 1
-        if ( (int) $item_id <= 0 ) {
+        if ((int) $item_id <= 0) {
 			return $error;
 		}
 
-		$item = wpinv_get_item_by( 'id', (int) $item_id );
-		if ( empty( $item ) ) {
+		$item = wpinv_get_item_by('id', (int) $item_id);
+		if (empty($item)) {
 			return $error;
         }
 
@@ -205,29 +205,29 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has read access for the invoice item, WP_Error object otherwise.
 	 */
-	public function get_item_permissions_check( $request ) {
+	public function get_item_permissions_check($request) {
 
         // Retrieve the item object.
-        $item = $this->get_post( $request['id'] );
+        $item = $this->get_post($request['id']);
         
         // Ensure it is valid.
-		if ( is_wp_error( $item ) ) {
+		if (is_wp_error($item)) {
 			return $item;
 		}
 
-		$post_type = get_post_type_object( $this->post_type );
+		$post_type = get_post_type_object($this->post_type);
 
-		if ( ! current_user_can(  $post_type->cap->read_post, $item->ID  ) ) {
+		if (!current_user_can($post_type->cap->read_post, $item->ID)) {
 			return new WP_Error( 
                 'rest_cannot_edit', 
-                __( 'Sorry, you are not allowed to view this item.', 'invoicing' ), 
+                __('Sorry, you are not allowed to view this item.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
             );
         }
 
-		return $this->check_read_permission( $item );
+		return $this->check_read_permission($item);
     }
     
     /**
@@ -241,10 +241,10 @@ 
 	 * @param WPInv_Item $item WPInv_Item object.
 	 * @return bool Whether the post can be read.
 	 */
-	public function check_read_permission( $item ) {
+	public function check_read_permission($item) {
 
 		// An item can be read by an admin...
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+		if (current_user_can('manage_options') || current_user_can('manage_invoicing')) {
 			return true;
 		}
 
@@ -259,18 +259,18 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function get_item( $request ) {
+	public function get_item($request) {
 
         // Fetch the item.
-        $item = $this->get_post( $request['id'] );
+        $item = $this->get_post($request['id']);
         
         // Abort early if it does not exist
-		if ( is_wp_error( $item ) ) {
+		if (is_wp_error($item)) {
 			return $item;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
+		$response = $this->prepare_item_for_response($item, $request);
 
 		/**
 		 * Filters the responses for single invoice item requests.
@@ -282,9 +282,9 @@ 
 		 * @param WP_HTTP_Response $response Response.
 		 * @param WP_REST_Request  $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_get_item_response", $response, $request );
+        $response = apply_filters("wpinv_rest_get_item_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 
     }
     
@@ -296,21 +296,21 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
 	 */
-	public function create_item_permissions_check( $request ) {
+	public function create_item_permissions_check($request) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_item_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_item_exists', __('Cannot create existing item.', 'invoicing'), array('status' => 400));
 		}
 
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+		if (current_user_can('manage_options') || current_user_can('manage_invoicing')) {
 			return true;
 		}
 
-		$post_type = get_post_type_object( $this->post_type );
-		if ( ! current_user_can( $post_type->cap->create_posts ) ) {
+		$post_type = get_post_type_object($this->post_type);
+		if (!current_user_can($post_type->cap->create_posts)) {
 			return new WP_Error( 
                 'rest_cannot_create', 
-                __( 'Sorry, you are not allowed to create invoice items as this user.', 'invoicing' ), 
+                __('Sorry, you are not allowed to create invoice items as this user.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -328,30 +328,30 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function create_item( $request ) {
+	public function create_item($request) {
 
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_item_exists', __( 'Cannot create existing invoice item.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_item_exists', __('Cannot create existing invoice item.', 'invoicing'), array('status' => 400));
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the updated data.
-		$item_data = $this->prepare_item_for_database( $request );
+		$item_data = $this->prepare_item_for_database($request);
 
-		if ( is_wp_error( $item_data ) ) {
+		if (is_wp_error($item_data)) {
 			return $item_data;
 		}
 
 		// Try creating the item.
-        $item = wpinv_create_item( $item_data, true );
+        $item = wpinv_create_item($item_data, true);
 
-		if ( is_wp_error( $item ) ) {
+		if (is_wp_error($item)) {
             return $item;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
+		$response = $this->prepare_item_for_response($item, $request);
 
 		/**
 		 * Fires after a single invoice item is created or updated via the REST API.
@@ -362,7 +362,7 @@ 
 		 * @param WP_REST_Request $request  Request object.
 		 * @param bool            $creating True when creating a post, false when updating.
 		 */
-		do_action( "wpinv_rest_insert_item", $item, $request, true );
+		do_action("wpinv_rest_insert_item", $item, $request, true);
 
 		/**
 		 * Filters the responses for creating single item requests.
@@ -374,9 +374,9 @@ 
 		 * @param array           $item_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_create_item_response", $response, $request );
+        $response = apply_filters("wpinv_rest_create_item_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 	}
 
 	/**
@@ -387,21 +387,21 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
 	 */
-	public function update_item_permissions_check( $request ) {
+	public function update_item_permissions_check($request) {
 
 		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
+		$item = $this->get_post($request['id']);
+		if (is_wp_error($item)) {
 			return $item;
 		}
 
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+		if (current_user_can('manage_options') || current_user_can('manage_invoicing')) {
 			return true;
 		}
 
 		return new WP_Error( 
 			'rest_cannot_edit', 
-			__( 'Sorry, you are not allowed to update this item.', 'invoicing' ), 
+			__('Sorry, you are not allowed to update this item.', 'invoicing'), 
 			array( 
 				'status' => rest_authorization_required_code(),
 			)
@@ -417,46 +417,46 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function update_item( $request ) {
+	public function update_item($request) {
 		
 		// Ensure the item exists.
-        $valid_check = $this->get_post( $request['id'] );
+        $valid_check = $this->get_post($request['id']);
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
+		if (is_wp_error($valid_check)) {
 			return $valid_check;
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+		$data_to_update = $this->prepare_item_for_database($request);
 
-		if ( is_wp_error( $data_to_update ) ) {
+		if (is_wp_error($data_to_update)) {
 			return $data_to_update;
 		}
 
 		// Abort if no item data is provided
-        if( empty( $data_to_update ) ) {
-            return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
+        if (empty($data_to_update)) {
+            return new WP_Error('missing_data', __('An update request cannot be empty.', 'invoicing'));
         }
 
 		// Include the item ID
 		$data_to_update['ID'] = $request['id'];
 
 		// Update the item
-		$updated_item = wpinv_update_item( $data_to_update, true );
+		$updated_item = wpinv_update_item($data_to_update, true);
 
 		// Incase the update operation failed...
-		if ( is_wp_error( $updated_item ) ) {
+		if (is_wp_error($updated_item)) {
 			return $updated_item;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_item, $request );
+		$response = $this->prepare_item_for_response($updated_item, $request);
 
 		/** This action is documented in includes/class-wpinv-rest-item-controller.php */
-		do_action( "wpinv_rest_insert_item", $updated_item, $request, false );
+		do_action("wpinv_rest_insert_item", $updated_item, $request, false);
 
 		/**
 		 * Filters the responses for updating single item requests.
@@ -468,9 +468,9 @@ 
 		 * @param array           $item_data Item properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_update_item_response", $response,  $data_to_update, $request );
+        $response = apply_filters("wpinv_rest_update_item_response", $response, $data_to_update, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 	}
 
 	/**
@@ -481,21 +481,21 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
 	 */
-	public function delete_item_permissions_check( $request ) {
+	public function delete_item_permissions_check($request) {
 
 		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
+		$item = $this->get_post($request['id']);
+		if (is_wp_error($item)) {
 			return $item;
 		}
 
 		// 
 
 		// Ensure the current user can delete the item
-		if (! wpinv_can_delete_item( $request['id'] ) ) {
+		if (!wpinv_can_delete_item($request['id'])) {
 			return new WP_Error( 
                 'rest_cannot_delete', 
-                __( 'Sorry, you are not allowed to delete this item.', 'invoicing' ), 
+                __('Sorry, you are not allowed to delete this item.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -513,31 +513,31 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function delete_item( $request ) {
+	public function delete_item($request) {
 		
 		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
+		$item = $this->get_post($request['id']);
+		if (is_wp_error($item)) {
 			return $item;
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the item id
-		$id    = $item->ID;
+		$id = $item->ID;
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
+		$response = $this->prepare_item_for_response($item, $request);
 
 		// Check if the user wants to bypass the trash...
 		$force_delete = (bool) $request['force'];
 
 		// Try deleting the item.
-		$deleted = wp_delete_post( $id, $force_delete );
+		$deleted = wp_delete_post($id, $force_delete);
 
 		// Abort early if we can't delete the item.
-		if ( ! $deleted ) {
-			return new WP_Error( 'rest_cannot_delete', __( 'The item cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+		if (!$deleted) {
+			return new WP_Error('rest_cannot_delete', __('The item cannot be deleted.', 'invoicing'), array('status' => 500));
 		}
 
 		/**
@@ -549,7 +549,7 @@ 
 		 * @param WPInv_Item    $item  The deleted or trashed item.
 		 * @param WP_REST_Request  $request  The request sent to the API.
 		 */
-		do_action( "wpinv_rest_delete_item", $item, $request );
+		do_action("wpinv_rest_delete_item", $item, $request);
 
 		return $response;
 
@@ -565,19 +565,19 @@ 
 	 */
 	public function get_collection_params() {
         
-        $query_params               = array(
+        $query_params = array(
 
             // Invoice status.
             'status'                => array(
                 'default'           => 'publish',
-                'description'       => __( 'Limit result set to items assigned one or more statuses.', 'invoicing' ),
+                'description'       => __('Limit result set to items assigned one or more statuses.', 'invoicing'),
                 'type'              => 'array',
-                'sanitize_callback' => array( $this, 'sanitize_post_statuses' ),
+                'sanitize_callback' => array($this, 'sanitize_post_statuses'),
             ),
             
             // Item types
             'type'                  => array(
-				'description'       => __( 'Type of items to fetch.', 'invoicing' ),
+				'description'       => __('Type of items to fetch.', 'invoicing'),
 				'type'              => 'array',
 				'default'           => wpinv_item_types(),
 				'items'             => array(
@@ -588,21 +588,21 @@ 
 			
 			// Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of items to fetch.', 'invoicing' ),
+				'description'       => __('Number of items to fetch.', 'invoicing'),
 				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+				'default'           => (int) get_option('posts_per_page'),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
+				'description'       => __('Current page to fetch.', 'invoicing'),
 				'type'              => 'integer',
 				'default'           => 1,
             ),
 
             // Exclude certain items
             'exclude'  => array(
-                'description' => __( 'Ensure result set excludes specific IDs.', 'invoicing' ),
+                'description' => __('Ensure result set excludes specific IDs.', 'invoicing'),
                 'type'        => 'array',
                 'items'       => array(
                     'type' => 'integer',
@@ -612,7 +612,7 @@ 
 
             // Order items by
             'orderby'  => array(
-                'description' => __( 'Sort items by object attribute.', 'invoicing' ),
+                'description' => __('Sort items by object attribute.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'date',
                 'enum'        => array(
@@ -628,15 +628,15 @@ 
 
             // How to order
             'order'    => array(
-                'description' => __( 'Order sort attribute ascending or descending.', 'invoicing' ),
+                'description' => __('Order sort attribute ascending or descending.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'DESC',
-                'enum'        => array( 'ASC', 'DESC' ),
+                'enum'        => array('ASC', 'DESC'),
 			),
 			
 			// Search term
             'search'                => array(
-				'description'       => __( 'Return items that match the search term.', 'invoicing' ),
+				'description'       => __('Return items that match the search term.', 'invoicing'),
 				'type'              => 'string',
             ),
         );
@@ -649,7 +649,7 @@ 
 		 *
 		 * @param array        $query_params JSON Schema-formatted collection parameters.
 		 */
-		return apply_filters( "wpinv_rest_items_collection_params", $query_params );
+		return apply_filters("wpinv_rest_items_collection_params", $query_params);
     }
     
     /**
@@ -660,7 +660,7 @@ 
 	 * @param object|string $post_type Post type name or object.
 	 * @return bool Whether the post type is allowed in REST.
 	 */
-	protected function check_is_post_type_allowed( $post_type ) {
+	protected function check_is_post_type_allowed($post_type) {
 		return true;
 	}
 
@@ -672,84 +672,84 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array|WP_Error Invoice Properties or WP_Error.
 	 */
-	protected function prepare_item_for_database( $request ) {
+	protected function prepare_item_for_database($request) {
 		$prepared_item = new stdClass();
 
 		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_item = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_item ) ) {
+		if (isset($request['id'])) {
+			$existing_item = $this->get_post($request['id']);
+			if (is_wp_error($existing_item)) {
 				return $existing_item;
 			}
 
-			$prepared_item->ID 		  = $existing_item->ID;
+			$prepared_item->ID = $existing_item->ID;
 		}
 
 		$schema = $this->get_item_schema();
 
 		// item title.
-		if ( ! empty( $schema['properties']['name'] ) && isset( $request['name'] ) ) {
-			$prepared_item->title = sanitize_text_field( $request['name'] );
+		if (!empty($schema['properties']['name']) && isset($request['name'])) {
+			$prepared_item->title = sanitize_text_field($request['name']);
 		}
 
 		// item summary.
-		if ( ! empty( $schema['properties']['summary'] ) && isset( $request['summary'] ) ) {
-			$prepared_item->excerpt = wp_kses_post( $request['summary'] );
+		if (!empty($schema['properties']['summary']) && isset($request['summary'])) {
+			$prepared_item->excerpt = wp_kses_post($request['summary']);
 		}
 
 		// item price.
-		if ( ! empty( $schema['properties']['price'] ) && isset( $request['price'] ) ) {
-			$prepared_item->price = floatval( $request['price'] );
+		if (!empty($schema['properties']['price']) && isset($request['price'])) {
+			$prepared_item->price = floatval($request['price']);
 		}
 
 		// minimum price (for dynamc items).
-		if ( ! empty( $schema['properties']['minimum_price'] ) && isset( $request['minimum_price'] ) ) {
-			$prepared_item->minimum_price = floatval( $request['minimum_price'] );
+		if (!empty($schema['properties']['minimum_price']) && isset($request['minimum_price'])) {
+			$prepared_item->minimum_price = floatval($request['minimum_price']);
 		}
 
 		// item status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
+		if (!empty($schema['properties']['status']) && isset($request['status'])) {
 			$prepared_item->status = 'publish' === $request['status'] ? 'publish' : 'pending';
 		}
 
 		// item type.
-		if ( ! empty( $schema['properties']['type'] ) && isset( $request['type'] ) ) {
-			$prepared_item->type = in_array( $request['type'], wpinv_item_types() ) ? trim( strtolower( $request['type'] ) ) : 'custom';
+		if (!empty($schema['properties']['type']) && isset($request['type'])) {
+			$prepared_item->type = in_array($request['type'], wpinv_item_types()) ? trim(strtolower($request['type'])) : 'custom';
 		}
 
 		// VAT rule.
-		if ( ! empty( $schema['properties']['vat_rule'] ) && isset( $request['vat_rule'] ) ) {
+		if (!empty($schema['properties']['vat_rule']) && isset($request['vat_rule'])) {
 			$prepared_item->vat_rule = 'digital' === $request['vat_rule'] ? 'digital' : 'physical';
 		}
 
 		// Simple strings.
-		foreach( array( 'custom_id', 'custom_name', 'custom_singular_name' ) as $property ) {
+		foreach (array('custom_id', 'custom_name', 'custom_singular_name') as $property) {
 
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = sanitize_text_field( $request[$property] );
+			if (!empty($schema['properties'][$property]) && isset($request[$property])) {
+				$prepared_item->$property = sanitize_text_field($request[$property]);
 			}
 
 		}
 
 		// Simple integers.
-		foreach( array( 'is_recurring', 'recurring_interval', 'recurring_limit', 'free_trial', 'trial_interval', 'dynamic_pricing', 'editable' ) as $property ) {
+		foreach (array('is_recurring', 'recurring_interval', 'recurring_limit', 'free_trial', 'trial_interval', 'dynamic_pricing', 'editable') as $property) {
 
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = intval( $request[$property] );
+			if (!empty($schema['properties'][$property]) && isset($request[$property])) {
+				$prepared_item->$property = intval($request[$property]);
 			}
 
 		}
 
 		// Time periods.
-		foreach( array( 'recurring_period',  'trial_period' ) as $property ) {
+		foreach (array('recurring_period', 'trial_period') as $property) {
 
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = in_array( $request[$property], array( 'D', 'W', 'M', 'Y' ) ) ? trim( strtoupper( $request[$property] ) ) : 'D';
+			if (!empty($schema['properties'][$property]) && isset($request[$property])) {
+				$prepared_item->$property = in_array($request[$property], array('D', 'W', 'M', 'Y')) ? trim(strtoupper($request[$property])) : 'D';
 			}
 
 		}
 
-		$item_data = (array) wp_unslash( $prepared_item );
+		$item_data = (array) wp_unslash($prepared_item);
 
 		/**
 		 * Filters an item before it is inserted via the REST API.
@@ -759,7 +759,7 @@ 
 		 * @param array        $item_data An array of item data
 		 * @param WP_REST_Request $request       Request object.
 		 */
-		return apply_filters( "wpinv_rest_pre_insert_item", $item_data, $request );
+		return apply_filters("wpinv_rest_pre_insert_item", $item_data, $request);
 
 	}
 
@@ -772,20 +772,20 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $item, $request ) {
+	public function prepare_item_for_response($item, $request) {
 
-		$GLOBALS['post'] = get_post( $item->get_ID() );
+		$GLOBALS['post'] = get_post($item->get_ID());
 
-		setup_postdata( $item->get_ID() );
+		setup_postdata($item->get_ID());
 
 		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
+		$fields = $this->get_fields_for_response($request);
 
 		// Base fields for every item.
 		$data = array();
 
 		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
+		if (rest_is_field_included('id', $fields)) {
 			$data['id'] = $item->get_ID();
 		}
 
@@ -798,49 +798,49 @@ 
 			'editable'
 		);
 
-		foreach( $item_properties as $property ) {
+		foreach ($item_properties as $property) {
 
-			if ( rest_is_field_included( $property, $fields ) && method_exists( $item, 'get_' . $property ) ) {
-				$data[$property] = call_user_func( array( $item, 'get_' . $property ) );
+			if (rest_is_field_included($property, $fields) && method_exists($item, 'get_' . $property)) {
+				$data[$property] = call_user_func(array($item, 'get_' . $property));
 			}
 
 		}
 
 		// Dynamic pricing.
-		if( $item->supports_dynamic_pricing() ) {
+		if ($item->supports_dynamic_pricing()) {
 
-			if( rest_is_field_included( 'dynamic_pricing', $fields ) ) {
+			if (rest_is_field_included('dynamic_pricing', $fields)) {
 				$data['dynamic_pricing'] = $item->get_is_dynamic_pricing();
 			}
 
-			if( rest_is_field_included( 'minimum_price', $fields ) ) {
+			if (rest_is_field_included('minimum_price', $fields)) {
 				$data['minimum_price'] = $item->get_minimum_price();
 			}
 		}
 
 		// Subscriptions.
-		if( rest_is_field_included( 'is_recurring', $fields ) ) {
+		if (rest_is_field_included('is_recurring', $fields)) {
 			$data['is_recurring'] = $item->get_is_recurring();
 		}
 
-		if( $item->is_recurring() ) {
+		if ($item->is_recurring()) {
 
-			$recurring_fields = array( 'is_recurring', 'recurring_period', 'recurring_interval', 'recurring_limit', 'free_trial' );
-			foreach( $recurring_fields as $field ) {
+			$recurring_fields = array('is_recurring', 'recurring_period', 'recurring_interval', 'recurring_limit', 'free_trial');
+			foreach ($recurring_fields as $field) {
 
-				if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
-					$data[$field] = call_user_func( array( $item, 'get_' . $field ) );
+				if (rest_is_field_included($field, $fields) && method_exists($item, 'get_' . $field)) {
+					$data[$field] = call_user_func(array($item, 'get_' . $field));
 				}
 	
 			}
 
-			if( $item->has_free_trial() ) {
+			if ($item->has_free_trial()) {
 
-				$trial_fields = array( 'trial_period', 'trial_interval' );
-				foreach( $trial_fields as $field ) {
+				$trial_fields = array('trial_period', 'trial_interval');
+				foreach ($trial_fields as $field) {
 
-					if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
-						$data[$field] = call_user_func( array( $item, 'get_' . $field ) );
+					if (rest_is_field_included($field, $fields) && method_exists($item, 'get_' . $field)) {
+						$data[$field] = call_user_func(array($item, 'get_' . $field));
 					}
 	
 				}
@@ -849,23 +849,23 @@ 
 
 		}
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		$context = !empty($request['context']) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object($data, $request);
+		$data    = $this->filter_response_by_context($data, $context);
 
 		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 
-		$links = $this->prepare_links( $item );
-		$response->add_links( $links );
+		$links = $this->prepare_links($item);
+		$response->add_links($links);
 
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $item, $request );
+		if (!empty($links['self']['href'])) {
+			$actions = $this->get_available_actions($item, $request);
 
 			$self = $links['self']['href'];
 
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
+			foreach ($actions as $rel) {
+				$response->add_link($rel, $self);
 			}
 		}
 
@@ -878,7 +878,7 @@ 
 		 * @param WPInv_Item    $item  The item object.
 		 * @param WP_REST_Request  $request  Request object.
 		 */
-		return apply_filters( "wpinv_rest_prepare_item", $response, $item, $request );
+		return apply_filters("wpinv_rest_prepare_item", $response, $item, $request);
 	}
 
 	/**
@@ -891,57 +891,57 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array Fields to be included in the response.
 	 */
-	public function get_fields_for_response( $request ) {
+	public function get_fields_for_response($request) {
 		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+		$properties = isset($schema['properties']) ? $schema['properties'] : array();
 
 		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
+		foreach ($additional_fields as $field_name => $field_options) {
 			// For back-compat, include any field with an empty schema
 			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
+			if (is_null($field_options['schema'])) {
+				$properties[$field_name] = $field_options;
 			}
 		}
 
 		// Exclude fields that specify a different context than the request context.
 		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
+		if ($context) {
+			foreach ($properties as $name => $options) {
+				if (!empty($options['context']) && !in_array($context, $options['context'], true)) {
+					unset($properties[$name]);
 				}
 			}
 		}
 
-		$fields = array_keys( $properties );
+		$fields = array_keys($properties);
 
-		if ( ! isset( $request['_fields'] ) ) {
+		if (!isset($request['_fields'])) {
 			return $fields;
 		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
+		$requested_fields = wpinv_parse_list($request['_fields']);
+		if (0 === count($requested_fields)) {
 			return $fields;
 		}
 		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
+		$requested_fields = array_map('trim', $requested_fields);
 		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
+		if (in_array('id', $fields, true)) {
 			$requested_fields[] = 'id';
 		}
 		// Return the list of all requested fields which appear in the schema.
 		return array_reduce(
 			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
+			function($response_fields, $field) use ($fields) {
+				if (in_array($field, $fields, true)) {
 					$response_fields[] = $field;
 					return $response_fields;
 				}
 				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
+				$nested_fields = explode('.', $field);
 				// A nested field is included so long as its top-level property is
 				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
+				if (in_array($nested_fields[0], $fields, true)) {
 					$response_fields[] = $field;
 				}
 				return $response_fields;
@@ -960,8 +960,8 @@ 
 	public function get_item_schema() {
 
 		// Maybe retrieve the schema from cache.
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
+		if ($this->schema) {
+			return $this->add_additional_fields_schema($this->schema);
 		}
 
 		$schema = array(
@@ -973,136 +973,136 @@ 
 			'properties' 		  => array(
 
 				'id'           => array(
-					'description' => __( 'Unique identifier for the item.', 'invoicing' ),
+					'description' => __('Unique identifier for the item.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'name'			  => array(
-					'description' => __( 'The name for the item.', 'invoicing' ),
+					'description' => __('The name for the item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'summary'        => array(
-					'description' => __( 'A summary for the item.', 'invoicing' ),
+					'description' => __('A summary for the item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'price'        => array(
-					'description' => __( 'The price for the item.', 'invoicing' ),
+					'description' => __('The price for the item.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'status'       => array(
-					'description' => __( 'A named status for the item.', 'invoicing' ),
+					'description' => __('A named status for the item.', 'invoicing'),
 					'type'        => 'string',
-					'enum'        => array_keys( get_post_stati( array( 'internal' => false ) ) ),
-					'context'     => array( 'view', 'edit' ),
+					'enum'        => array_keys(get_post_stati(array('internal' => false))),
+					'context'     => array('view', 'edit'),
 				),
 
 				'type'       => array(
-					'description' => __( 'The item type.', 'invoicing' ),
+					'description' => __('The item type.', 'invoicing'),
 					'type'        => 'string',
 					'enum'        => wpinv_item_types(),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'vat_rule'       => array(
-					'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
+					'description' => __('VAT rule applied to the item.', 'invoicing'),
 					'type'        => 'string',
-					'enum'        => array( 'digital', 'physical' ),
-					'context'     => array( 'view', 'edit' ),
+					'enum'        => array('digital', 'physical'),
+					'context'     => array('view', 'edit'),
 				),
 
 				'vat_class'       => array(
-					'description' => __( 'VAT class for the item.', 'invoicing' ),
+					'description' => __('VAT class for the item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 
 				'custom_id'       => array(
-					'description' => __( 'Custom id for the item.', 'invoicing' ),
+					'description' => __('Custom id for the item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				
 				'custom_name'       => array(
-					'description' => __( 'Custom name for the item.', 'invoicing' ),
+					'description' => __('Custom name for the item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'custom_singular_name'       => array(
-					'description' => __( 'Custom singular name for the item.', 'invoicing' ),
+					'description' => __('Custom singular name for the item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'dynamic_pricing'        => array(
-					'description' => __( 'Whether the item allows a user to set their own price.', 'invoicing' ),
+					'description' => __('Whether the item allows a user to set their own price.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'minimum_price'        => array(
-					'description' => __( 'For dynamic prices, this is the minimum price that a user can set.', 'invoicing' ),
+					'description' => __('For dynamic prices, this is the minimum price that a user can set.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'is_recurring'        => array(
-					'description' => __( 'Whether the item is a subscription item.', 'invoicing' ),
+					'description' => __('Whether the item is a subscription item.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'recurring_period'        => array(
-					'description' => __( 'The recurring period for a recurring item.', 'invoicing' ),
+					'description' => __('The recurring period for a recurring item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'enum'        => array( 'D', 'W', 'M', 'Y' ),
+					'context'     => array('view', 'edit', 'embed'),
+					'enum'        => array('D', 'W', 'M', 'Y'),
 				),
 
 				'recurring_interval'        => array(
-					'description' => __( 'The recurring interval for a subscription item.', 'invoicing' ),
+					'description' => __('The recurring interval for a subscription item.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'recurring_limit'        => array(
-					'description' => __( 'The maximum number of renewals for a subscription item.', 'invoicing' ),
+					'description' => __('The maximum number of renewals for a subscription item.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'free_trial'        => array(
-					'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
+					'description' => __('Whether the item has a free trial period.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'trial_period'        => array(
-					'description' => __( 'The trial period of a recurring item.', 'invoicing' ),
+					'description' => __('The trial period of a recurring item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'enum'        => array( 'D', 'W', 'M', 'Y' ),
+					'context'     => array('view', 'edit', 'embed'),
+					'enum'        => array('D', 'W', 'M', 'Y'),
 				),
 
 				'trial_interval'        => array(
-					'description' => __( 'The trial interval for a subscription item.', 'invoicing' ),
+					'description' => __('The trial interval for a subscription item.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'editable'        => array(
-					'description' => __( 'Whether or not the item is editable.', 'invoicing' ),
+					'description' => __('Whether or not the item is editable.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 				),
 
 			),
@@ -1120,12 +1120,12 @@ 
 		 *
 		 * @param array   $schema    The item schema.
 		 */
-        $schema = apply_filters( "wpinv_rest_item_schema", $schema );
+        $schema = apply_filters("wpinv_rest_item_schema", $schema);
 
 		//  Cache the item schema.
 		$this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
+		return $this->add_additional_fields_schema($this->schema);
 	}
 
 	/**
@@ -1137,20 +1137,20 @@ 
 	 */
 	protected function get_schema_links() {
 
-		$href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
+		$href = rest_url("{$this->namespace}/{$this->rest_base}/{id}");
 
 		$links = array();
 
 		$links[] = array(
 			'rel'          => 'https://api.w.org/action-publish',
-			'title'        => __( 'The current user can publish this item.' ),
+			'title'        => __('The current user can publish this item.'),
 			'href'         => $href,
 			'targetSchema' => array(
 				'type'       => 'object',
 				'properties' => array(
 					'status' => array(
 						'type' => 'string',
-						'enum' => array( 'publish', 'future' ),
+						'enum' => array('publish', 'future'),
 					),
 				),
 			),
@@ -1167,18 +1167,18 @@ 
 	 * @param WPInv_Item $item Item Object.
 	 * @return array Links for the given item.
 	 */
-	protected function prepare_links( $item ) {
+	protected function prepare_links($item) {
 
 		// Prepare the base REST API endpoint for items.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+		$base = sprintf('%s/%s', $this->namespace, $this->rest_base);
 
 		// Entity meta.
 		$links = array(
 			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $item->ID ),
+				'href' => rest_url(trailingslashit($base) . $item->ID),
 			),
 			'collection' => array(
-				'href' => rest_url( $base ),
+				'href' => rest_url($base),
 			),
 		);
 
@@ -1191,7 +1191,7 @@ 
 		 *
 		 * @param array   $links    Rest links.
 		 */
-		return apply_filters( "wpinv_rest_item_links", $links );
+		return apply_filters("wpinv_rest_item_links", $links);
 
 	}
 
@@ -1204,19 +1204,19 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array List of link relations.
 	 */
-	protected function get_available_actions( $item, $request ) {
+	protected function get_available_actions($item, $request) {
 
-		if ( 'edit' !== $request['context'] ) {
+		if ('edit' !== $request['context']) {
 			return array();
 		}
 
 		$rels = array();
 
 		// Retrieve the post type object.
-		$post_type = get_post_type_object( $item->post_type );
+		$post_type = get_post_type_object($item->post_type);
 
 		// Mark item as published.
-		if ( current_user_can( $post_type->cap->publish_posts ) ) {
+		if (current_user_can($post_type->cap->publish_posts)) {
 			$rels[] = 'https://api.w.org/action-publish';
 		}
 
@@ -1229,7 +1229,7 @@ 
 		 *
 		 * @param array   $rels    Available link relations.
 		 */
-		return apply_filters( "wpinv_rest_item_link_relations", $rels );
+		return apply_filters("wpinv_rest_item_link_relations", $rels);
 	}
 
 	/**
@@ -1241,7 +1241,7 @@ 
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_item_types() {
-		return rest_ensure_response( wpinv_get_item_types() );
+		return rest_ensure_response(wpinv_get_item_types());
 	}
 
     

includes/class-wpinv-api.php

Indentation +6 added lines, -6 removed lines

@@ -52,14 +52,14 @@
     }
 
 
-	/**
-	 * Registers routes
-	 *
+    /**
+     * Registers routes
+     *
      * @since 1.0.13
-	 */
-	public function register_rest_routes() {
+     */
+    public function register_rest_routes() {
 
-		// Invoices.
+        // Invoices.
         $this->invoices_controller->register_routes();
         
         // Items.

Spacing +9 added lines, -9 removed lines

@@ -7,7 +7,7 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -19,7 +19,7 @@ 
     /**
      * @param string A prefix for our REST routes
      */
-    public $api_namespace    = '';
+    public $api_namespace = '';
 
     /**
      * @param WPInv_REST_Invoice_Controller Invoices controller
@@ -37,18 +37,18 @@ 
      * @since 1.0.13
      * Sets the API namespace and inits hooks
      */
-    public function __construct( $api_namespace = 'invoicing/v1' ) {
+    public function __construct($api_namespace = 'invoicing/v1') {
 
         // Include controllers and related files
         $this->includes();
 
         // Set up class variables
-        $this->api_namespace       = apply_filters( 'wpinv_rest_api_namespace', $api_namespace );
-        $this->invoices_controller = new WPInv_REST_Invoice_Controller( $this->api_namespace );
-        $this->items_controller    = new WPInv_REST_Items_Controller( $this->api_namespace );
+        $this->api_namespace       = apply_filters('wpinv_rest_api_namespace', $api_namespace);
+        $this->invoices_controller = new WPInv_REST_Invoice_Controller($this->api_namespace);
+        $this->items_controller    = new WPInv_REST_Items_Controller($this->api_namespace);
 
         //Register REST routes
-        add_action( 'rest_api_init', array( $this, 'register_rest_routes' ) );
+        add_action('rest_api_init', array($this, 'register_rest_routes'));
     }
 
 
@@ -76,10 +76,10 @@ 
     protected function includes() {
         
         // Invoices
-        require_once( WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-invoice-controller.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-invoice-controller.php');
 
         // Items
-        require_once( WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-items-controller.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-items-controller.php');
 
     }
     

includes/api/class-wpinv-rest-invoice-controller.php

Indentation +1114 added lines, -1114 removed lines

@@ -20,31 +20,31 @@ 
 class WPInv_REST_Invoice_Controller extends WP_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
-	protected $post_type = 'wpi_invoice';
+     * Post type.
+     *
+     * @var string
+     */
+    protected $post_type = 'wpi_invoice';
 	
-	/**
-	 * Cached results of get_item_schema.
-	 *
-	 * @since 1.0.13
-	 * @var array
-	 */
-	protected $schema;
+    /**
+     * Cached results of get_item_schema.
+     *
+     * @since 1.0.13
+     * @var array
+     */
+    protected $schema;
 
     /**
-	 * Constructor.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $namespace Api Namespace
-	 */
-	public function __construct( $namespace ) {
+     * Constructor.
+     *
+     * @since 1.0.13
+     *
+     * @param string $namespace Api Namespace
+     */
+    public function __construct( $namespace ) {
         
         // Set api namespace...
-		$this->namespace = $namespace;
+        $this->namespace = $namespace;
 
         // ... and the rest base
         $this->rest_base = 'invoices';
@@ -52,39 +52,39 @@ 
     }
     
     /**
-	 * Checks if a given request has access to read invoices.
+     * Checks if a given request has access to read invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
-	 */
-	public function get_items_permissions_check( $request ) {
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+     */
+    public function get_items_permissions_check( $request ) {
 	
         $post_type = get_post_type_object( $this->post_type );
 
-		if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
-			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit invoices.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
+        if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
+            return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit invoices.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
 
-		// Read checks will be evaluated on a per invoice basis
+        // Read checks will be evaluated on a per invoice basis
 
-		return true;
+        return true;
 
     }
     
     /**
-	 * Retrieves a collection of invoices.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_items( $request ) {
+     * Retrieves a collection of invoices.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_items( $request ) {
 		
-		// Retrieve the list of registered invoice query parameters.
+        // Retrieve the list of registered invoice query parameters.
         $registered = $this->get_collection_params();
         
         $args       = array();
@@ -97,54 +97,54 @@ 
 
         }
 
-		/**
-		 * Filters the wpinv_get_invoices arguments for invoices requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $args    Key value array of query var to query value.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        /**
+         * Filters the wpinv_get_invoices arguments for invoices requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $args    Key value array of query var to query value.
+         * @param WP_REST_Request $request The request used.
+         */
         $args       = apply_filters( "wpinv_rest_get_invoices_arguments", $args, $request, $this );
 		
-		// Special args
-		$args[ 'return' ]   = 'objects';
-		$args[ 'paginate' ] = true;
+        // Special args
+        $args[ 'return' ]   = 'objects';
+        $args[ 'paginate' ] = true;
 
         // Run the query.
-		$query = wpinv_get_invoices( $args );
+        $query = wpinv_get_invoices( $args );
 		
-		// Prepare the retrieved invoices
-		$invoices = array();
-		foreach( $query->invoices as $invoice ) {
-
-			if ( ! $this->check_read_permission( $invoice ) ) {
-				continue;
-			}
-
-			$data       = $this->prepare_item_for_response( $invoice, $request );
-			$invoices[] = $this->prepare_response_for_collection( $data );
-
-		}
-
-		// Prepare the response.
-		$response = rest_ensure_response( $invoices );
-		$response->header( 'X-WP-Total', (int) $query->total );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
-
-		/**
-		 * Filters the responses for invoices requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param arrWP_REST_Response $response    Response object.
-		 * @param WP_REST_Request     $request The request used.
+        // Prepare the retrieved invoices
+        $invoices = array();
+        foreach( $query->invoices as $invoice ) {
+
+            if ( ! $this->check_read_permission( $invoice ) ) {
+                continue;
+            }
+
+            $data       = $this->prepare_item_for_response( $invoice, $request );
+            $invoices[] = $this->prepare_response_for_collection( $data );
+
+        }
+
+        // Prepare the response.
+        $response = rest_ensure_response( $invoices );
+        $response->header( 'X-WP-Total', (int) $query->total );
+        $response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+
+        /**
+         * Filters the responses for invoices requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param arrWP_REST_Response $response    Response object.
+         * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the invoices
-		 */
+         */
         $response       = apply_filters( "wpinv_rest_invoices_response", $response, $request, $args );
 
         return rest_ensure_response( $response );
@@ -152,25 +152,25 @@ 
     }
 
     /**
-	 * Get the post, if the ID is valid.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param int $invoice_id Supplied ID.
-	 * @return WPInv_Invoice|WP_Error Invoice object if ID is valid, WP_Error otherwise.
-	 */
-	protected function get_post( $invoice_id ) {
+     * Get the post, if the ID is valid.
+     *
+     * @since 1.0.13
+     *
+     * @param int $invoice_id Supplied ID.
+     * @return WPInv_Invoice|WP_Error Invoice object if ID is valid, WP_Error otherwise.
+     */
+    protected function get_post( $invoice_id ) {
 		
-		$error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid invoice ID.', 'invoicing' ), array( 'status' => 404 ) );
+        $error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid invoice ID.', 'invoicing' ), array( 'status' => 404 ) );
 
         // Ids start from 1
         if ( (int) $invoice_id <= 0 ) {
-			return $error;
-		}
+            return $error;
+        }
 
-		$invoice = wpinv_get_invoice( (int) $invoice_id );
-		if ( empty( $invoice ) ) {
-			return $error;
+        $invoice = wpinv_get_invoice( (int) $invoice_id );
+        if ( empty( $invoice ) ) {
+            return $error;
         }
 
         return $invoice;
@@ -178,77 +178,77 @@ 
     }
 
     /**
-	 * Checks if a given request has access to read an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the invoice, WP_Error object otherwise.
-	 */
-	public function get_item_permissions_check( $request ) {
+     * Checks if a given request has access to read an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return bool|WP_Error True if the request has read access for the invoice, WP_Error object otherwise.
+     */
+    public function get_item_permissions_check( $request ) {
 
         // Retrieve the invoice object.
         $invoice = $this->get_post( $request['id'] );
         
         // Ensure it is valid.
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
 
-		if ( $invoice ) {
-			return $this->check_read_permission( $invoice );
-		}
+        if ( $invoice ) {
+            return $this->check_read_permission( $invoice );
+        }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Checks if an invoice can be read.
-	 * 
-	 * An invoice can be read by site admins and owners of the invoice
-	 *
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @return bool Whether the post can be read.
-	 */
-	public function check_read_permission( $invoice ) {
-		return wpinv_user_can_view_invoice( $invoice->ID );
+     * Checks if an invoice can be read.
+     * 
+     * An invoice can be read by site admins and owners of the invoice
+     *
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @return bool Whether the post can be read.
+     */
+    public function check_read_permission( $invoice ) {
+        return wpinv_user_can_view_invoice( $invoice->ID );
     }
     
     /**
-	 * Retrieves a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item( $request ) {
+     * Retrieves a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_item( $request ) {
 
         // Fetch the invoice.
         $invoice = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
-		$response->link_header( 'alternate', esc_url( $invoice->get_view_url() ), array( 'type' => 'text/html' ) );
-
-		/**
-		 * Filters the responses for single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 * @var WP_HTTP_Response
-		 *
-		 * @param WP_HTTP_Response $response Response.
-		 * @param WP_REST_Request  $request The request used.
-		 */
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $invoice, $request );
+        $response->link_header( 'alternate', esc_url( $invoice->get_view_url() ), array( 'type' => 'text/html' ) );
+
+        /**
+         * Filters the responses for single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         * @var WP_HTTP_Response
+         *
+         * @param WP_HTTP_Response $response Response.
+         * @param WP_REST_Request  $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_get_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
@@ -256,23 +256,23 @@ 
     }
     
     /**
-	 * Checks if a given request has access to create an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
-	 */
-	public function create_item_permissions_check( $request ) {
+     * Checks if a given request has access to create an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
+     */
+    public function create_item_permissions_check( $request ) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		$post_type = get_post_type_object( $this->post_type );
+        $post_type = get_post_type_object( $this->post_type );
 
-		if ( ! current_user_can( $post_type->cap->create_posts ) ) {
-			return new WP_Error( 
+        if ( ! current_user_can( $post_type->cap->create_posts ) ) {
+            return new WP_Error( 
                 'rest_cannot_create', 
                 __( 'Sorry, you are not allowed to create invoices as this user.', 'invoicing' ), 
                 array( 
@@ -281,88 +281,88 @@ 
             );
         }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Creates a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function create_item( $request ) {
-
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+     * Creates a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function create_item( $request ) {
+
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$invoice_data = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $invoice_data = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $invoice_data ) ) {
-			return $invoice_data;
-		}
+        if ( is_wp_error( $invoice_data ) ) {
+            return $invoice_data;
+        }
 
-		// Try creating the invoice
+        // Try creating the invoice
         $invoice = wpinv_insert_invoice( $invoice_data, true );
 
-		if ( is_wp_error( $invoice ) ) {
+        if ( is_wp_error( $invoice ) ) {
             return $invoice;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
-
-		/**
-		 * Fires after a single invoice is created or updated via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPinv_Invoice   $invoice  Inserted or updated invoice object.
-		 * @param WP_REST_Request $request  Request object.
-		 * @param bool            $creating True when creating a post, false when updating.
-		 */
-		do_action( "wpinv_rest_insert_invoice", $invoice, $request, true );
-
-		/**
-		 * Filters the responses for creating single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $invoice_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $invoice, $request );
+
+        /**
+         * Fires after a single invoice is created or updated via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param WPinv_Invoice   $invoice  Inserted or updated invoice object.
+         * @param WP_REST_Request $request  Request object.
+         * @param bool            $creating True when creating a post, false when updating.
+         */
+        do_action( "wpinv_rest_insert_invoice", $invoice, $request, true );
+
+        /**
+         * Filters the responses for creating single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $invoice_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_create_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to update an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
-	 */
-	public function update_item_permissions_check( $request ) {
-
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
-
-		$post_type = get_post_type_object( $this->post_type );
-
-		if ( ! current_user_can(  $post_type->cap->edit_post, $invoice->ID  ) ) {
-			return new WP_Error( 
+    }
+
+    /**
+     * Checks if a given request has access to update an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
+     */
+    public function update_item_permissions_check( $request ) {
+
+        // Retrieve the invoice.
+        $invoice = $this->get_post( $request['id'] );
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
+
+        $post_type = get_post_type_object( $this->post_type );
+
+        if ( ! current_user_can(  $post_type->cap->edit_post, $invoice->ID  ) ) {
+            return new WP_Error( 
                 'rest_cannot_edit', 
                 __( 'Sorry, you are not allowed to update this invoice.', 'invoicing' ), 
                 array( 
@@ -371,162 +371,162 @@ 
             );
         }
 
-		return true;
-	}
-
-	/**
-	 * Updates a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function update_item( $request ) {
+        return true;
+    }
+
+    /**
+     * Updates a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function update_item( $request ) {
 		
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         $valid_check = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
-			return $valid_check;
-		}
+        if ( is_wp_error( $valid_check ) ) {
+            return $valid_check;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $data_to_update = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $data_to_update ) ) {
-			return $data_to_update;
-		}
+        if ( is_wp_error( $data_to_update ) ) {
+            return $data_to_update;
+        }
 
-		// Abort if no invoice data is provided
+        // Abort if no invoice data is provided
         if( empty( $data_to_update ) ) {
             return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
         }
 
-		// Include the invoice ID
-		$data_to_update['ID'] = $request['id'];
-
-		// Update the invoice
-		$updated_invoice = wpinv_update_invoice( $data_to_update, true );
-
-		// Incase the update operation failed...
-		if ( is_wp_error( $updated_invoice ) ) {
-			return $updated_invoice;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_invoice, $request );
-
-		/** This action is documented in includes/class-wpinv-rest-invoice-controller.php */
-		do_action( "wpinv_rest_insert_invoice", $updated_invoice, $request, false );
-
-		/**
-		 * Filters the responses for updating single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $invoice_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        // Include the invoice ID
+        $data_to_update['ID'] = $request['id'];
+
+        // Update the invoice
+        $updated_invoice = wpinv_update_invoice( $data_to_update, true );
+
+        // Incase the update operation failed...
+        if ( is_wp_error( $updated_invoice ) ) {
+            return $updated_invoice;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $updated_invoice, $request );
+
+        /** This action is documented in includes/class-wpinv-rest-invoice-controller.php */
+        do_action( "wpinv_rest_insert_invoice", $updated_invoice, $request, false );
+
+        /**
+         * Filters the responses for updating single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $invoice_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_update_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to delete an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to delete the invoice, WP_Error object otherwise.
-	 */
-	public function delete_item_permissions_check( $request ) {
-
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
-
-		// Ensure the current user can delete invoices
-		if ( wpinv_current_user_can_manage_invoicing() ||  current_user_can( 'delete_invoices', $request['id'] ) ) {
-			return new WP_Error( 
+    }
+
+    /**
+     * Checks if a given request has access to delete an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to delete the invoice, WP_Error object otherwise.
+     */
+    public function delete_item_permissions_check( $request ) {
+
+        // Retrieve the invoice.
+        $invoice = $this->get_post( $request['id'] );
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
+
+        // Ensure the current user can delete invoices
+        if ( wpinv_current_user_can_manage_invoicing() ||  current_user_can( 'delete_invoices', $request['id'] ) ) {
+            return new WP_Error( 
                 'rest_cannot_delete', 
                 __( 'Sorry, you are not allowed to delete this invoice.', 'invoicing' ), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
             );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function delete_item( $request ) {
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function delete_item( $request ) {
 		
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
+        // Retrieve the invoice.
+        $invoice = $this->get_post( $request['id'] );
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the invoice id
-		$id    = $invoice->ID;
+        // Prepare the invoice id
+        $id    = $invoice->ID;
 
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $invoice, $request );
 
-		// Check if the user wants to bypass the trash...
-		$force_delete = (bool) $request['force'];
+        // Check if the user wants to bypass the trash...
+        $force_delete = (bool) $request['force'];
 
-		// Try deleting the invoice.
-		$deleted = wp_delete_post( $id, $force_delete );
+        // Try deleting the invoice.
+        $deleted = wp_delete_post( $id, $force_delete );
 
-		// Abort early if we can't delete the invoice.
-		if ( ! $deleted ) {
-			return new WP_Error( 'rest_cannot_delete', __( 'The invoice cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
-		}
+        // Abort early if we can't delete the invoice.
+        if ( ! $deleted ) {
+            return new WP_Error( 'rest_cannot_delete', __( 'The invoice cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+        }
 
-		/**
-		 * Fires immediately after a single invoice is deleted or trashed via the REST API.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPInv_Invoice    $invoice  The deleted or trashed invoice.
-		 * @param WP_REST_Request  $request  The request sent to the API.
-		 */
-		do_action( "wpinv_rest_delete_invoice", $invoice, $request );
+        /**
+         * Fires immediately after a single invoice is deleted or trashed via the REST API.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param WPInv_Invoice    $invoice  The deleted or trashed invoice.
+         * @param WP_REST_Request  $request  The request sent to the API.
+         */
+        do_action( "wpinv_rest_delete_invoice", $invoice, $request );
 
-		return $response;
+        return $response;
 
-	}
+    }
     
     
     /**
-	 * Retrieves the query params for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
+     * Retrieves the query params for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
         
         $query_params               = array(
 
@@ -544,22 +544,22 @@ 
 
             // User.
             'user'                  => array(
-				'description'       => __( 'Limit result set to invoices for a specif user.', 'invoicing' ),
-				'type'              => 'integer',
+                'description'       => __( 'Limit result set to invoices for a specif user.', 'invoicing' ),
+                'type'              => 'integer',
             ),
             
             // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of invoices to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+                'description'       => __( 'Number of invoices to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => (int) get_option( 'posts_per_page' ),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => 1,
+                'description'       => __( 'Current page to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => 1,
             ),
 
             // Exclude certain invoices
@@ -595,789 +595,789 @@ 
             ),
         );
 
-		/**
-		 * Filter collection parameters for the invoices controller.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $query_params JSON Schema-formatted collection parameters.
-		 */
-		return apply_filters( "wpinv_rest_invoices_collection_params", $query_params );
+        /**
+         * Filter collection parameters for the invoices controller.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param array        $query_params JSON Schema-formatted collection parameters.
+         */
+        return apply_filters( "wpinv_rest_invoices_collection_params", $query_params );
     }
     
     /**
-	 * Checks if a given post type can be viewed or managed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param object|string $post_type Post type name or object.
-	 * @return bool Whether the post type is allowed in REST.
-	 */
-	protected function check_is_post_type_allowed( $post_type ) {
-		return true;
-	}
-
-	/**
-	 * Prepares a single invoice for create or update.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array|WP_Error Invoice Properties or WP_Error.
-	 */
-	protected function prepare_item_for_database( $request ) {
-		$prepared_invoice = new stdClass();
-
-		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_invoice = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_invoice ) ) {
-				return $existing_invoice;
-			}
-
-			$prepared_invoice->ID 		  = $existing_invoice->ID;
-			$prepared_invoice->invoice_id = $existing_invoice->ID;
-		}
-
-		$schema = $this->get_item_schema();
-
-		// Invoice owner.
-		if ( ! empty( $schema['properties']['user_id'] ) && isset( $request['user_id'] ) ) {
-			$prepared_invoice->user_id = (int) $request['user_id'];
-		}
-
-		// Cart details.
-		if ( ! empty( $schema['properties']['cart_details'] ) && isset( $request['cart_details'] ) ) {
-			$prepared_invoice->cart_details = (array) $request['cart_details'];
-		}
-
-		// Invoice status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
-
-			if ( in_array( $request['status'], array_keys( wpinv_get_invoice_statuses( true, true ) ), true ) ) {
-				$prepared_invoice->status = $request['status'];
-			}
-
-		}
-
-		// User info
-		if ( ! empty( $schema['properties']['user_info'] ) && isset( $request['user_info'] ) ) {
-			$prepared_invoice->user_info = array();
-			$user_info = (array) $request['user_info'];
-
-			foreach( $user_info as $prop => $value ) {
-
-				if ( ! empty( $schema['properties']['user_info']['properties'][$prop] ) ) {
-
-					$prepared_invoice->user_info[$prop] = $value;
+     * Checks if a given post type can be viewed or managed.
+     *
+     * @since 1.0.13
+     *
+     * @param object|string $post_type Post type name or object.
+     * @return bool Whether the post type is allowed in REST.
+     */
+    protected function check_is_post_type_allowed( $post_type ) {
+        return true;
+    }
+
+    /**
+     * Prepares a single invoice for create or update.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array|WP_Error Invoice Properties or WP_Error.
+     */
+    protected function prepare_item_for_database( $request ) {
+        $prepared_invoice = new stdClass();
+
+        // Post ID.
+        if ( isset( $request['id'] ) ) {
+            $existing_invoice = $this->get_post( $request['id'] );
+            if ( is_wp_error( $existing_invoice ) ) {
+                return $existing_invoice;
+            }
+
+            $prepared_invoice->ID 		  = $existing_invoice->ID;
+            $prepared_invoice->invoice_id = $existing_invoice->ID;
+        }
+
+        $schema = $this->get_item_schema();
+
+        // Invoice owner.
+        if ( ! empty( $schema['properties']['user_id'] ) && isset( $request['user_id'] ) ) {
+            $prepared_invoice->user_id = (int) $request['user_id'];
+        }
+
+        // Cart details.
+        if ( ! empty( $schema['properties']['cart_details'] ) && isset( $request['cart_details'] ) ) {
+            $prepared_invoice->cart_details = (array) $request['cart_details'];
+        }
+
+        // Invoice status.
+        if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
+
+            if ( in_array( $request['status'], array_keys( wpinv_get_invoice_statuses( true, true ) ), true ) ) {
+                $prepared_invoice->status = $request['status'];
+            }
+
+        }
+
+        // User info
+        if ( ! empty( $schema['properties']['user_info'] ) && isset( $request['user_info'] ) ) {
+            $prepared_invoice->user_info = array();
+            $user_info = (array) $request['user_info'];
+
+            foreach( $user_info as $prop => $value ) {
+
+                if ( ! empty( $schema['properties']['user_info']['properties'][$prop] ) ) {
+
+                    $prepared_invoice->user_info[$prop] = $value;
 		
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		// IP
-		if ( ! empty( $schema['properties']['ip'] ) && isset( $request['ip'] ) ) {
-			$prepared_invoice->ip = $request['ip'];
-		}
+        // IP
+        if ( ! empty( $schema['properties']['ip'] ) && isset( $request['ip'] ) ) {
+            $prepared_invoice->ip = $request['ip'];
+        }
 
-		// Payment details
-		$prepared_invoice->payment_details = array();
+        // Payment details
+        $prepared_invoice->payment_details = array();
 
-		if ( ! empty( $schema['properties']['gateway'] ) && isset( $request['gateway'] ) ) {
-			$prepared_invoice->payment_details['gateway'] = $request['gateway'];
-		}
+        if ( ! empty( $schema['properties']['gateway'] ) && isset( $request['gateway'] ) ) {
+            $prepared_invoice->payment_details['gateway'] = $request['gateway'];
+        }
 
-		if ( ! empty( $schema['properties']['gateway_title'] ) && isset( $request['gateway_title'] ) ) {
-			$prepared_invoice->payment_details['gateway_title'] = $request['gateway_title'];
-		}
+        if ( ! empty( $schema['properties']['gateway_title'] ) && isset( $request['gateway_title'] ) ) {
+            $prepared_invoice->payment_details['gateway_title'] = $request['gateway_title'];
+        }
 
-		if ( ! empty( $schema['properties']['currency'] ) && isset( $request['currency'] ) ) {
-			$prepared_invoice->payment_details['currency'] = $request['currency'];
-		}
+        if ( ! empty( $schema['properties']['currency'] ) && isset( $request['currency'] ) ) {
+            $prepared_invoice->payment_details['currency'] = $request['currency'];
+        }
 
-		if ( ! empty( $schema['properties']['transaction_id'] ) && isset( $request['transaction_id'] ) ) {
-			$prepared_invoice->payment_details['transaction_id'] = $request['transaction_id'];
-		}
+        if ( ! empty( $schema['properties']['transaction_id'] ) && isset( $request['transaction_id'] ) ) {
+            $prepared_invoice->payment_details['transaction_id'] = $request['transaction_id'];
+        }
 
-		// Dates
-		if ( ! empty( $schema['properties']['date'] ) && isset( $request['date'] ) ) {
-			$post_date = rest_get_date_with_gmt( $request['date'] );
+        // Dates
+        if ( ! empty( $schema['properties']['date'] ) && isset( $request['date'] ) ) {
+            $post_date = rest_get_date_with_gmt( $request['date'] );
 
-			if ( ! empty( $post_date ) ) {
-				$prepared_invoice->post_date = $post_date[0];
-			}
+            if ( ! empty( $post_date ) ) {
+                $prepared_invoice->post_date = $post_date[0];
+            }
 			
-		}
+        }
 
-		if ( ! empty( $schema['properties']['due_date'] ) && isset( $request['due_date'] ) ) {
-			$due_date = rest_get_date_with_gmt( $request['due_date'] );
+        if ( ! empty( $schema['properties']['due_date'] ) && isset( $request['due_date'] ) ) {
+            $due_date = rest_get_date_with_gmt( $request['due_date'] );
 
-			if ( ! empty( $due_date ) ) {
-				$prepared_invoice->due_date = $due_date[0];
-			}
+            if ( ! empty( $due_date ) ) {
+                $prepared_invoice->due_date = $due_date[0];
+            }
 
-		}
+        }
 
-		$invoice_data = (array) wp_unslash( $prepared_invoice );
+        $invoice_data = (array) wp_unslash( $prepared_invoice );
 
-		/**
-		 * Filters an invoice before it is inserted via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $invoice_data An array of invoice data
-		 * @param WP_REST_Request $request       Request object.
-		 */
-		return apply_filters( "wpinv_rest_pre_insert_invoice", $invoice_data, $request );
+        /**
+         * Filters an invoice before it is inserted via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param array        $invoice_data An array of invoice data
+         * @param WP_REST_Request $request       Request object.
+         */
+        return apply_filters( "wpinv_rest_pre_insert_invoice", $invoice_data, $request );
 
-	}
+    }
+
+    /**
+     * Prepares a single invoice output for response.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice   $invoice    Invoice object.
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response Response object.
+     */
+    public function prepare_item_for_response( $invoice, $request ) {
 
-	/**
-	 * Prepares a single invoice output for response.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice   $invoice    Invoice object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response Response object.
-	 */
-	public function prepare_item_for_response( $invoice, $request ) {
+        $GLOBALS['post'] = get_post( $invoice->ID );
 
-		$GLOBALS['post'] = get_post( $invoice->ID );
+        setup_postdata( $invoice->ID );
 
-		setup_postdata( $invoice->ID );
+        // Fetch the fields to include in this response.
+        $fields = $this->get_fields_for_response( $request );
 
-		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
+        // Base fields for every invoice.
+        $data = array();
+
+        // Set up ID
+        if ( rest_is_field_included( 'id', $fields ) ) {
+            $data['id'] = $invoice->ID;
+        }
+
+
+        // Basic properties
+        $invoice_properties = array(
+            'title', 'email', 'ip', 
+            'key', 'number', 'transaction_id', 'mode',
+            'gateway', 'gateway_title',
+            'total', 'discount', 'discount_code', 
+            'tax', 'fees_total', 'subtotal', 'currency',
+            'status', 'status_nicename', 'post_type'
+        );
+
+        foreach( $invoice_properties as $property ) {
+
+            if ( rest_is_field_included( $property, $fields ) ) {
+                $data[$property] = $invoice->get( $property );
+            }
+
+        }
+
+        // Cart details
+        if ( rest_is_field_included( 'cart_details', $fields ) ) {
+            $data['cart_details'] = $invoice->get( 'cart_details' );
+        }
+
+        //Dates
+        $invoice_properties = array( 'date', 'due_date', 'completed_date' );
+
+        foreach( $invoice_properties as $property ) {
+
+            if ( rest_is_field_included( $property, $fields ) ) {
+                $data[$property] = $this->prepare_date_response( '0000-00-00 00:00:00', $invoice->get( $property ) );
+            }
+
+        }
+
+        // User id
+        if ( rest_is_field_included( 'user_id', $fields ) ) {
+            $data['user_id'] = (int) $invoice->get( 'user_id' );
+        }
+
+        // User info
+        $user_info = array( 'first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone' );
+
+        foreach( $user_info as $property ) {
+
+            if ( rest_is_field_included( "user_info.$property", $fields ) ) {
+                $data['user_info'][$property] = $invoice->get( $property );
+            }
+
+        }
+
+        // Slug
+        if ( rest_is_field_included( 'slug', $fields ) ) {
+            $data['slug'] = $invoice->get( 'post_name' );
+        }
+
+        // View invoice link
+        if ( rest_is_field_included( 'link', $fields ) ) {
+            $data['link'] = esc_url( $invoice->get_view_url() );
+        }
 
-		// Base fields for every invoice.
-		$data = array();
 
-		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
-			$data['id'] = $invoice->ID;
-		}
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
 
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
 
-		// Basic properties
-		$invoice_properties = array(
-			'title', 'email', 'ip', 
-			'key', 'number', 'transaction_id', 'mode',
-			'gateway', 'gateway_title',
-			'total', 'discount', 'discount_code', 
-			'tax', 'fees_total', 'subtotal', 'currency',
-			'status', 'status_nicename', 'post_type'
-		);
-
-		foreach( $invoice_properties as $property ) {
-
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $invoice->get( $property );
-			}
-
-		}
-
-		// Cart details
-		if ( rest_is_field_included( 'cart_details', $fields ) ) {
-			$data['cart_details'] = $invoice->get( 'cart_details' );
-		}
-
-		//Dates
-		$invoice_properties = array( 'date', 'due_date', 'completed_date' );
-
-		foreach( $invoice_properties as $property ) {
-
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $this->prepare_date_response( '0000-00-00 00:00:00', $invoice->get( $property ) );
-			}
-
-		}
-
-		// User id
-		if ( rest_is_field_included( 'user_id', $fields ) ) {
-			$data['user_id'] = (int) $invoice->get( 'user_id' );
-		}
-
-		// User info
-		$user_info = array( 'first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone' );
-
-		foreach( $user_info as $property ) {
-
-			if ( rest_is_field_included( "user_info.$property", $fields ) ) {
-				$data['user_info'][$property] = $invoice->get( $property );
-			}
-
-		}
-
-		// Slug
-		if ( rest_is_field_included( 'slug', $fields ) ) {
-			$data['slug'] = $invoice->get( 'post_name' );
-		}
-
-		// View invoice link
-		if ( rest_is_field_included( 'link', $fields ) ) {
-			$data['link'] = esc_url( $invoice->get_view_url() );
-		}
-
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-
-		$links = $this->prepare_links( $invoice );
-		$response->add_links( $links );
-
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $invoice, $request );
-
-			$self = $links['self']['href'];
-
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
-			}
-		}
-
-		/**
-		 * Filters the invoice data for a response.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WP_REST_Response $response The response object.
-		 * @param WPInv_Invoice    $invoice  The invoice object.
-		 * @param WP_REST_Request  $request  Request object.
-		 */
-		return apply_filters( "wpinv_rest_prepare_invoice", $response, $invoice, $request );
-	}
-
-	/**
-	 * Gets an array of fields to be included on the response.
-	 *
-	 * Included fields are based on item schema and `_fields=` request argument.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array Fields to be included in the response.
-	 */
-	public function get_fields_for_response( $request ) {
-		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
-
-		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
-			// For back-compat, include any field with an empty schema
-			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
-			}
-		}
-
-		// Exclude fields that specify a different context than the request context.
-		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
-				}
-			}
-		}
-
-		$fields = array_keys( $properties );
-
-		if ( ! isset( $request['_fields'] ) ) {
-			return $fields;
-		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
-			return $fields;
-		}
-		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
-		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
-			$requested_fields[] = 'id';
-		}
-		// Return the list of all requested fields which appear in the schema.
-		return array_reduce(
-			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
-					$response_fields[] = $field;
-					return $response_fields;
-				}
-				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
-				// A nested field is included so long as its top-level property is
-				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
-					$response_fields[] = $field;
-				}
-				return $response_fields;
-			},
-			array()
-		);
-	}
-
-	/**
-	 * Retrieves the invoice's schema, conforming to JSON Schema.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Invoice schema data.
-	 */
-	public function get_item_schema() {
-
-		// Maybe retrieve the schema from cache.
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
-		}
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => $this->post_type,
-			'type'       => 'object',
-
-			// Base properties for every Invoice.
-			'properties' 		  => array(
-
-				'title'			  => array(
-					'description' => __( 'The title for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'user_id'		  => array(
-					'description' => __( 'The ID of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'email'		  	  => array(
-					'description' => __( 'The email of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'ip'			  => array(
-					'description' => __( 'The IP of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'user_info'       => array(
-					'description' => __( 'Information about the owner of the invoice.', 'invoicing' ),
-					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'properties'  => array(
-
-						'first_name'      => array(
-							'description' => __( 'The first name of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'last_name'       => array(
-							'description' => __( 'The last name of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'company'         => array(
-							'description' => __( 'The company of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'vat_number'      => array(
-							'description' => __( 'The VAT number of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'vat_rate'        => array(
-							'description' => __( 'The VAT rate applied on the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'address'        => array(
-							'description' => __( 'The address of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'city'            => array(
-							'description' => __( 'The city of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'country'         => array(
-							'description' => __( 'The country of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'state'           => array(
-							'description' => __( 'The state of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'zip'             => array(
-							'description' => __( 'The zip code of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'phone'             => array(
-							'description' => __( 'The phone number of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-					),
-				),
-
-				'id'           => array(
-					'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'key'			  => array(
-					'description' => __( 'A unique key for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'number'		  => array(
-					'description' => __( 'The invoice number.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'transaction_id'  => array(
-					'description' => __( 'The transaction id of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'gateway'		  => array(
-					'description' => __( 'The gateway used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'gateway_title'	  => array(
-					'description' => __( 'The title of the gateway used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'total'	  		  => array(
-					'description' => __( 'The total amount of the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'discount'		  => array(
-					'description' => __( 'The discount applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'discount_code'	  => array(
-					'description' => __( 'The discount code applied to the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'tax'	  		  => array(
-					'description' => __( 'The tax applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'fees_total'	  => array(
-					'description' => __( 'The total fees applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'subtotal'	  	  => array(
-					'description' => __( 'The sub-total for the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'currency'	  	  => array(
-					'description' => __( 'The currency used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'cart_details'	  => array(
-					'description' => __( 'The cart details for invoice.', 'invoicing' ),
-					'type'        => 'array',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'required'	  => true,
-				),
-
-				'date'         => array(
-					'description' => __( "The date the invoice was published, in the site's timezone.", 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'due_date'     => array(
-					'description' => __( 'The due date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'completed_date'  => array(
-					'description' => __( 'The completed date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
+        $links = $this->prepare_links( $invoice );
+        $response->add_links( $links );
+
+        if ( ! empty( $links['self']['href'] ) ) {
+            $actions = $this->get_available_actions( $invoice, $request );
+
+            $self = $links['self']['href'];
+
+            foreach ( $actions as $rel ) {
+                $response->add_link( $rel, $self );
+            }
+        }
+
+        /**
+         * Filters the invoice data for a response.
+         *
+         * @since 1.0.13
+         *
+         * @param WP_REST_Response $response The response object.
+         * @param WPInv_Invoice    $invoice  The invoice object.
+         * @param WP_REST_Request  $request  Request object.
+         */
+        return apply_filters( "wpinv_rest_prepare_invoice", $response, $invoice, $request );
+    }
+
+    /**
+     * Gets an array of fields to be included on the response.
+     *
+     * Included fields are based on item schema and `_fields=` request argument.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array Fields to be included in the response.
+     */
+    public function get_fields_for_response( $request ) {
+        $schema     = $this->get_item_schema();
+        $properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+
+        $additional_fields = $this->get_additional_fields();
+        foreach ( $additional_fields as $field_name => $field_options ) {
+            // For back-compat, include any field with an empty schema
+            // because it won't be present in $this->get_item_schema().
+            if ( is_null( $field_options['schema'] ) ) {
+                $properties[ $field_name ] = $field_options;
+            }
+        }
+
+        // Exclude fields that specify a different context than the request context.
+        $context = $request['context'];
+        if ( $context ) {
+            foreach ( $properties as $name => $options ) {
+                if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
+                    unset( $properties[ $name ] );
+                }
+            }
+        }
+
+        $fields = array_keys( $properties );
+
+        if ( ! isset( $request['_fields'] ) ) {
+            return $fields;
+        }
+        $requested_fields = wpinv_parse_list( $request['_fields'] );
+        if ( 0 === count( $requested_fields ) ) {
+            return $fields;
+        }
+        // Trim off outside whitespace from the comma delimited list.
+        $requested_fields = array_map( 'trim', $requested_fields );
+        // Always persist 'id', because it can be needed for add_additional_fields_to_object().
+        if ( in_array( 'id', $fields, true ) ) {
+            $requested_fields[] = 'id';
+        }
+        // Return the list of all requested fields which appear in the schema.
+        return array_reduce(
+            $requested_fields,
+            function( $response_fields, $field ) use ( $fields ) {
+                if ( in_array( $field, $fields, true ) ) {
+                    $response_fields[] = $field;
+                    return $response_fields;
+                }
+                // Check for nested fields if $field is not a direct match.
+                $nested_fields = explode( '.', $field );
+                // A nested field is included so long as its top-level property is
+                // present in the schema.
+                if ( in_array( $nested_fields[0], $fields, true ) ) {
+                    $response_fields[] = $field;
+                }
+                return $response_fields;
+            },
+            array()
+        );
+    }
+
+    /**
+     * Retrieves the invoice's schema, conforming to JSON Schema.
+     *
+     * @since 1.0.13
+     *
+     * @return array Invoice schema data.
+     */
+    public function get_item_schema() {
+
+        // Maybe retrieve the schema from cache.
+        if ( $this->schema ) {
+            return $this->add_additional_fields_schema( $this->schema );
+        }
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+
+            // Base properties for every Invoice.
+            'properties' 		  => array(
+
+                'title'			  => array(
+                    'description' => __( 'The title for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'user_id'		  => array(
+                    'description' => __( 'The ID of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'email'		  	  => array(
+                    'description' => __( 'The email of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'ip'			  => array(
+                    'description' => __( 'The IP of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'user_info'       => array(
+                    'description' => __( 'Information about the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'object',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'properties'  => array(
+
+                        'first_name'      => array(
+                            'description' => __( 'The first name of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'last_name'       => array(
+                            'description' => __( 'The last name of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'company'         => array(
+                            'description' => __( 'The company of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'vat_number'      => array(
+                            'description' => __( 'The VAT number of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'vat_rate'        => array(
+                            'description' => __( 'The VAT rate applied on the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'address'        => array(
+                            'description' => __( 'The address of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'city'            => array(
+                            'description' => __( 'The city of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'country'         => array(
+                            'description' => __( 'The country of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'state'           => array(
+                            'description' => __( 'The state of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'zip'             => array(
+                            'description' => __( 'The zip code of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'phone'             => array(
+                            'description' => __( 'The phone number of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+                    ),
+                ),
+
+                'id'           => array(
+                    'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'key'			  => array(
+                    'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'number'		  => array(
+                    'description' => __( 'The invoice number.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'transaction_id'  => array(
+                    'description' => __( 'The transaction id of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'gateway'		  => array(
+                    'description' => __( 'The gateway used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'gateway_title'	  => array(
+                    'description' => __( 'The title of the gateway used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'total'	  		  => array(
+                    'description' => __( 'The total amount of the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'discount'		  => array(
+                    'description' => __( 'The discount applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'discount_code'	  => array(
+                    'description' => __( 'The discount code applied to the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'tax'	  		  => array(
+                    'description' => __( 'The tax applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'fees_total'	  => array(
+                    'description' => __( 'The total fees applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'subtotal'	  	  => array(
+                    'description' => __( 'The sub-total for the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'currency'	  	  => array(
+                    'description' => __( 'The currency used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'cart_details'	  => array(
+                    'description' => __( 'The cart details for invoice.', 'invoicing' ),
+                    'type'        => 'array',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'required'	  => true,
+                ),
+
+                'date'         => array(
+                    'description' => __( "The date the invoice was published, in the site's timezone.", 'invoicing' ),
+                    'type'        => array( 'string', 'null' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'due_date'     => array(
+                    'description' => __( 'The due date for the invoice.', 'invoicing' ),
+                    'type'        => array( 'string', 'null' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'completed_date'  => array(
+                    'description' => __( 'The completed date for the invoice.', 'invoicing' ),
+                    'type'        => array( 'string', 'null' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
 				
-				'link'         => array(
-					'description' => __( 'URL to the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'format'      => 'uri',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'mode'       	  => array(
-					'description' => __( 'The mode used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array( 'live', 'test' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'slug'       	  => array(
-					'description' => __( 'An alphanumeric identifier for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'arg_options' => array(
-						'sanitize_callback' => array( $this, 'sanitize_slug' ),
-					),
-					'readonly'    => true,
-				),
-
-				'status'       	  => array(
-					'description' => __( 'A named status for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array_keys( wpinv_get_invoice_statuses( true, true ) ),
-					'context'     => array( 'view', 'edit' ),
-					'default'	  => 'wpi-pending',
-				),
-
-				'status_nicename' => array(
-					'description' => __( 'A human-readable status name for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'post_type'       => array(
-					'description' => __( 'The post type for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		// Add helpful links to the invoice schem.
-		$schema['links'] = $this->get_schema_links();
-
-		/**
-		 * Filters the invoice schema for the REST API.
-		 *
-		 * Enables adding extra properties to invoices.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $schema    The invoice schema.
-		 */
+                'link'         => array(
+                    'description' => __( 'URL to the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'format'      => 'uri',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'mode'       	  => array(
+                    'description' => __( 'The mode used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array( 'live', 'test' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'slug'       	  => array(
+                    'description' => __( 'An alphanumeric identifier for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'arg_options' => array(
+                        'sanitize_callback' => array( $this, 'sanitize_slug' ),
+                    ),
+                    'readonly'    => true,
+                ),
+
+                'status'       	  => array(
+                    'description' => __( 'A named status for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array_keys( wpinv_get_invoice_statuses( true, true ) ),
+                    'context'     => array( 'view', 'edit' ),
+                    'default'	  => 'wpi-pending',
+                ),
+
+                'status_nicename' => array(
+                    'description' => __( 'A human-readable status name for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'post_type'       => array(
+                    'description' => __( 'The post type for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        // Add helpful links to the invoice schem.
+        $schema['links'] = $this->get_schema_links();
+
+        /**
+         * Filters the invoice schema for the REST API.
+         *
+         * Enables adding extra properties to invoices.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $schema    The invoice schema.
+         */
         $schema = apply_filters( "wpinv_rest_invoice_schema", $schema );
 
-		// Cache the invoice schema.
-		$this->schema = $schema;
+        // Cache the invoice schema.
+        $this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
-	}
-
-	/**
-	 * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array
-	 */
-	protected function get_schema_links() {
-
-		$href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
-
-		$links = array();
-
-		$links[] = array(
-			'rel'          => 'https://api.w.org/action-publish',
-			'title'        => __( 'The current user can mark this invoice as completed.', 'invoicing' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties' => array(
-					'status' => array(
-						'type' => 'string',
-						'enum' => array( 'publish', 'wpi-renewal' ),
-					),
-				),
-			),
-		);
-
-		$links[] = array(
-			'rel'          => 'https://api.w.org/action-assign-author',
-			'title'        => __( 'The current user can change the owner of this invoice.', 'invoicing' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties'   => array(
-					'user_id'  => array(
-						'type' => 'integer',
-					),
-				),
-			),
-		);
-
-		return $links;
-	}
-
-	/**
-	 * Prepares links for the request.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice $invoice Invoice Object.
-	 * @return array Links for the given invoice.
-	 */
-	protected function prepare_links( $invoice ) {
-
-		// Prepare the base REST API endpoint for invoices.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
-
-		// Entity meta.
-		$links = array(
-			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $invoice->ID ),
-			),
-			'collection' => array(
-				'href' => rest_url( $base ),
-			),
-		);
-
-		if ( ! empty( $invoice->user_id ) ) {
-			$links['user'] = array(
-				'href'       => rest_url( 'wp/v2/users/' . $invoice->user_id ),
-				'embeddable' => true,
-			);
-		}
-
-		/**
-		 * Filters the returned invoice links for the REST API.
-		 *
-		 * Enables adding extra links to invoice API responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $links    Rest links.
-		 */
-		return apply_filters( "wpinv_rest_invoice_links", $links );
-
-	}
-
-	/**
-	 * Get the link relations available for the post and current user.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice   $invoice    Invoice object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array List of link relations.
-	 */
-	protected function get_available_actions( $invoice, $request ) {
-
-		if ( 'edit' !== $request['context'] ) {
-			return array();
-		}
-
-		$rels = array();
-
-		// Retrieve the post type object.
-		$post_type = get_post_type_object( $invoice->post_type );
-
-		// Mark invoice as completed.
-		if ( current_user_can( $post_type->cap->publish_posts ) ) {
-			$rels[] = 'https://api.w.org/action-publish';
-		}
-
-		// Change the owner of the invoice.
-		if ( current_user_can( $post_type->cap->edit_others_posts ) ) {
-			$rels[] = 'https://api.w.org/action-assign-author';
-		}
-
-		/**
-		 * Filters the available invoice link relations for the REST API.
-		 *
-		 * Enables adding extra link relation for the current user and request to invoice responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $rels    Available link relations.
-		 */
-		return apply_filters( "wpinv_rest_invoice_link_relations", $rels );
-	}
-
-	/**
-	 * Sanitizes and validates the list of post statuses.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string|array    $statuses  One or more post statuses.
-	 * @param WP_REST_Request $request   Full details about the request.
-	 * @param string          $parameter Additional parameter to pass to validation.
-	 * @return array|WP_Error A list of valid statuses, otherwise WP_Error object.
-	 */
-	public function sanitize_post_statuses( $statuses, $request, $parameter ) {
-
-		$statuses 	  = wp_parse_slug_list( $statuses );
-		$valid_statuses = array_keys( wpinv_get_invoice_statuses( true, true ) );
-		return array_intersect( $statuses, $valid_statuses );
+        return $this->add_additional_fields_schema( $this->schema );
+    }
+
+    /**
+     * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array
+     */
+    protected function get_schema_links() {
+
+        $href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
+
+        $links = array();
+
+        $links[] = array(
+            'rel'          => 'https://api.w.org/action-publish',
+            'title'        => __( 'The current user can mark this invoice as completed.', 'invoicing' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties' => array(
+                    'status' => array(
+                        'type' => 'string',
+                        'enum' => array( 'publish', 'wpi-renewal' ),
+                    ),
+                ),
+            ),
+        );
+
+        $links[] = array(
+            'rel'          => 'https://api.w.org/action-assign-author',
+            'title'        => __( 'The current user can change the owner of this invoice.', 'invoicing' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties'   => array(
+                    'user_id'  => array(
+                        'type' => 'integer',
+                    ),
+                ),
+            ),
+        );
+
+        return $links;
+    }
+
+    /**
+     * Prepares links for the request.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice $invoice Invoice Object.
+     * @return array Links for the given invoice.
+     */
+    protected function prepare_links( $invoice ) {
+
+        // Prepare the base REST API endpoint for invoices.
+        $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+
+        // Entity meta.
+        $links = array(
+            'self'       => array(
+                'href' => rest_url( trailingslashit( $base ) . $invoice->ID ),
+            ),
+            'collection' => array(
+                'href' => rest_url( $base ),
+            ),
+        );
+
+        if ( ! empty( $invoice->user_id ) ) {
+            $links['user'] = array(
+                'href'       => rest_url( 'wp/v2/users/' . $invoice->user_id ),
+                'embeddable' => true,
+            );
+        }
+
+        /**
+         * Filters the returned invoice links for the REST API.
+         *
+         * Enables adding extra links to invoice API responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $links    Rest links.
+         */
+        return apply_filters( "wpinv_rest_invoice_links", $links );
+
+    }
+
+    /**
+     * Get the link relations available for the post and current user.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice   $invoice    Invoice object.
+     * @param WP_REST_Request $request Request object.
+     * @return array List of link relations.
+     */
+    protected function get_available_actions( $invoice, $request ) {
+
+        if ( 'edit' !== $request['context'] ) {
+            return array();
+        }
+
+        $rels = array();
+
+        // Retrieve the post type object.
+        $post_type = get_post_type_object( $invoice->post_type );
+
+        // Mark invoice as completed.
+        if ( current_user_can( $post_type->cap->publish_posts ) ) {
+            $rels[] = 'https://api.w.org/action-publish';
+        }
+
+        // Change the owner of the invoice.
+        if ( current_user_can( $post_type->cap->edit_others_posts ) ) {
+            $rels[] = 'https://api.w.org/action-assign-author';
+        }
+
+        /**
+         * Filters the available invoice link relations for the REST API.
+         *
+         * Enables adding extra link relation for the current user and request to invoice responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $rels    Available link relations.
+         */
+        return apply_filters( "wpinv_rest_invoice_link_relations", $rels );
+    }
+
+    /**
+     * Sanitizes and validates the list of post statuses.
+     *
+     * @since 1.0.13
+     *
+     * @param string|array    $statuses  One or more post statuses.
+     * @param WP_REST_Request $request   Full details about the request.
+     * @param string          $parameter Additional parameter to pass to validation.
+     * @return array|WP_Error A list of valid statuses, otherwise WP_Error object.
+     */
+    public function sanitize_post_statuses( $statuses, $request, $parameter ) {
+
+        $statuses 	  = wp_parse_slug_list( $statuses );
+        $valid_statuses = array_keys( wpinv_get_invoice_statuses( true, true ) );
+        return array_intersect( $statuses, $valid_statuses );
 		
-	}
+    }
     
 }
\ No newline at end of file

Spacing +297 added lines, -297 removed lines

@@ -8,7 +8,7 @@ 
  * @since    1.0.13
  */
 
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -41,7 +41,7 @@ 
 	 *
 	 * @param string $namespace Api Namespace
 	 */
-	public function __construct( $namespace ) {
+	public function __construct($namespace) {
         
         // Set api namespace...
 		$this->namespace = $namespace;
@@ -60,12 +60,12 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
 	 */
-	public function get_items_permissions_check( $request ) {
+	public function get_items_permissions_check($request) {
 	
-        $post_type = get_post_type_object( $this->post_type );
+        $post_type = get_post_type_object($this->post_type);
 
-		if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
-			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit invoices.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		if ('edit' === $request['context'] && !current_user_can($post_type->cap->edit_posts)) {
+			return new WP_Error('rest_forbidden_context', __('Sorry, you are not allowed to edit invoices.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		// Read checks will be evaluated on a per invoice basis
@@ -82,17 +82,17 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 		
 		// Retrieve the list of registered invoice query parameters.
         $registered = $this->get_collection_params();
         
         $args       = array();
 
-        foreach( array_keys( $registered ) as $key ) {
+        foreach (array_keys($registered) as $key) {
 
-            if( isset( $request[ $key] ) ) {
-                $args[ $key ] = $request[ $key];
+            if (isset($request[$key])) {
+                $args[$key] = $request[$key];
             }
 
         }
@@ -107,32 +107,32 @@ 
 		 * @param array           $args    Key value array of query var to query value.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $args       = apply_filters( "wpinv_rest_get_invoices_arguments", $args, $request, $this );
+        $args = apply_filters("wpinv_rest_get_invoices_arguments", $args, $request, $this);
 		
 		// Special args
-		$args[ 'return' ]   = 'objects';
-		$args[ 'paginate' ] = true;
+		$args['return']   = 'objects';
+		$args['paginate'] = true;
 
         // Run the query.
-		$query = wpinv_get_invoices( $args );
+		$query = wpinv_get_invoices($args);
 		
 		// Prepare the retrieved invoices
 		$invoices = array();
-		foreach( $query->invoices as $invoice ) {
+		foreach ($query->invoices as $invoice) {
 
-			if ( ! $this->check_read_permission( $invoice ) ) {
+			if (!$this->check_read_permission($invoice)) {
 				continue;
 			}
 
-			$data       = $this->prepare_item_for_response( $invoice, $request );
-			$invoices[] = $this->prepare_response_for_collection( $data );
+			$data       = $this->prepare_item_for_response($invoice, $request);
+			$invoices[] = $this->prepare_response_for_collection($data);
 
 		}
 
 		// Prepare the response.
-		$response = rest_ensure_response( $invoices );
-		$response->header( 'X-WP-Total', (int) $query->total );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+		$response = rest_ensure_response($invoices);
+		$response->header('X-WP-Total', (int) $query->total);
+		$response->header('X-WP-TotalPages', (int) $query->max_num_pages);
 
 		/**
 		 * Filters the responses for invoices requests.
@@ -145,9 +145,9 @@ 
 		 * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the invoices
 		 */
-        $response       = apply_filters( "wpinv_rest_invoices_response", $response, $request, $args );
+        $response = apply_filters("wpinv_rest_invoices_response", $response, $request, $args);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
         
     }
 
@@ -159,17 +159,17 @@ 
 	 * @param int $invoice_id Supplied ID.
 	 * @return WPInv_Invoice|WP_Error Invoice object if ID is valid, WP_Error otherwise.
 	 */
-	protected function get_post( $invoice_id ) {
+	protected function get_post($invoice_id) {
 		
-		$error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid invoice ID.', 'invoicing' ), array( 'status' => 404 ) );
+		$error = new WP_Error('rest_invoice_invalid_id', __('Invalid invoice ID.', 'invoicing'), array('status' => 404));
 
         // Ids start from 1
-        if ( (int) $invoice_id <= 0 ) {
+        if ((int) $invoice_id <= 0) {
 			return $error;
 		}
 
-		$invoice = wpinv_get_invoice( (int) $invoice_id );
-		if ( empty( $invoice ) ) {
+		$invoice = wpinv_get_invoice((int) $invoice_id);
+		if (empty($invoice)) {
 			return $error;
         }
 
@@ -185,18 +185,18 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has read access for the invoice, WP_Error object otherwise.
 	 */
-	public function get_item_permissions_check( $request ) {
+	public function get_item_permissions_check($request) {
 
         // Retrieve the invoice object.
-        $invoice = $this->get_post( $request['id'] );
+        $invoice = $this->get_post($request['id']);
         
         // Ensure it is valid.
-		if ( is_wp_error( $invoice ) ) {
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
-		if ( $invoice ) {
-			return $this->check_read_permission( $invoice );
+		if ($invoice) {
+			return $this->check_read_permission($invoice);
 		}
 
 		return true;
@@ -213,8 +213,8 @@ 
 	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
 	 * @return bool Whether the post can be read.
 	 */
-	public function check_read_permission( $invoice ) {
-		return wpinv_user_can_view_invoice( $invoice->ID );
+	public function check_read_permission($invoice) {
+		return wpinv_user_can_view_invoice($invoice->ID);
     }
     
     /**
@@ -225,19 +225,19 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function get_item( $request ) {
+	public function get_item($request) {
 
         // Fetch the invoice.
-        $invoice = $this->get_post( $request['id'] );
+        $invoice = $this->get_post($request['id']);
         
         // Abort early if it does not exist
-		if ( is_wp_error( $invoice ) ) {
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
-		$response->link_header( 'alternate', esc_url( $invoice->get_view_url() ), array( 'type' => 'text/html' ) );
+		$response = $this->prepare_item_for_response($invoice, $request);
+		$response->link_header('alternate', esc_url($invoice->get_view_url()), array('type' => 'text/html'));
 
 		/**
 		 * Filters the responses for single invoice requests.
@@ -249,9 +249,9 @@ 
 		 * @param WP_HTTP_Response $response Response.
 		 * @param WP_REST_Request  $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_get_invoice_response", $response, $request );
+        $response = apply_filters("wpinv_rest_get_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 
     }
     
@@ -263,18 +263,18 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
 	 */
-	public function create_item_permissions_check( $request ) {
+	public function create_item_permissions_check($request) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_invoice_exists', __('Cannot create existing invoice.', 'invoicing'), array('status' => 400));
 		}
 
-		$post_type = get_post_type_object( $this->post_type );
+		$post_type = get_post_type_object($this->post_type);
 
-		if ( ! current_user_can( $post_type->cap->create_posts ) ) {
+		if (!current_user_can($post_type->cap->create_posts)) {
 			return new WP_Error( 
                 'rest_cannot_create', 
-                __( 'Sorry, you are not allowed to create invoices as this user.', 'invoicing' ), 
+                __('Sorry, you are not allowed to create invoices as this user.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -292,30 +292,30 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function create_item( $request ) {
+	public function create_item($request) {
 
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_invoice_exists', __('Cannot create existing invoice.', 'invoicing'), array('status' => 400));
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the updated data.
-		$invoice_data = $this->prepare_item_for_database( $request );
+		$invoice_data = $this->prepare_item_for_database($request);
 
-		if ( is_wp_error( $invoice_data ) ) {
+		if (is_wp_error($invoice_data)) {
 			return $invoice_data;
 		}
 
 		// Try creating the invoice
-        $invoice = wpinv_insert_invoice( $invoice_data, true );
+        $invoice = wpinv_insert_invoice($invoice_data, true);
 
-		if ( is_wp_error( $invoice ) ) {
+		if (is_wp_error($invoice)) {
             return $invoice;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
+		$response = $this->prepare_item_for_response($invoice, $request);
 
 		/**
 		 * Fires after a single invoice is created or updated via the REST API.
@@ -326,7 +326,7 @@ 
 		 * @param WP_REST_Request $request  Request object.
 		 * @param bool            $creating True when creating a post, false when updating.
 		 */
-		do_action( "wpinv_rest_insert_invoice", $invoice, $request, true );
+		do_action("wpinv_rest_insert_invoice", $invoice, $request, true);
 
 		/**
 		 * Filters the responses for creating single invoice requests.
@@ -338,9 +338,9 @@ 
 		 * @param array           $invoice_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_create_invoice_response", $response, $request );
+        $response = apply_filters("wpinv_rest_create_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 	}
 
 	/**
@@ -351,20 +351,20 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
 	 */
-	public function update_item_permissions_check( $request ) {
+	public function update_item_permissions_check($request) {
 
 		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
+		$invoice = $this->get_post($request['id']);
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
-		$post_type = get_post_type_object( $this->post_type );
+		$post_type = get_post_type_object($this->post_type);
 
-		if ( ! current_user_can(  $post_type->cap->edit_post, $invoice->ID  ) ) {
+		if (!current_user_can($post_type->cap->edit_post, $invoice->ID)) {
 			return new WP_Error( 
                 'rest_cannot_edit', 
-                __( 'Sorry, you are not allowed to update this invoice.', 'invoicing' ), 
+                __('Sorry, you are not allowed to update this invoice.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -382,46 +382,46 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function update_item( $request ) {
+	public function update_item($request) {
 		
 		// Ensure the invoice exists.
-        $valid_check = $this->get_post( $request['id'] );
+        $valid_check = $this->get_post($request['id']);
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
+		if (is_wp_error($valid_check)) {
 			return $valid_check;
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+		$data_to_update = $this->prepare_item_for_database($request);
 
-		if ( is_wp_error( $data_to_update ) ) {
+		if (is_wp_error($data_to_update)) {
 			return $data_to_update;
 		}
 
 		// Abort if no invoice data is provided
-        if( empty( $data_to_update ) ) {
-            return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
+        if (empty($data_to_update)) {
+            return new WP_Error('missing_data', __('An update request cannot be empty.', 'invoicing'));
         }
 
 		// Include the invoice ID
 		$data_to_update['ID'] = $request['id'];
 
 		// Update the invoice
-		$updated_invoice = wpinv_update_invoice( $data_to_update, true );
+		$updated_invoice = wpinv_update_invoice($data_to_update, true);
 
 		// Incase the update operation failed...
-		if ( is_wp_error( $updated_invoice ) ) {
+		if (is_wp_error($updated_invoice)) {
 			return $updated_invoice;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_invoice, $request );
+		$response = $this->prepare_item_for_response($updated_invoice, $request);
 
 		/** This action is documented in includes/class-wpinv-rest-invoice-controller.php */
-		do_action( "wpinv_rest_insert_invoice", $updated_invoice, $request, false );
+		do_action("wpinv_rest_insert_invoice", $updated_invoice, $request, false);
 
 		/**
 		 * Filters the responses for updating single invoice requests.
@@ -433,9 +433,9 @@ 
 		 * @param array           $invoice_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_update_invoice_response", $response, $request );
+        $response = apply_filters("wpinv_rest_update_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 	}
 
 	/**
@@ -446,19 +446,19 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to delete the invoice, WP_Error object otherwise.
 	 */
-	public function delete_item_permissions_check( $request ) {
+	public function delete_item_permissions_check($request) {
 
 		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
+		$invoice = $this->get_post($request['id']);
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
 		// Ensure the current user can delete invoices
-		if ( wpinv_current_user_can_manage_invoicing() ||  current_user_can( 'delete_invoices', $request['id'] ) ) {
+		if (wpinv_current_user_can_manage_invoicing() || current_user_can('delete_invoices', $request['id'])) {
 			return new WP_Error( 
                 'rest_cannot_delete', 
-                __( 'Sorry, you are not allowed to delete this invoice.', 'invoicing' ), 
+                __('Sorry, you are not allowed to delete this invoice.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -476,31 +476,31 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function delete_item( $request ) {
+	public function delete_item($request) {
 		
 		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
+		$invoice = $this->get_post($request['id']);
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the invoice id
-		$id    = $invoice->ID;
+		$id = $invoice->ID;
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
+		$response = $this->prepare_item_for_response($invoice, $request);
 
 		// Check if the user wants to bypass the trash...
 		$force_delete = (bool) $request['force'];
 
 		// Try deleting the invoice.
-		$deleted = wp_delete_post( $id, $force_delete );
+		$deleted = wp_delete_post($id, $force_delete);
 
 		// Abort early if we can't delete the invoice.
-		if ( ! $deleted ) {
-			return new WP_Error( 'rest_cannot_delete', __( 'The invoice cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+		if (!$deleted) {
+			return new WP_Error('rest_cannot_delete', __('The invoice cannot be deleted.', 'invoicing'), array('status' => 500));
 		}
 
 		/**
@@ -512,7 +512,7 @@ 
 		 * @param WPInv_Invoice    $invoice  The deleted or trashed invoice.
 		 * @param WP_REST_Request  $request  The request sent to the API.
 		 */
-		do_action( "wpinv_rest_delete_invoice", $invoice, $request );
+		do_action("wpinv_rest_delete_invoice", $invoice, $request);
 
 		return $response;
 
@@ -528,43 +528,43 @@ 
 	 */
 	public function get_collection_params() {
         
-        $query_params               = array(
+        $query_params = array(
 
             // Invoice status.
             'status'                => array(
                 'default'           => 'publish',
-                'description'       => __( 'Limit result set to invoices assigned one or more statuses.', 'invoicing' ),
+                'description'       => __('Limit result set to invoices assigned one or more statuses.', 'invoicing'),
                 'type'              => 'array',
                 'items'             => array(
-                    'enum'          => array_keys( wpinv_get_invoice_statuses( true, true ) ),
+                    'enum'          => array_keys(wpinv_get_invoice_statuses(true, true)),
                     'type'          => 'string',
                 ),
-                'sanitize_callback' => array( $this, 'sanitize_post_statuses' ),
+                'sanitize_callback' => array($this, 'sanitize_post_statuses'),
             ),
 
             // User.
             'user'                  => array(
-				'description'       => __( 'Limit result set to invoices for a specif user.', 'invoicing' ),
+				'description'       => __('Limit result set to invoices for a specif user.', 'invoicing'),
 				'type'              => 'integer',
             ),
             
             // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of invoices to fetch.', 'invoicing' ),
+				'description'       => __('Number of invoices to fetch.', 'invoicing'),
 				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+				'default'           => (int) get_option('posts_per_page'),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
+				'description'       => __('Current page to fetch.', 'invoicing'),
 				'type'              => 'integer',
 				'default'           => 1,
             ),
 
             // Exclude certain invoices
             'exclude'  => array(
-                'description' => __( 'Ensure result set excludes specific IDs.', 'invoicing' ),
+                'description' => __('Ensure result set excludes specific IDs.', 'invoicing'),
                 'type'        => 'array',
                 'items'       => array(
                     'type' => 'integer',
@@ -574,7 +574,7 @@ 
 
             // Order invoices by
             'orderby'  => array(
-                'description' => __( 'Sort invoices by object attribute.', 'invoicing' ),
+                'description' => __('Sort invoices by object attribute.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'date',
                 'enum'        => array(
@@ -588,10 +588,10 @@ 
 
             // How to order
             'order'    => array(
-                'description' => __( 'Order sort attribute ascending or descending.', 'invoicing' ),
+                'description' => __('Order sort attribute ascending or descending.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'DESC',
-                'enum'        => array( 'ASC', 'DESC' ),
+                'enum'        => array('ASC', 'DESC'),
             ),
         );
 
@@ -603,7 +603,7 @@ 
 		 *
 		 * @param array        $query_params JSON Schema-formatted collection parameters.
 		 */
-		return apply_filters( "wpinv_rest_invoices_collection_params", $query_params );
+		return apply_filters("wpinv_rest_invoices_collection_params", $query_params);
     }
     
     /**
@@ -614,7 +614,7 @@ 
 	 * @param object|string $post_type Post type name or object.
 	 * @return bool Whether the post type is allowed in REST.
 	 */
-	protected function check_is_post_type_allowed( $post_type ) {
+	protected function check_is_post_type_allowed($post_type) {
 		return true;
 	}
 
@@ -626,49 +626,49 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array|WP_Error Invoice Properties or WP_Error.
 	 */
-	protected function prepare_item_for_database( $request ) {
+	protected function prepare_item_for_database($request) {
 		$prepared_invoice = new stdClass();
 
 		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_invoice = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_invoice ) ) {
+		if (isset($request['id'])) {
+			$existing_invoice = $this->get_post($request['id']);
+			if (is_wp_error($existing_invoice)) {
 				return $existing_invoice;
 			}
 
-			$prepared_invoice->ID 		  = $existing_invoice->ID;
+			$prepared_invoice->ID = $existing_invoice->ID;
 			$prepared_invoice->invoice_id = $existing_invoice->ID;
 		}
 
 		$schema = $this->get_item_schema();
 
 		// Invoice owner.
-		if ( ! empty( $schema['properties']['user_id'] ) && isset( $request['user_id'] ) ) {
+		if (!empty($schema['properties']['user_id']) && isset($request['user_id'])) {
 			$prepared_invoice->user_id = (int) $request['user_id'];
 		}
 
 		// Cart details.
-		if ( ! empty( $schema['properties']['cart_details'] ) && isset( $request['cart_details'] ) ) {
+		if (!empty($schema['properties']['cart_details']) && isset($request['cart_details'])) {
 			$prepared_invoice->cart_details = (array) $request['cart_details'];
 		}
 
 		// Invoice status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
+		if (!empty($schema['properties']['status']) && isset($request['status'])) {
 
-			if ( in_array( $request['status'], array_keys( wpinv_get_invoice_statuses( true, true ) ), true ) ) {
+			if (in_array($request['status'], array_keys(wpinv_get_invoice_statuses(true, true)), true)) {
 				$prepared_invoice->status = $request['status'];
 			}
 
 		}
 
 		// User info
-		if ( ! empty( $schema['properties']['user_info'] ) && isset( $request['user_info'] ) ) {
+		if (!empty($schema['properties']['user_info']) && isset($request['user_info'])) {
 			$prepared_invoice->user_info = array();
 			$user_info = (array) $request['user_info'];
 
-			foreach( $user_info as $prop => $value ) {
+			foreach ($user_info as $prop => $value) {
 
-				if ( ! empty( $schema['properties']['user_info']['properties'][$prop] ) ) {
+				if (!empty($schema['properties']['user_info']['properties'][$prop])) {
 
 					$prepared_invoice->user_info[$prop] = $value;
 		
@@ -679,49 +679,49 @@ 
 		}
 
 		// IP
-		if ( ! empty( $schema['properties']['ip'] ) && isset( $request['ip'] ) ) {
+		if (!empty($schema['properties']['ip']) && isset($request['ip'])) {
 			$prepared_invoice->ip = $request['ip'];
 		}
 
 		// Payment details
 		$prepared_invoice->payment_details = array();
 
-		if ( ! empty( $schema['properties']['gateway'] ) && isset( $request['gateway'] ) ) {
+		if (!empty($schema['properties']['gateway']) && isset($request['gateway'])) {
 			$prepared_invoice->payment_details['gateway'] = $request['gateway'];
 		}
 
-		if ( ! empty( $schema['properties']['gateway_title'] ) && isset( $request['gateway_title'] ) ) {
+		if (!empty($schema['properties']['gateway_title']) && isset($request['gateway_title'])) {
 			$prepared_invoice->payment_details['gateway_title'] = $request['gateway_title'];
 		}
 
-		if ( ! empty( $schema['properties']['currency'] ) && isset( $request['currency'] ) ) {
+		if (!empty($schema['properties']['currency']) && isset($request['currency'])) {
 			$prepared_invoice->payment_details['currency'] = $request['currency'];
 		}
 
-		if ( ! empty( $schema['properties']['transaction_id'] ) && isset( $request['transaction_id'] ) ) {
+		if (!empty($schema['properties']['transaction_id']) && isset($request['transaction_id'])) {
 			$prepared_invoice->payment_details['transaction_id'] = $request['transaction_id'];
 		}
 
 		// Dates
-		if ( ! empty( $schema['properties']['date'] ) && isset( $request['date'] ) ) {
-			$post_date = rest_get_date_with_gmt( $request['date'] );
+		if (!empty($schema['properties']['date']) && isset($request['date'])) {
+			$post_date = rest_get_date_with_gmt($request['date']);
 
-			if ( ! empty( $post_date ) ) {
+			if (!empty($post_date)) {
 				$prepared_invoice->post_date = $post_date[0];
 			}
 			
 		}
 
-		if ( ! empty( $schema['properties']['due_date'] ) && isset( $request['due_date'] ) ) {
-			$due_date = rest_get_date_with_gmt( $request['due_date'] );
+		if (!empty($schema['properties']['due_date']) && isset($request['due_date'])) {
+			$due_date = rest_get_date_with_gmt($request['due_date']);
 
-			if ( ! empty( $due_date ) ) {
+			if (!empty($due_date)) {
 				$prepared_invoice->due_date = $due_date[0];
 			}
 
 		}
 
-		$invoice_data = (array) wp_unslash( $prepared_invoice );
+		$invoice_data = (array) wp_unslash($prepared_invoice);
 
 		/**
 		 * Filters an invoice before it is inserted via the REST API.
@@ -731,7 +731,7 @@ 
 		 * @param array        $invoice_data An array of invoice data
 		 * @param WP_REST_Request $request       Request object.
 		 */
-		return apply_filters( "wpinv_rest_pre_insert_invoice", $invoice_data, $request );
+		return apply_filters("wpinv_rest_pre_insert_invoice", $invoice_data, $request);
 
 	}
 
@@ -744,20 +744,20 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $invoice, $request ) {
+	public function prepare_item_for_response($invoice, $request) {
 
-		$GLOBALS['post'] = get_post( $invoice->ID );
+		$GLOBALS['post'] = get_post($invoice->ID);
 
-		setup_postdata( $invoice->ID );
+		setup_postdata($invoice->ID);
 
 		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
+		$fields = $this->get_fields_for_response($request);
 
 		// Base fields for every invoice.
 		$data = array();
 
 		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
+		if (rest_is_field_included('id', $fields)) {
 			$data['id'] = $invoice->ID;
 		}
 
@@ -772,74 +772,74 @@ 
 			'status', 'status_nicename', 'post_type'
 		);
 
-		foreach( $invoice_properties as $property ) {
+		foreach ($invoice_properties as $property) {
 
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $invoice->get( $property );
+			if (rest_is_field_included($property, $fields)) {
+				$data[$property] = $invoice->get($property);
 			}
 
 		}
 
 		// Cart details
-		if ( rest_is_field_included( 'cart_details', $fields ) ) {
-			$data['cart_details'] = $invoice->get( 'cart_details' );
+		if (rest_is_field_included('cart_details', $fields)) {
+			$data['cart_details'] = $invoice->get('cart_details');
 		}
 
 		//Dates
-		$invoice_properties = array( 'date', 'due_date', 'completed_date' );
+		$invoice_properties = array('date', 'due_date', 'completed_date');
 
-		foreach( $invoice_properties as $property ) {
+		foreach ($invoice_properties as $property) {
 
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $this->prepare_date_response( '0000-00-00 00:00:00', $invoice->get( $property ) );
+			if (rest_is_field_included($property, $fields)) {
+				$data[$property] = $this->prepare_date_response('0000-00-00 00:00:00', $invoice->get($property));
 			}
 
 		}
 
 		// User id
-		if ( rest_is_field_included( 'user_id', $fields ) ) {
-			$data['user_id'] = (int) $invoice->get( 'user_id' );
+		if (rest_is_field_included('user_id', $fields)) {
+			$data['user_id'] = (int) $invoice->get('user_id');
 		}
 
 		// User info
-		$user_info = array( 'first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone' );
+		$user_info = array('first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone');
 
-		foreach( $user_info as $property ) {
+		foreach ($user_info as $property) {
 
-			if ( rest_is_field_included( "user_info.$property", $fields ) ) {
-				$data['user_info'][$property] = $invoice->get( $property );
+			if (rest_is_field_included("user_info.$property", $fields)) {
+				$data['user_info'][$property] = $invoice->get($property);
 			}
 
 		}
 
 		// Slug
-		if ( rest_is_field_included( 'slug', $fields ) ) {
-			$data['slug'] = $invoice->get( 'post_name' );
+		if (rest_is_field_included('slug', $fields)) {
+			$data['slug'] = $invoice->get('post_name');
 		}
 
 		// View invoice link
-		if ( rest_is_field_included( 'link', $fields ) ) {
-			$data['link'] = esc_url( $invoice->get_view_url() );
+		if (rest_is_field_included('link', $fields)) {
+			$data['link'] = esc_url($invoice->get_view_url());
 		}
 
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		$context = !empty($request['context']) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object($data, $request);
+		$data    = $this->filter_response_by_context($data, $context);
 
 		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 
-		$links = $this->prepare_links( $invoice );
-		$response->add_links( $links );
+		$links = $this->prepare_links($invoice);
+		$response->add_links($links);
 
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $invoice, $request );
+		if (!empty($links['self']['href'])) {
+			$actions = $this->get_available_actions($invoice, $request);
 
 			$self = $links['self']['href'];
 
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
+			foreach ($actions as $rel) {
+				$response->add_link($rel, $self);
 			}
 		}
 
@@ -852,7 +852,7 @@ 
 		 * @param WPInv_Invoice    $invoice  The invoice object.
 		 * @param WP_REST_Request  $request  Request object.
 		 */
-		return apply_filters( "wpinv_rest_prepare_invoice", $response, $invoice, $request );
+		return apply_filters("wpinv_rest_prepare_invoice", $response, $invoice, $request);
 	}
 
 	/**
@@ -865,57 +865,57 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array Fields to be included in the response.
 	 */
-	public function get_fields_for_response( $request ) {
+	public function get_fields_for_response($request) {
 		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+		$properties = isset($schema['properties']) ? $schema['properties'] : array();
 
 		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
+		foreach ($additional_fields as $field_name => $field_options) {
 			// For back-compat, include any field with an empty schema
 			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
+			if (is_null($field_options['schema'])) {
+				$properties[$field_name] = $field_options;
 			}
 		}
 
 		// Exclude fields that specify a different context than the request context.
 		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
+		if ($context) {
+			foreach ($properties as $name => $options) {
+				if (!empty($options['context']) && !in_array($context, $options['context'], true)) {
+					unset($properties[$name]);
 				}
 			}
 		}
 
-		$fields = array_keys( $properties );
+		$fields = array_keys($properties);
 
-		if ( ! isset( $request['_fields'] ) ) {
+		if (!isset($request['_fields'])) {
 			return $fields;
 		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
+		$requested_fields = wpinv_parse_list($request['_fields']);
+		if (0 === count($requested_fields)) {
 			return $fields;
 		}
 		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
+		$requested_fields = array_map('trim', $requested_fields);
 		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
+		if (in_array('id', $fields, true)) {
 			$requested_fields[] = 'id';
 		}
 		// Return the list of all requested fields which appear in the schema.
 		return array_reduce(
 			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
+			function($response_fields, $field) use ($fields) {
+				if (in_array($field, $fields, true)) {
 					$response_fields[] = $field;
 					return $response_fields;
 				}
 				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
+				$nested_fields = explode('.', $field);
 				// A nested field is included so long as its top-level property is
 				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
+				if (in_array($nested_fields[0], $fields, true)) {
 					$response_fields[] = $field;
 				}
 				return $response_fields;
@@ -934,8 +934,8 @@ 
 	public function get_item_schema() {
 
 		// Maybe retrieve the schema from cache.
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
+		if ($this->schema) {
+			return $this->add_additional_fields_schema($this->schema);
 		}
 
 		$schema = array(
@@ -947,266 +947,266 @@ 
 			'properties' 		  => array(
 
 				'title'			  => array(
-					'description' => __( 'The title for the invoice.', 'invoicing' ),
+					'description' => __('The title for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'user_id'		  => array(
-					'description' => __( 'The ID of the owner of the invoice.', 'invoicing' ),
+					'description' => __('The ID of the owner of the invoice.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'email'		  	  => array(
-					'description' => __( 'The email of the owner of the invoice.', 'invoicing' ),
+					'description' => __('The email of the owner of the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'ip'			  => array(
-					'description' => __( 'The IP of the owner of the invoice.', 'invoicing' ),
+					'description' => __('The IP of the owner of the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'user_info'       => array(
-					'description' => __( 'Information about the owner of the invoice.', 'invoicing' ),
+					'description' => __('Information about the owner of the invoice.', 'invoicing'),
 					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'properties'  => array(
 
 						'first_name'      => array(
-							'description' => __( 'The first name of the owner of the invoice.', 'invoicing' ),
+							'description' => __('The first name of the owner of the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'last_name'       => array(
-							'description' => __( 'The last name of the owner of the invoice.', 'invoicing' ),
+							'description' => __('The last name of the owner of the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'company'         => array(
-							'description' => __( 'The company of the owner of the invoice.', 'invoicing' ),
+							'description' => __('The company of the owner of the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'vat_number'      => array(
-							'description' => __( 'The VAT number of the owner of the invoice.', 'invoicing' ),
+							'description' => __('The VAT number of the owner of the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'vat_rate'        => array(
-							'description' => __( 'The VAT rate applied on the invoice.', 'invoicing' ),
+							'description' => __('The VAT rate applied on the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'address'        => array(
-							'description' => __( 'The address of the invoice owner.', 'invoicing' ),
+							'description' => __('The address of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'city'            => array(
-							'description' => __( 'The city of the invoice owner.', 'invoicing' ),
+							'description' => __('The city of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'country'         => array(
-							'description' => __( 'The country of the invoice owner.', 'invoicing' ),
+							'description' => __('The country of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'state'           => array(
-							'description' => __( 'The state of the invoice owner.', 'invoicing' ),
+							'description' => __('The state of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'zip'             => array(
-							'description' => __( 'The zip code of the invoice owner.', 'invoicing' ),
+							'description' => __('The zip code of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'phone'             => array(
-							'description' => __( 'The phone number of the invoice owner.', 'invoicing' ),
+							'description' => __('The phone number of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 					),
 				),
 
 				'id'           => array(
-					'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+					'description' => __('Unique identifier for the invoice.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'key'			  => array(
-					'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+					'description' => __('A unique key for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'number'		  => array(
-					'description' => __( 'The invoice number.', 'invoicing' ),
+					'description' => __('The invoice number.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'transaction_id'  => array(
-					'description' => __( 'The transaction id of the invoice.', 'invoicing' ),
+					'description' => __('The transaction id of the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'gateway'		  => array(
-					'description' => __( 'The gateway used to process the invoice.', 'invoicing' ),
+					'description' => __('The gateway used to process the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'gateway_title'	  => array(
-					'description' => __( 'The title of the gateway used to process the invoice.', 'invoicing' ),
+					'description' => __('The title of the gateway used to process the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'total'	  		  => array(
-					'description' => __( 'The total amount of the invoice.', 'invoicing' ),
+					'description' => __('The total amount of the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'discount'		  => array(
-					'description' => __( 'The discount applied to the invoice.', 'invoicing' ),
+					'description' => __('The discount applied to the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'discount_code'	  => array(
-					'description' => __( 'The discount code applied to the invoice.', 'invoicing' ),
+					'description' => __('The discount code applied to the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'tax'	  		  => array(
-					'description' => __( 'The tax applied to the invoice.', 'invoicing' ),
+					'description' => __('The tax applied to the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'fees_total'	  => array(
-					'description' => __( 'The total fees applied to the invoice.', 'invoicing' ),
+					'description' => __('The total fees applied to the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'subtotal'	  	  => array(
-					'description' => __( 'The sub-total for the invoice.', 'invoicing' ),
+					'description' => __('The sub-total for the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'currency'	  	  => array(
-					'description' => __( 'The currency used to process the invoice.', 'invoicing' ),
+					'description' => __('The currency used to process the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'cart_details'	  => array(
-					'description' => __( 'The cart details for invoice.', 'invoicing' ),
+					'description' => __('The cart details for invoice.', 'invoicing'),
 					'type'        => 'array',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'required'	  => true,
 				),
 
 				'date'         => array(
-					'description' => __( "The date the invoice was published, in the site's timezone.", 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
+					'description' => __("The date the invoice was published, in the site's timezone.", 'invoicing'),
+					'type'        => array('string', 'null'),
 					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'due_date'     => array(
-					'description' => __( 'The due date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
+					'description' => __('The due date for the invoice.', 'invoicing'),
+					'type'        => array('string', 'null'),
 					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'completed_date'  => array(
-					'description' => __( 'The completed date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
+					'description' => __('The completed date for the invoice.', 'invoicing'),
+					'type'        => array('string', 'null'),
 					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 				
 				'link'         => array(
-					'description' => __( 'URL to the invoice.', 'invoicing' ),
+					'description' => __('URL to the invoice.', 'invoicing'),
 					'type'        => 'string',
 					'format'      => 'uri',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'mode'       	  => array(
-					'description' => __( 'The mode used to process the invoice.', 'invoicing' ),
+					'description' => __('The mode used to process the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'enum'        => array( 'live', 'test' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'enum'        => array('live', 'test'),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'slug'       	  => array(
-					'description' => __( 'An alphanumeric identifier for the invoice.', 'invoicing' ),
+					'description' => __('An alphanumeric identifier for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'arg_options' => array(
-						'sanitize_callback' => array( $this, 'sanitize_slug' ),
+						'sanitize_callback' => array($this, 'sanitize_slug'),
 					),
 					'readonly'    => true,
 				),
 
 				'status'       	  => array(
-					'description' => __( 'A named status for the invoice.', 'invoicing' ),
+					'description' => __('A named status for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'enum'        => array_keys( wpinv_get_invoice_statuses( true, true ) ),
-					'context'     => array( 'view', 'edit' ),
+					'enum'        => array_keys(wpinv_get_invoice_statuses(true, true)),
+					'context'     => array('view', 'edit'),
 					'default'	  => 'wpi-pending',
 				),
 
 				'status_nicename' => array(
-					'description' => __( 'A human-readable status name for the invoice.', 'invoicing' ),
+					'description' => __('A human-readable status name for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'embed' ),
+					'context'     => array('view', 'embed'),
 					'readonly'    => true,
 				),
 
 				'post_type'       => array(
-					'description' => __( 'The post type for the invoice.', 'invoicing' ),
+					'description' => __('The post type for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
@@ -1224,12 +1224,12 @@ 
 		 *
 		 * @param array   $schema    The invoice schema.
 		 */
-        $schema = apply_filters( "wpinv_rest_invoice_schema", $schema );
+        $schema = apply_filters("wpinv_rest_invoice_schema", $schema);
 
 		// Cache the invoice schema.
 		$this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
+		return $this->add_additional_fields_schema($this->schema);
 	}
 
 	/**
@@ -1241,20 +1241,20 @@ 
 	 */
 	protected function get_schema_links() {
 
-		$href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
+		$href = rest_url("{$this->namespace}/{$this->rest_base}/{id}");
 
 		$links = array();
 
 		$links[] = array(
 			'rel'          => 'https://api.w.org/action-publish',
-			'title'        => __( 'The current user can mark this invoice as completed.', 'invoicing' ),
+			'title'        => __('The current user can mark this invoice as completed.', 'invoicing'),
 			'href'         => $href,
 			'targetSchema' => array(
 				'type'       => 'object',
 				'properties' => array(
 					'status' => array(
 						'type' => 'string',
-						'enum' => array( 'publish', 'wpi-renewal' ),
+						'enum' => array('publish', 'wpi-renewal'),
 					),
 				),
 			),
@@ -1262,7 +1262,7 @@ 
 
 		$links[] = array(
 			'rel'          => 'https://api.w.org/action-assign-author',
-			'title'        => __( 'The current user can change the owner of this invoice.', 'invoicing' ),
+			'title'        => __('The current user can change the owner of this invoice.', 'invoicing'),
 			'href'         => $href,
 			'targetSchema' => array(
 				'type'       => 'object',
@@ -1285,24 +1285,24 @@ 
 	 * @param WPInv_Invoice $invoice Invoice Object.
 	 * @return array Links for the given invoice.
 	 */
-	protected function prepare_links( $invoice ) {
+	protected function prepare_links($invoice) {
 
 		// Prepare the base REST API endpoint for invoices.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+		$base = sprintf('%s/%s', $this->namespace, $this->rest_base);
 
 		// Entity meta.
 		$links = array(
 			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $invoice->ID ),
+				'href' => rest_url(trailingslashit($base) . $invoice->ID),
 			),
 			'collection' => array(
-				'href' => rest_url( $base ),
+				'href' => rest_url($base),
 			),
 		);
 
-		if ( ! empty( $invoice->user_id ) ) {
+		if (!empty($invoice->user_id)) {
 			$links['user'] = array(
-				'href'       => rest_url( 'wp/v2/users/' . $invoice->user_id ),
+				'href'       => rest_url('wp/v2/users/' . $invoice->user_id),
 				'embeddable' => true,
 			);
 		}
@@ -1316,7 +1316,7 @@ 
 		 *
 		 * @param array   $links    Rest links.
 		 */
-		return apply_filters( "wpinv_rest_invoice_links", $links );
+		return apply_filters("wpinv_rest_invoice_links", $links);
 
 	}
 
@@ -1329,24 +1329,24 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array List of link relations.
 	 */
-	protected function get_available_actions( $invoice, $request ) {
+	protected function get_available_actions($invoice, $request) {
 
-		if ( 'edit' !== $request['context'] ) {
+		if ('edit' !== $request['context']) {
 			return array();
 		}
 
 		$rels = array();
 
 		// Retrieve the post type object.
-		$post_type = get_post_type_object( $invoice->post_type );
+		$post_type = get_post_type_object($invoice->post_type);
 
 		// Mark invoice as completed.
-		if ( current_user_can( $post_type->cap->publish_posts ) ) {
+		if (current_user_can($post_type->cap->publish_posts)) {
 			$rels[] = 'https://api.w.org/action-publish';
 		}
 
 		// Change the owner of the invoice.
-		if ( current_user_can( $post_type->cap->edit_others_posts ) ) {
+		if (current_user_can($post_type->cap->edit_others_posts)) {
 			$rels[] = 'https://api.w.org/action-assign-author';
 		}
 
@@ -1359,7 +1359,7 @@ 
 		 *
 		 * @param array   $rels    Available link relations.
 		 */
-		return apply_filters( "wpinv_rest_invoice_link_relations", $rels );
+		return apply_filters("wpinv_rest_invoice_link_relations", $rels);
 	}
 
 	/**
@@ -1372,11 +1372,11 @@ 
 	 * @param string          $parameter Additional parameter to pass to validation.
 	 * @return array|WP_Error A list of valid statuses, otherwise WP_Error object.
 	 */
-	public function sanitize_post_statuses( $statuses, $request, $parameter ) {
+	public function sanitize_post_statuses($statuses, $request, $parameter) {
 
-		$statuses 	  = wp_parse_slug_list( $statuses );
-		$valid_statuses = array_keys( wpinv_get_invoice_statuses( true, true ) );
-		return array_intersect( $statuses, $valid_statuses );
+		$statuses = wp_parse_slug_list($statuses);
+		$valid_statuses = array_keys(wpinv_get_invoice_statuses(true, true));
+		return array_intersect($statuses, $valid_statuses);
 		
 	}
     

vendor/composer/ClassLoader.php

Spacing +2 added lines, -2 removed lines

@@ -342,7 +342,7 @@ 
             return false;
         }
         if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            $file = apcu_fetch($this->apcuPrefix . $class, $hit);
             if ($hit) {
                 return $file;
             }
@@ -356,7 +356,7 @@ 
         }
 
         if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
+            apcu_add($this->apcuPrefix . $class, $file);
         }
 
         if (false === $file) {

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetTD.php

Spacing +8 added lines, -8 removed lines

@@ -64,8 +64,8 @@ 
     {
         $month = ($month ? $month : date('m'));
         $year = ($year ? $year : date('Y'));
-        $firstSettlementDate = substr(date('c',mktime(0, 0, 0, $month, 1, $year)),0,-6);
-        $lastSettlementDate  = substr(date('c',mktime(0, 0, 0, $month+1, 0, $year)),0,-6);
+        $firstSettlementDate = substr(date('c', mktime(0, 0, 0, $month, 1, $year)), 0, -6);
+        $lastSettlementDate  = substr(date('c', mktime(0, 0, 0, $month + 1, 0, $year)), 0, -6);
         return $this->getSettledBatchList(true, $firstSettlementDate, $lastSettlementDate);
     }
 
@@ -98,12 +98,12 @@ 
         $month = ($month ? $month : date('m'));
         $day = ($day ? $day : date('d'));
         $year = ($year ? $year : date('Y'));
-        $firstSettlementDate = substr(date('c',mktime(0, 0, 0, (int)$month, (int)$day, (int)$year)),0,-6);
-        $lastSettlementDate  = substr(date('c',mktime(0, 0, 0, (int)$month, (int)$day, (int)$year)),0,-6);
+        $firstSettlementDate = substr(date('c', mktime(0, 0, 0, (int) $month, (int) $day, (int) $year)), 0, -6);
+        $lastSettlementDate  = substr(date('c', mktime(0, 0, 0, (int) $month, (int) $day, (int) $year)), 0, -6);
         $response = $this->getSettledBatchList(true, $firstSettlementDate, $lastSettlementDate);
         $batches = $response->xpath("batchList/batch");
         foreach ($batches as $batch) {
-            $batch_id = (string)$batch->batchId;
+            $batch_id = (string) $batch->batchId;
             $request = new AuthorizeNetTD;
             $tran_list = $request->getTransactionList($batch_id);
             $transactions = array_merge($transactions, $tran_list->xpath("transactions/transaction"));
@@ -187,11 +187,11 @@ 
      */
     private function _constructXml($request_type)
     {
-        $string = '<?xml version="1.0" encoding="utf-8"?><'.$request_type.' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"></'.$request_type.'>';
+        $string = '<?xml version="1.0" encoding="utf-8"?><' . $request_type . ' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"></' . $request_type . '>';
         $this->_xml = @new SimpleXMLElement($string);
         $merchant = $this->_xml->addChild('merchantAuthentication');
-        $merchant->addChild('name',$this->_api_login);
-        $merchant->addChild('transactionKey',$this->_transaction_key);
+        $merchant->addChild('name', $this->_api_login);
+        $merchant->addChild('transactionKey', $this->_transaction_key);
     }
     
 }