AyeCode / invoicing

widgets/buy-item.php

Indentation +49 added lines, -49 removed lines

@@ -38,29 +38,29 @@ 
                     'advanced'    => false
                 ),
                 '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
                 ),
                 'label'  => array(
-	                'title'       => __( 'Button Label', 'invoicing' ),
-	                'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
-	                'type'        => 'text',
-	                'desc_tip'    => true,
-	                'default'     => __( 'Buy Now', 'invoicing' ),
-	                'advanced'    => false
+                    'title'       => __( 'Button Label', 'invoicing' ),
+                    'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => __( 'Buy Now', 'invoicing' ),
+                    'advanced'    => false
                 ),
                 '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,43 +70,43 @@ 
         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(
-		    'items'     	=> '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
-		    'label'  	    => __( 'Buy Now', 'invoicing' ), // the button title
-		    'post_id'   	=> '', // any related post_id
-	    );
+        $defaults = array(
+            'items'     	=> '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
+            '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 );
 
-		$html = '<div class="wpi-buy-button-wrapper wpi-g">';
+        $html = '<div class="wpi-buy-button-wrapper wpi-g">';
 		
-		if ( empty( $args['items'] ) ) {
-			$html .= __( 'No items selected', 'invoicing' );
-		} else {
-			$post_id = isset( $args['post_id'] ) && is_numeric( $args['post_id'] ) ? sanitize_text_field( $args['post_id'] ) : 0;
-			$label   = isset( $args['label'] ) ? sanitize_text_field( $args['label'] ) : __( 'Buy Now', 'invoicing' );
-			$items   = esc_attr( $args['items'] );
-			$html   .= "<button class='button button-primary wpi-buy-button' type='button' onclick=\"wpi_buy(this, '$items','$post_id');\">$label</button>";
-		}
+        if ( empty( $args['items'] ) ) {
+            $html .= __( 'No items selected', 'invoicing' );
+        } else {
+            $post_id = isset( $args['post_id'] ) && is_numeric( $args['post_id'] ) ? sanitize_text_field( $args['post_id'] ) : 0;
+            $label   = isset( $args['label'] ) ? sanitize_text_field( $args['label'] ) : __( 'Buy Now', 'invoicing' );
+            $items   = esc_attr( $args['items'] );
+            $html   .= "<button class='button button-primary wpi-buy-button' type='button' onclick=\"wpi_buy(this, '$items','$post_id');\">$label</button>";
+        }
 	
-	    $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
-	    $html .= '</div>';
+        $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
+        $html .= '</div>';
 
-	    return $html;
+        return $html;
 
     }
 

Spacing +23 added lines, -23 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  wpi-g',
-                '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
                 ),
                 '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
                 ),
                 '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'     => __( 'Buy Now', 'invoicing' ),
+	                'default'     => __('Buy Now', 'invoicing'),
 	                'advanced'    => false
                 ),
                 '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,31 +79,31 @@ 
 	 *
 	 * @return string
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    $defaults = array(
 		    'items'     	=> '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
-		    'label'  	    => __( 'Buy Now', 'invoicing' ), // the button title
+		    '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);
 
 		$html = '<div class="wpi-buy-button-wrapper wpi-g">';
 		
-		if ( empty( $args['items'] ) ) {
-			$html .= __( 'No items selected', 'invoicing' );
+		if (empty($args['items'])) {
+			$html .= __('No items selected', 'invoicing');
 		} else {
-			$post_id = isset( $args['post_id'] ) && is_numeric( $args['post_id'] ) ? sanitize_text_field( $args['post_id'] ) : 0;
-			$label   = isset( $args['label'] ) ? sanitize_text_field( $args['label'] ) : __( 'Buy Now', 'invoicing' );
-			$items   = esc_attr( $args['items'] );
+			$post_id = isset($args['post_id']) && is_numeric($args['post_id']) ? sanitize_text_field($args['post_id']) : 0;
+			$label   = isset($args['label']) ? sanitize_text_field($args['label']) : __('Buy Now', 'invoicing');
+			$items   = esc_attr($args['items']);
 			$html   .= "<button class='button button-primary wpi-buy-button' type='button' onclick=\"wpi_buy(this, '$items','$post_id');\">$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/api/class-wpinv-rest-invoice-controller.php

Indentation +1272 added lines, -1272 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,79 +52,79 @@ 
     }
     
     /**
-	 * 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 items.', '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 items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
 
-		if ( ! is_user_logged_in() ) {
-			return new WP_Error( 'rest_forbidden', __( 'Sorry, you must be logged in to view items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
+        if ( ! is_user_logged_in() ) {
+            return new WP_Error( 'rest_forbidden', __( 'Sorry, you must be logged in to view items.', '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 request query parameters.
-		$args          = $this->get_request_collection_params( $request );
+        // Retrieve request query parameters.
+        $args          = $this->get_request_collection_params( $request );
 		
-		// WP_Query Args.
-		$wp_query_args = $this->get_collection_wp_query_params( $args, $request );
+        // WP_Query Args.
+        $wp_query_args = $this->get_collection_wp_query_params( $args, $request );
 		
-		// Get invoice ids...
-		$query         = new WP_Query( $wp_query_args );
-
-		// ... and map them into invoice objects.
-		$_invoices     = array_map( array( $this, 'get_post' ), $query->posts );
-
-		// Prepare the retrieved invoices
-		$invoices      = array();
-
-		foreach( $_invoices as $invoice ) {
-			if ( $this->check_read_permission( $invoice ) ) {
-				$invoices[] = $this->prepare_response_for_collection( $this->prepare_item_for_response( $invoice, $request ) );
-			}
-		}
-
-		// Prepare the response.
-		$response = rest_ensure_response( $invoices );
-		$response->header( 'X-WP-Total', (int) $query->found_posts );
-		$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.
+        // Get invoice ids...
+        $query         = new WP_Query( $wp_query_args );
+
+        // ... and map them into invoice objects.
+        $_invoices     = array_map( array( $this, 'get_post' ), $query->posts );
+
+        // Prepare the retrieved invoices
+        $invoices      = array();
+
+        foreach( $_invoices as $invoice ) {
+            if ( $this->check_read_permission( $invoice ) ) {
+                $invoices[] = $this->prepare_response_for_collection( $this->prepare_item_for_response( $invoice, $request ) );
+            }
+        }
+
+        // Prepare the response.
+        $response = rest_ensure_response( $invoices );
+        $response->header( 'X-WP-Total', (int) $query->found_posts );
+        $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 );
@@ -132,25 +132,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 item ID.', 'invoicing' ), array( 'status' => 404 ) );
+        $error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid item 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 ) || $this->post_type !== $invoice->post_type ) {
-			return $error;
+        $invoice = wpinv_get_invoice( (int) $invoice_id );
+        if ( empty( $invoice ) || $this->post_type !== $invoice->post_type ) {
+            return $error;
         }
 
         return $invoice;
@@ -158,77 +158,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 );
@@ -236,23 +236,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 item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing item.', '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 ) && ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 
+        if ( ! current_user_can( $post_type->cap->create_posts ) && ! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error( 
                 'rest_cannot_create',
                 __( 'Sorry, you are not allowed to create items as this user.', 'invoicing' ), 
                 array( 
@@ -261,90 +261,90 @@ 
             );
         }
 
-		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 item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
-
-		$request->set_param( 'context', 'edit' );
-
-		// Prepare the updated data.
-		$invoice_data = $this->prepare_item_for_database( $request );
-
-		if ( is_wp_error( $invoice_data ) ) {
-			return $invoice_data;
-		}
-
-		// Try creating the invoice
-		$invoice_data['post_type']    = $this->post_type;
-		$invoice_data['private_note'] = __( 'Created via API.', 'invoicing' );
+     * 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 item.', 'invoicing' ), array( 'status' => 400 ) );
+        }
+
+        $request->set_param( 'context', 'edit' );
+
+        // Prepare the updated data.
+        $invoice_data = $this->prepare_item_for_database( $request );
+
+        if ( is_wp_error( $invoice_data ) ) {
+            return $invoice_data;
+        }
+
+        // Try creating the invoice
+        $invoice_data['post_type']    = $this->post_type;
+        $invoice_data['private_note'] = __( 'Created via API.', 'invoicing' );
         $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 item.', 'invoicing' ), 
                 array( 
@@ -353,162 +353,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 true;
-		}
-
-		return new WP_Error( 
-			'rest_cannot_delete', 
-			__( 'Sorry, you are not allowed to delete this item.', 'invoicing' ), 
-			array( 
-				'status' => rest_authorization_required_code(),
-			)
-		);
-	}
-
-	/**
-	 * 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 ) {
+    }
+
+    /**
+     * 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 true;
+        }
+
+        return new WP_Error( 
+            'rest_cannot_delete', 
+            __( 'Sorry, you are not allowed to delete this item.', 'invoicing' ), 
+            array( 
+                'status' => rest_authorization_required_code(),
+            )
+        );
+    }
+
+    /**
+     * 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 item 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 item 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(
 
@@ -526,11 +526,11 @@ 
 
             // User.
             'user'                  => array(
-				'description'       => __( 'Limit result set to items for a specif user. Accepts a user ID, or comma-separated list of IDs', 'invoicing' ),
-				'type'              => 'string',
-			),
+                'description'       => __( 'Limit result set to items for a specif user. Accepts a user ID, or comma-separated list of IDs', 'invoicing' ),
+                'type'              => 'string',
+            ),
 
-			// Exclude certain users
+            // Exclude certain users
             'exclude_users'  	    => array(
                 'description' 		=> __( 'Exclude items from specific users.', 'invoicing' ),
                 'type'        		=> 'array',
@@ -540,59 +540,59 @@ 
                 'default'     		=> array(),
             ),
 			
-			// Items before.
+            // Items before.
             'before_date'           => array(
-				'description'       => __( 'Limit result set to items created before a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
-				'type'              => 'string',
-			),
+                'description'       => __( 'Limit result set to items created before a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
+                'type'              => 'string',
+            ),
 
             'meta_key'           => array(
-				'description'       => __( 'Filter items by custom field key.', 'invoicing' ),
-				'type'              => 'string',
-			),
+                'description'       => __( 'Filter items by custom field key.', 'invoicing' ),
+                'type'              => 'string',
+            ),
 
             'meta_compare_key'           => array(
-				'description'       => __( 'Comparison operator to test the `meta_key`.', 'invoicing' ),
-				'type'              => 'string',
-				'default'              => '=',
-				'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
-			),
+                'description'       => __( 'Comparison operator to test the `meta_key`.', 'invoicing' ),
+                'type'              => 'string',
+                'default'              => '=',
+                'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
+            ),
 
             'meta_value'           => array(
-				'description'       => __( 'Filter items by custom field value.', 'invoicing' ),
-				'type'              => 'string',
-			),
+                'description'       => __( 'Filter items by custom field value.', 'invoicing' ),
+                'type'              => 'string',
+            ),
 
             'meta_compare'           => array(
-				'description'       => __( 'Comparison operator to test the `meta_value`.', 'invoicing' ),
-				'type'              => 'string',
-				'default'              => '=',
-				'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
-			),
-
-			'meta_value_num'           => array(
-				'description'       => __( 'Filter items by a numeric custom field value.', 'invoicing' ),
-				'type'              => 'integer',
-			),
-
-			// items after.
+                'description'       => __( 'Comparison operator to test the `meta_value`.', 'invoicing' ),
+                'type'              => 'string',
+                'default'              => '=',
+                'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
+            ),
+
+            'meta_value_num'           => array(
+                'description'       => __( 'Filter items by a numeric custom field value.', 'invoicing' ),
+                'type'              => 'integer',
+            ),
+
+            // items after.
             'after_date'            => array(
-				'description'       => __( 'Limit result set to items created after a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
-				'type'              => 'string',
+                'description'       => __( 'Limit result set to items created after a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
+                'type'              => 'string',
             ),
             
             // 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,
             ),
 
             // limit to certain items
@@ -603,9 +603,9 @@ 
                     'type' => 'integer',
                 ),
                 'default'     => array(),
-			),
+            ),
 			
-			// Exclude certain items
+            // Exclude certain items
             'exclude'  => array(
                 'description' => __( 'Ensure result set excludes specific IDs.', 'invoicing' ),
                 'type'        => 'array',
@@ -624,9 +624,9 @@ 
                     'date',
                     'id',
                     'modified',
-					'title',
-					'meta_value',
-					'meta_value_num'
+                    'title',
+                    'meta_value',
+                    'meta_value_num'
                 ),
             ),
 
@@ -639,932 +639,932 @@ 
             ),
         );
 
-		/**
-		 * 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 );
+    }
 	
-	/**
-	 * Retrieves the request query params for the invoices collection.
-	 *
-	 * @since 1.0.15
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array Request collection parameters.
-	 */
-	public function get_request_collection_params( $request ) {
+    /**
+     * Retrieves the request query params for the invoices collection.
+     *
+     * @since 1.0.15
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array Request collection parameters.
+     */
+    public function get_request_collection_params( $request ) {
 		
-		// Retrieve the list of registered invoice query parameters.
-		$registered = $this->get_collection_params();
+        // Retrieve the list of registered invoice query parameters.
+        $registered = $this->get_collection_params();
 
-		// Default args
-		$args       = array(
+        // Default args
+        $args       = array(
             'status'                => $this->get_post_statuses(),
             'user'                  => null,
             'exclude_users'  	    => array(),
-			'before_date'           => null,
+            'before_date'           => null,
             'meta_key'              => null,
             'meta_compare_key'      => '=',
             'meta_value'            => null,
             'meta_compare'          => '=',
-			'meta_value_num'        => null,
+            'meta_value_num'        => null,
             'after_date'            => null,
             'limit'                 => (int) get_option( 'posts_per_page' ),
-			'page'     				=> 1,
-			'include'				=> array(),
+            'page'     				=> 1,
+            'include'				=> array(),
             'exclude'  				=> array(),
             'orderby'  		  		=> 'date',
             'order'    				=> 'DESC',
-		);
+        );
 
-		// Add any params from the requests.
-		foreach ( array_keys( $registered ) as $key ) {
+        // Add any params from the requests.
+        foreach ( array_keys( $registered ) as $key ) {
             if ( isset( $request[ $key] ) ) {
                 $args[ $key ] = $request[ $key];
             }
         }
 		
-		/**
-		 * Filters the requests collection parameters for the invoices controller.
-		 *
-		 *
-		 * @since 1.0.15
-		 *
-		 * @param array           $args    Request query args.
-		 * @param WP_REST_Request $request Full details about the request.
-		 */
-		return apply_filters( "wpinv_rest_invoices_collection_request_params", $args, $request );
-	}
+        /**
+         * Filters the requests collection parameters for the invoices controller.
+         *
+         *
+         * @since 1.0.15
+         *
+         * @param array           $args    Request query args.
+         * @param WP_REST_Request $request Full details about the request.
+         */
+        return apply_filters( "wpinv_rest_invoices_collection_request_params", $args, $request );
+    }
 	
-	/**
-	 * Retrieves the WP_Query params for the invoices collection.
-	 *
-	 * @since 1.0.15
-	 * @param array           $args Request args.
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array WP_Query parameters.
-	 */
-	public function get_collection_wp_query_params( $args, $request ) {
+    /**
+     * Retrieves the WP_Query params for the invoices collection.
+     *
+     * @since 1.0.15
+     * @param array           $args Request args.
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array WP_Query parameters.
+     */
+    public function get_collection_wp_query_params( $args, $request ) {
 		
-		// Prepare the parameters.
-		$wp_query_args = array(
-			'post_type'        => $this->post_type,
-			'post_status'      => $args['status'],
-			'author'           => $args['user'],
-			'author__not_in'   => $args['exclude_users'],
-			'posts_per_page'   => $args['limit'],
-			'paged'            => $args['page'],
-			'meta_key'         => $args['meta_key'],
-			'meta_compare_key' => $args['meta_compare_key'],
-			'meta_value'       => $args['meta_value'],
-			'meta_compare'     => $args['meta_compare'],
-			'meta_value_num'   => $args['meta_value_num'],
-			'post__in'         => $args['include'],
-			'post__in'         => $args['exclude'],
-			'date_query'       => array( array() ),
-			'fields'           => 'ids',
-			'orderby'          => $args['orderby'],
-			'order'            => $args['order'],
-		);
-
-		// Only admins can view other user's invoices.
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			$wp_query_args['author'] = get_current_user_id();
-		}
-
-		// No date specific params provided.
-		if ( empty( $args['before_date'] ) && empty( $args['after_date'] ) ) {
-			unset( $wp_query_args['date_query'] );
-		}
-
-		if ( ! empty( $args['before_date'] ) ) {
-			$wp_query_args['date_query'][0]['before'] = $args['before_date'];
-		}
-
-		if ( ! empty( $args['after_date'] ) ) {
-			$wp_query_args['date_query'][0]['after'] = $args['after_date'];
-		}
-
-		// Remove empty variables.
-		$wp_query_args = array_filter( $wp_query_args );
-
-		// This can be zero.
-		if ( ! is_null( $args['meta_value_num'] ) ) {
-			$wp_query_args['meta_value_num'] = $args['meta_value_num'];
-		}
+        // Prepare the parameters.
+        $wp_query_args = array(
+            'post_type'        => $this->post_type,
+            'post_status'      => $args['status'],
+            'author'           => $args['user'],
+            'author__not_in'   => $args['exclude_users'],
+            'posts_per_page'   => $args['limit'],
+            'paged'            => $args['page'],
+            'meta_key'         => $args['meta_key'],
+            'meta_compare_key' => $args['meta_compare_key'],
+            'meta_value'       => $args['meta_value'],
+            'meta_compare'     => $args['meta_compare'],
+            'meta_value_num'   => $args['meta_value_num'],
+            'post__in'         => $args['include'],
+            'post__in'         => $args['exclude'],
+            'date_query'       => array( array() ),
+            'fields'           => 'ids',
+            'orderby'          => $args['orderby'],
+            'order'            => $args['order'],
+        );
+
+        // Only admins can view other user's invoices.
+        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+            $wp_query_args['author'] = get_current_user_id();
+        }
+
+        // No date specific params provided.
+        if ( empty( $args['before_date'] ) && empty( $args['after_date'] ) ) {
+            unset( $wp_query_args['date_query'] );
+        }
+
+        if ( ! empty( $args['before_date'] ) ) {
+            $wp_query_args['date_query'][0]['before'] = $args['before_date'];
+        }
+
+        if ( ! empty( $args['after_date'] ) ) {
+            $wp_query_args['date_query'][0]['after'] = $args['after_date'];
+        }
+
+        // Remove empty variables.
+        $wp_query_args = array_filter( $wp_query_args );
+
+        // This can be zero.
+        if ( ! is_null( $args['meta_value_num'] ) ) {
+            $wp_query_args['meta_value_num'] = $args['meta_value_num'];
+        }
 		
-		/**
-		 * Filters the invoices collection WP_Query parameters for the invoices controller.
-		 *
-		 *
-		 * @since 1.0.15
-		 *
-		 * @param array           $args          Request args.
-		 * @param array           $wp_query_args Generated WP_Query args args.
-		 * @param WP_REST_Request $request       Full details about the request.
-		 */
-		return apply_filters( "wpinv_rest_invoices_collection_wp_query_params", $wp_query_args, $args, $request );
+        /**
+         * Filters the invoices collection WP_Query parameters for the invoices controller.
+         *
+         *
+         * @since 1.0.15
+         *
+         * @param array           $args          Request args.
+         * @param array           $wp_query_args Generated WP_Query args args.
+         * @param WP_REST_Request $request       Full details about the request.
+         */
+        return apply_filters( "wpinv_rest_invoices_collection_wp_query_params", $wp_query_args, $args, $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;
-	}
-
-	/**
-	 * 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'], $this->get_post_statuses(), 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'], $this->get_post_statuses(), 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];
+            }
 
-		}
+        }
 
-		if ( ! empty( $schema['properties']['valid_until'] ) && isset( $request['valid_until'] ) ) {
+        if ( ! empty( $schema['properties']['valid_until'] ) && isset( $request['valid_until'] ) ) {
 
-			if ( ! empty( $request['valid_until'] ) ) {
-				$prepared_invoice->valid_until = gmdate( 'Y-m-d', strtotime( $request['valid_until'] ) );
-			} else {
-				$prepared_invoice->valid_until = '';
-			}
+            if ( ! empty( $request['valid_until'] ) ) {
+                $prepared_invoice->valid_until = gmdate( 'Y-m-d', strtotime( $request['valid_until'] ) );
+            } else {
+                $prepared_invoice->valid_until = '';
+            }
 
-		}
+        }
 
-		$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();
+        // Base fields for every invoice.
+        $data = array();
 
-		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
-			$data['id'] = $invoice->ID;
-		}
+        // 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 ) {
+        // 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'
+        );
 
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $invoice->get( $property );
-			}
-
-		}
-
-		// Valid until
-		if ( rest_is_field_included( 'valid_until', $fields ) && $this->post_type === 'wpi_quote' ) {
-			$data['valid_until'] = get_post_meta( $invoice->ID, 'wpinv_quote_valid_until', true );
-		}
-
-		// 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,
-				),
+        foreach( $invoice_properties as $property ) {
+
+            if ( rest_is_field_included( $property, $fields ) ) {
+                $data[$property] = $invoice->get( $property );
+            }
+
+        }
+
+        // Valid until
+        if ( rest_is_field_included( 'valid_until', $fields ) && $this->post_type === 'wpi_quote' ) {
+            $data['valid_until'] = get_post_meta( $invoice->ID, 'wpinv_quote_valid_until', true );
+        }
+
+        // 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,
+                ),
 				
-				'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'        => $this->get_post_statuses(),
-					'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'        => $this->get_post_statuses(),
+                    '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 ) {
-		return array_intersect( wp_parse_slug_list( $statuses ), $this->get_post_statuses() );
-	}
-
-	/**
-	 * Retrieves a valid list of post statuses.
-	 *
-	 * @since 1.0.15
-	 *
-	 * @return array A list of registered item statuses.
-	 */
-	public function get_post_statuses() {
-		return array_keys( wpinv_get_invoice_statuses( true, true ) );
-	}
+        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 ) {
+        return array_intersect( wp_parse_slug_list( $statuses ), $this->get_post_statuses() );
+    }
+
+    /**
+     * Retrieves a valid list of post statuses.
+     *
+     * @since 1.0.15
+     *
+     * @return array A list of registered item statuses.
+     */
+    public function get_post_statuses() {
+        return array_keys( wpinv_get_invoice_statuses( true, true ) );
+    }
     
 }
\ No newline at end of file

Spacing +325 added lines, -325 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,16 +60,16 @@ 
 	 * @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 items.', '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 items.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
-		if ( ! is_user_logged_in() ) {
-			return new WP_Error( 'rest_forbidden', __( 'Sorry, you must be logged in to view items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		if (!is_user_logged_in()) {
+			return new WP_Error('rest_forbidden', __('Sorry, you must be logged in to view items.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		// Read checks will be evaluated on a per invoice basis
@@ -86,33 +86,33 @@ 
 	 * @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 request query parameters.
-		$args          = $this->get_request_collection_params( $request );
+		$args          = $this->get_request_collection_params($request);
 		
 		// WP_Query Args.
-		$wp_query_args = $this->get_collection_wp_query_params( $args, $request );
+		$wp_query_args = $this->get_collection_wp_query_params($args, $request);
 		
 		// Get invoice ids...
-		$query         = new WP_Query( $wp_query_args );
+		$query         = new WP_Query($wp_query_args);
 
 		// ... and map them into invoice objects.
-		$_invoices     = array_map( array( $this, 'get_post' ), $query->posts );
+		$_invoices     = array_map(array($this, 'get_post'), $query->posts);
 
 		// Prepare the retrieved invoices
 		$invoices      = array();
 
-		foreach( $_invoices as $invoice ) {
-			if ( $this->check_read_permission( $invoice ) ) {
-				$invoices[] = $this->prepare_response_for_collection( $this->prepare_item_for_response( $invoice, $request ) );
+		foreach ($_invoices as $invoice) {
+			if ($this->check_read_permission($invoice)) {
+				$invoices[] = $this->prepare_response_for_collection($this->prepare_item_for_response($invoice, $request));
 			}
 		}
 
 		// Prepare the response.
-		$response = rest_ensure_response( $invoices );
-		$response->header( 'X-WP-Total', (int) $query->found_posts );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+		$response = rest_ensure_response($invoices);
+		$response->header('X-WP-Total', (int) $query->found_posts);
+		$response->header('X-WP-TotalPages', (int) $query->max_num_pages);
 
 		/**
 		 * Filters the responses for invoices requests.
@@ -125,9 +125,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);
         
     }
 
@@ -139,17 +139,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 item ID.', 'invoicing' ), array( 'status' => 404 ) );
+		$error = new WP_Error('rest_invoice_invalid_id', __('Invalid item 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 ) || $this->post_type !== $invoice->post_type ) {
+		$invoice = wpinv_get_invoice((int) $invoice_id);
+		if (empty($invoice) || $this->post_type !== $invoice->post_type) {
 			return $error;
         }
 
@@ -165,18 +165,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;
@@ -193,8 +193,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);
     }
     
     /**
@@ -205,19 +205,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.
@@ -229,9 +229,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);
 
     }
     
@@ -243,18 +243,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 item.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_invoice_exists', __('Cannot create existing item.', '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 ) && ! wpinv_current_user_can_manage_invoicing() ) {
+		if (!current_user_can($post_type->cap->create_posts) && !wpinv_current_user_can_manage_invoicing()) {
 			return new WP_Error( 
                 'rest_cannot_create',
-                __( 'Sorry, you are not allowed to create items as this user.', 'invoicing' ), 
+                __('Sorry, you are not allowed to create items as this user.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -272,32 +272,32 @@ 
 	 * @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 item.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_invoice_exists', __('Cannot create existing item.', '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_data['post_type']    = $this->post_type;
-		$invoice_data['private_note'] = __( 'Created via API.', 'invoicing' );
-        $invoice = wpinv_insert_invoice( $invoice_data, true );
+		$invoice_data['private_note'] = __('Created via API.', 'invoicing');
+        $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.
@@ -308,7 +308,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.
@@ -320,9 +320,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);
 	}
 
 	/**
@@ -333,20 +333,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 item.', 'invoicing' ), 
+                __('Sorry, you are not allowed to update this item.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -364,46 +364,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.
@@ -415,9 +415,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);
 	}
 
 	/**
@@ -428,22 +428,22 @@ 
 	 * @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 true;
 		}
 
 		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(),
 			)
@@ -458,31 +458,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 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));
 		}
 
 		/**
@@ -494,7 +494,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;
 
@@ -510,29 +510,29 @@ 
 	 */
 	public function get_collection_params() {
         
-        $query_params               = array(
+        $query_params = array(
 
             // item status.
             'status'                => array(
                 'default'           => $this->get_post_statuses(),
-                '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',
                 'items'             => array(
                     'enum'          => $this->get_post_statuses(),
                     'type'          => 'string',
                 ),
-                'sanitize_callback' => array( $this, 'sanitize_post_statuses' ),
+                'sanitize_callback' => array($this, 'sanitize_post_statuses'),
             ),
 
             // User.
             'user'                  => array(
-				'description'       => __( 'Limit result set to items for a specif user. Accepts a user ID, or comma-separated list of IDs', 'invoicing' ),
+				'description'       => __('Limit result set to items for a specif user. Accepts a user ID, or comma-separated list of IDs', 'invoicing'),
 				'type'              => 'string',
 			),
 
 			// Exclude certain users
             'exclude_users'  	    => array(
-                'description' 		=> __( 'Exclude items from specific users.', 'invoicing' ),
+                'description' 		=> __('Exclude items from specific users.', 'invoicing'),
                 'type'        		=> 'array',
                 'items'       		=> array(
                     'type' => 'integer',
@@ -542,62 +542,62 @@ 
 			
 			// Items before.
             'before_date'           => array(
-				'description'       => __( 'Limit result set to items created before a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
+				'description'       => __('Limit result set to items created before a specific date. Accepts strtotime()-compatible string.', 'invoicing'),
 				'type'              => 'string',
 			),
 
             'meta_key'           => array(
-				'description'       => __( 'Filter items by custom field key.', 'invoicing' ),
+				'description'       => __('Filter items by custom field key.', 'invoicing'),
 				'type'              => 'string',
 			),
 
             'meta_compare_key'           => array(
-				'description'       => __( 'Comparison operator to test the `meta_key`.', 'invoicing' ),
+				'description'       => __('Comparison operator to test the `meta_key`.', 'invoicing'),
 				'type'              => 'string',
 				'default'              => '=',
-				'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
+				'enum'        		=> array_map('trim', explode(',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE')),
 			),
 
             'meta_value'           => array(
-				'description'       => __( 'Filter items by custom field value.', 'invoicing' ),
+				'description'       => __('Filter items by custom field value.', 'invoicing'),
 				'type'              => 'string',
 			),
 
             'meta_compare'           => array(
-				'description'       => __( 'Comparison operator to test the `meta_value`.', 'invoicing' ),
+				'description'       => __('Comparison operator to test the `meta_value`.', 'invoicing'),
 				'type'              => 'string',
 				'default'              => '=',
-				'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
+				'enum'        		=> array_map('trim', explode(',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE')),
 			),
 
 			'meta_value_num'           => array(
-				'description'       => __( 'Filter items by a numeric custom field value.', 'invoicing' ),
+				'description'       => __('Filter items by a numeric custom field value.', 'invoicing'),
 				'type'              => 'integer',
 			),
 
 			// items after.
             'after_date'            => array(
-				'description'       => __( 'Limit result set to items created after a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
+				'description'       => __('Limit result set to items created after a specific date. Accepts strtotime()-compatible string.', 'invoicing'),
 				'type'              => 'string',
             ),
             
             // 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,
             ),
 
             // limit to certain items
             'include'  => array(
-                'description' => __( 'Limit result set to specific IDs.', 'invoicing' ),
+                'description' => __('Limit result set to specific IDs.', 'invoicing'),
                 'type'        => 'array',
                 'items'       => array(
                     'type' => 'integer',
@@ -607,7 +607,7 @@ 
 			
 			// 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',
@@ -617,7 +617,7 @@ 
 
             // Order items by
             'orderby'  		  => array(
-                'description' => __( 'Sort retrieved items by parameter.', 'invoicing' ),
+                'description' => __('Sort retrieved items by parameter.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'date',
                 'enum'        => array(
@@ -632,10 +632,10 @@ 
 
             // How to order
             'order'    => array(
-                'description' => __( 'Designates ascending or descending order of ítems.', 'invoicing' ),
+                'description' => __('Designates ascending or descending order of ítems.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'DESC',
-                'enum'        => array( 'ASC', 'DESC' ),
+                'enum'        => array('ASC', 'DESC'),
             ),
         );
 
@@ -647,7 +647,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);
 	}
 	
 	/**
@@ -657,7 +657,7 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array Request collection parameters.
 	 */
-	public function get_request_collection_params( $request ) {
+	public function get_request_collection_params($request) {
 		
 		// Retrieve the list of registered invoice query parameters.
 		$registered = $this->get_collection_params();
@@ -674,7 +674,7 @@ 
             'meta_compare'          => '=',
 			'meta_value_num'        => null,
             'after_date'            => null,
-            'limit'                 => (int) get_option( 'posts_per_page' ),
+            'limit'                 => (int) get_option('posts_per_page'),
 			'page'     				=> 1,
 			'include'				=> array(),
             'exclude'  				=> array(),
@@ -683,9 +683,9 @@ 
 		);
 
 		// Add any params from the requests.
-		foreach ( array_keys( $registered ) as $key ) {
-            if ( isset( $request[ $key] ) ) {
-                $args[ $key ] = $request[ $key];
+		foreach (array_keys($registered) as $key) {
+            if (isset($request[$key])) {
+                $args[$key] = $request[$key];
             }
         }
 		
@@ -698,7 +698,7 @@ 
 		 * @param array           $args    Request query args.
 		 * @param WP_REST_Request $request Full details about the request.
 		 */
-		return apply_filters( "wpinv_rest_invoices_collection_request_params", $args, $request );
+		return apply_filters("wpinv_rest_invoices_collection_request_params", $args, $request);
 	}
 	
 	/**
@@ -709,7 +709,7 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array WP_Query parameters.
 	 */
-	public function get_collection_wp_query_params( $args, $request ) {
+	public function get_collection_wp_query_params($args, $request) {
 		
 		// Prepare the parameters.
 		$wp_query_args = array(
@@ -726,35 +726,35 @@ 
 			'meta_value_num'   => $args['meta_value_num'],
 			'post__in'         => $args['include'],
 			'post__in'         => $args['exclude'],
-			'date_query'       => array( array() ),
+			'date_query'       => array(array()),
 			'fields'           => 'ids',
 			'orderby'          => $args['orderby'],
 			'order'            => $args['order'],
 		);
 
 		// Only admins can view other user's invoices.
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
+		if (!wpinv_current_user_can_manage_invoicing()) {
 			$wp_query_args['author'] = get_current_user_id();
 		}
 
 		// No date specific params provided.
-		if ( empty( $args['before_date'] ) && empty( $args['after_date'] ) ) {
-			unset( $wp_query_args['date_query'] );
+		if (empty($args['before_date']) && empty($args['after_date'])) {
+			unset($wp_query_args['date_query']);
 		}
 
-		if ( ! empty( $args['before_date'] ) ) {
+		if (!empty($args['before_date'])) {
 			$wp_query_args['date_query'][0]['before'] = $args['before_date'];
 		}
 
-		if ( ! empty( $args['after_date'] ) ) {
+		if (!empty($args['after_date'])) {
 			$wp_query_args['date_query'][0]['after'] = $args['after_date'];
 		}
 
 		// Remove empty variables.
-		$wp_query_args = array_filter( $wp_query_args );
+		$wp_query_args = array_filter($wp_query_args);
 
 		// This can be zero.
-		if ( ! is_null( $args['meta_value_num'] ) ) {
+		if (!is_null($args['meta_value_num'])) {
 			$wp_query_args['meta_value_num'] = $args['meta_value_num'];
 		}
 		
@@ -768,7 +768,7 @@ 
 		 * @param array           $wp_query_args Generated WP_Query args args.
 		 * @param WP_REST_Request $request       Full details about the request.
 		 */
-		return apply_filters( "wpinv_rest_invoices_collection_wp_query_params", $wp_query_args, $args, $request );
+		return apply_filters("wpinv_rest_invoices_collection_wp_query_params", $wp_query_args, $args, $request);
     }
     
     /**
@@ -779,7 +779,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;
 	}
 
@@ -791,49 +791,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'], $this->get_post_statuses(), true ) ) {
+			if (in_array($request['status'], $this->get_post_statuses(), 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;
 		
@@ -844,59 +844,59 @@ 
 		}
 
 		// 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];
 			}
 
 		}
 
-		if ( ! empty( $schema['properties']['valid_until'] ) && isset( $request['valid_until'] ) ) {
+		if (!empty($schema['properties']['valid_until']) && isset($request['valid_until'])) {
 
-			if ( ! empty( $request['valid_until'] ) ) {
-				$prepared_invoice->valid_until = gmdate( 'Y-m-d', strtotime( $request['valid_until'] ) );
+			if (!empty($request['valid_until'])) {
+				$prepared_invoice->valid_until = gmdate('Y-m-d', strtotime($request['valid_until']));
 			} else {
 				$prepared_invoice->valid_until = '';
 			}
 
 		}
 
-		$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.
@@ -906,7 +906,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);
 
 	}
 
@@ -919,20 +919,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;
 		}
 
@@ -947,79 +947,79 @@ 
 			'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);
 			}
 
 		}
 
 		// Valid until
-		if ( rest_is_field_included( 'valid_until', $fields ) && $this->post_type === 'wpi_quote' ) {
-			$data['valid_until'] = get_post_meta( $invoice->ID, 'wpinv_quote_valid_until', true );
+		if (rest_is_field_included('valid_until', $fields) && $this->post_type === 'wpi_quote') {
+			$data['valid_until'] = get_post_meta($invoice->ID, 'wpinv_quote_valid_until', true);
 		}
 
 		// 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);
 			}
 		}
 
@@ -1032,7 +1032,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);
 	}
 
 	/**
@@ -1045,57 +1045,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;
@@ -1114,8 +1114,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(
@@ -1127,266 +1127,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'        => $this->get_post_statuses(),
-					'context'     => array( 'view', 'edit' ),
+					'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,
 				),
 			),
@@ -1404,12 +1404,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);
 	}
 
 	/**
@@ -1421,20 +1421,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'),
 					),
 				),
 			),
@@ -1442,7 +1442,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',
@@ -1465,24 +1465,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,
 			);
 		}
@@ -1496,7 +1496,7 @@ 
 		 *
 		 * @param array   $links    Rest links.
 		 */
-		return apply_filters( "wpinv_rest_invoice_links", $links );
+		return apply_filters("wpinv_rest_invoice_links", $links);
 
 	}
 
@@ -1509,24 +1509,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';
 		}
 
@@ -1539,7 +1539,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);
 	}
 
 	/**
@@ -1552,8 +1552,8 @@ 
 	 * @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 ) {
-		return array_intersect( wp_parse_slug_list( $statuses ), $this->get_post_statuses() );
+	public function sanitize_post_statuses($statuses, $request, $parameter) {
+		return array_intersect(wp_parse_slug_list($statuses), $this->get_post_statuses());
 	}
 
 	/**
@@ -1564,7 +1564,7 @@ 
 	 * @return array A list of registered item statuses.
 	 */
 	public function get_post_statuses() {
-		return array_keys( wpinv_get_invoice_statuses( true, true ) );
+		return array_keys(wpinv_get_invoice_statuses(true, true));
 	}
     
 }
\ No newline at end of file

includes/class-wpinv-api.php

Indentation +15 added lines, -15 removed lines

@@ -58,14 +58,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.
@@ -75,15 +75,15 @@ 
         $this->discounts_controller->register_routes();
 
         /**
-		 * Fires when registering Invoicing REST routes.
-		 *
-		 *
-		 * @since 1.0.15
-		 *
-		 *
-		 * @param array           $invoice_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+         * Fires when registering Invoicing REST routes.
+         *
+         *
+         * @since 1.0.15
+         *
+         *
+         * @param array           $invoice_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         do_action( "wpinv_register_rest_routes", $this );
         
     }

Spacing +12 added lines, -12 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
@@ -42,19 +42,19 @@ 
      * @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->discounts_controller= new WPInv_REST_Discounts_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);
+        $this->discounts_controller = new WPInv_REST_Discounts_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'));
     }
 
 
@@ -84,7 +84,7 @@ 
 		 * @param array           $invoice_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        do_action( "wpinv_register_rest_routes", $this );
+        do_action("wpinv_register_rest_routes", $this);
         
     }
 
@@ -97,13 +97,13 @@ 
     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');
 
         // Discounts
-        require_once( WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-discounts-controller.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-discounts-controller.php');
 
     }
     

includes/wpinv-subscription.php

Indentation +456 added lines, -456 removed lines

@@ -2,7 +2,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 
@@ -13,183 +13,183 @@ 
  */
 class WPInv_Subscription {
 
-	private $subs_db;
+    private $subs_db;
+
+    public $id                = 0;
+    public $customer_id       = 0;
+    public $period            = '';
+    public $initial_amount    = '';
+    public $recurring_amount  = '';
+    public $bill_times        = 0;
+    public $transaction_id    = '';
+    public $parent_payment_id = 0;
+    public $product_id        = 0;
+    public $created           = '0000-00-00 00:00:00';
+    public $expiration        = '0000-00-00 00:00:00';
+    public $trial_period      = '';
+    public $status            = 'pending';
+    public $profile_id        = '';
+    public $gateway           = '';
+    public $customer;
 
-	public $id                = 0;
-	public $customer_id       = 0;
-	public $period            = '';
-	public $initial_amount    = '';
-	public $recurring_amount  = '';
-	public $bill_times        = 0;
-	public $transaction_id    = '';
-	public $parent_payment_id = 0;
-	public $product_id        = 0;
-	public $created           = '0000-00-00 00:00:00';
-	public $expiration        = '0000-00-00 00:00:00';
-	public $trial_period      = '';
-	public $status            = 'pending';
-	public $profile_id        = '';
-	public $gateway           = '';
-	public $customer;
-
-	/**
-	 * Get us started
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+    /**
+     * Get us started
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
 
-		$this->subs_db = new WPInv_Subscriptions_DB;
+        $this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+        if( $_by_profile_id ) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+            $_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
 
-			if( empty( $_sub ) ) {
-				return false;
-			}
+            if( empty( $_sub ) ) {
+                return false;
+            }
 
-			$_id_or_object = $_sub;
+            $_id_or_object = $_sub;
 
-		}
+        }
 
-		return $this->setup_subscription( $_id_or_object );
-	}
+        return $this->setup_subscription( $_id_or_object );
+    }
 
-	/**
-	 * Setup the subscription object
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+    /**
+     * Setup the subscription object
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    private function setup_subscription( $id_or_object = 0 ) {
 
-		if( empty( $id_or_object ) ) {
-			return false;
-		}
+        if( empty( $id_or_object ) ) {
+            return false;
+        }
 
-		if( is_numeric( $id_or_object ) ) {
+        if( is_numeric( $id_or_object ) ) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+            $sub = $this->subs_db->get( $id_or_object );
 
-		} elseif( is_object( $id_or_object ) ) {
+        } elseif( is_object( $id_or_object ) ) {
 
-			$sub = $id_or_object;
+            $sub = $id_or_object;
 
-		}
+        }
 
-		if( empty( $sub ) ) {
-			return false;
-		}
+        if( empty( $sub ) ) {
+            return false;
+        }
 
-		foreach( $sub as $key => $value ) {
-			$this->$key = $value;
-		}
+        foreach( $sub as $key => $value ) {
+            $this->$key = $value;
+        }
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+        $this->customer = get_userdata( $this->customer_id );
+        $this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+        do_action( 'wpinv_recurring_setup_subscription', $this );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Magic __get function to dispatch a call to retrieve a private property
-	 *
-	 * @since 1.0.0
-	 */
-	public function __get( $key ) {
+    /**
+     * Magic __get function to dispatch a call to retrieve a private property
+     *
+     * @since 1.0.0
+     */
+    public function __get( $key ) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+        if( method_exists( $this, 'get_' . $key ) ) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func( array( $this, 'get_' . $key ) );
 
-		} else {
+        } else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Creates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array  $data Array of attributes for a subscription
-	 * @return mixed  false if data isn't passed and class not instantiated for creation
-	 */
-	public function create( $data = array() ) {
+    /**
+     * Creates a subscription
+     *
+     * @since  1.0.0
+     * @param  array  $data Array of attributes for a subscription
+     * @return mixed  false if data isn't passed and class not instantiated for creation
+     */
+    public function create( $data = array() ) {
 
-		if ( $this->id != 0 ) {
-			return false;
-		}
+        if ( $this->id != 0 ) {
+            return false;
+        }
 
-		$defaults = array(
-			'customer_id'       => 0,
-			'frequency'         => '',
-			'period'            => '',
-			'initial_amount'    => '',
-			'recurring_amount'  => '',
-			'bill_times'        => 0,
-			'parent_payment_id' => 0,
-			'product_id'        => 0,
-			'created'           => '',
-			'expiration'        => '',
-			'status'            => '',
-			'profile_id'        => '',
-		);
+        $defaults = array(
+            'customer_id'       => 0,
+            'frequency'         => '',
+            'period'            => '',
+            'initial_amount'    => '',
+            'recurring_amount'  => '',
+            'bill_times'        => 0,
+            'parent_payment_id' => 0,
+            'product_id'        => 0,
+            'created'           => '',
+            'expiration'        => '',
+            'status'            => '',
+            'profile_id'        => '',
+        );
 
-		$args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args( $data, $defaults );
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+        if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+            if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
 
-				// Force an active subscription to expired if expiration date is in the past
-				$args['status'] = 'expired';
+                // Force an active subscription to expired if expiration date is in the past
+                $args['status'] = 'expired';
 
-			}
-		}
+            }
+        }
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+        do_action( 'wpinv_subscription_pre_create', $args );
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+        $id = $this->subs_db->insert( $args, 'subscription' );
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+        do_action( 'wpinv_subscription_post_create', $id, $args );
 
-		return $this->setup_subscription( $id );
+        return $this->setup_subscription( $id );
 
-	}
+    }
 
-	/**
-	 * Updates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array $args Array of fields to update
-	 * @return bool
-	 */
-	public function update( $args = array() ) {
+    /**
+     * Updates a subscription
+     *
+     * @since  1.0.0
+     * @param  array $args Array of fields to update
+     * @return bool
+     */
+    public function update( $args = array() ) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+        $ret = $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+        do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
 
-		return $ret;
+        return $ret;
 
-	}
+    }
 
-	/**
-	 * Delete the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function delete() {
-		return $this->subs_db->delete( $this->id );
-	}
+    /**
+     * Delete the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function delete() {
+        return $this->subs_db->delete( $this->id );
+    }
 
     /**
      * Retrieves the parent payment ID
@@ -357,8 +357,8 @@ 
             
             $invoice = wpinv_get_invoice( $invoice->ID );
 
-			// Send email notifications.
-			wpinv_completed_invoice_notification( $invoice->ID );
+            // Send email notifications.
+            wpinv_completed_invoice_notification( $invoice->ID );
 
             do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
             do_action( 'wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id'] );
@@ -369,185 +369,185 @@ 
         return false;
     }
 
-	/**
-	 * Retrieves the transaction ID from the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function get_transaction_id() {
+    /**
+     * Retrieves the transaction ID from the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+        if( empty( $this->transaction_id ) ) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+            $txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
-			}
+            if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
+                $this->set_transaction_id( $txn_id );
+            }
 
-		}
+        }
 
-		return $this->transaction_id;
+        return $this->transaction_id;
 
-	}
+    }
 
-	/**
-	 * Stores the transaction ID for the subscription purchase
-	 *
-	 * @since  1.0.0.4
-	 * @return bool
-	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
-		$this->transaction_id = $txn_id;
-	}
+    /**
+     * Stores the transaction ID for the subscription purchase
+     *
+     * @since  1.0.0.4
+     * @return bool
+     */
+    public function set_transaction_id( $txn_id = '' ) {
+        $this->update( array( 'transaction_id' => $txn_id ) );
+        $this->transaction_id = $txn_id;
+    }
 
-	/**
-	 * Renews a subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function renew() {
+    /**
+     * Renews a subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function renew() {
 
-		$expires = $this->get_expiration_time();
+        $expires = $this->get_expiration_time();
 
 
-		// Determine what date to use as the start for the new expiration calculation
-		if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
+        // Determine what date to use as the start for the new expiration calculation
+        if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
 
-			$base_date  = $expires;
+            $base_date  = $expires;
 
-		} else {
+        } else {
 
-			$base_date  = current_time( 'timestamp' );
+            $base_date  = current_time( 'timestamp' );
 
-		}
+        }
 
-		$last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
+        $last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
 
 
-		$frequency = isset($this->frequency) ? $this->frequency : 1;
-		$expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
+        $frequency = isset($this->frequency) ? $this->frequency : 1;
+        $expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
 
-		if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
-			$expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
-		}
+        if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
+            $expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
+        }
 
-		$expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
+        $expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
+        do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
 
-		$this->status = 'active';
-		$times_billed = $this->get_times_billed();
+        $this->status = 'active';
+        $times_billed = $this->get_times_billed();
 
-		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
-			$this->complete();
-			$this->status = 'completed';
-		}
+        // Complete subscription if applicable
+        if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+            $this->complete();
+            $this->status = 'completed';
+        }
 
-		$args = array(
-			'expiration' => $expiration,
-			'status'     => $this->status,
-		);
+        $args = array(
+            'expiration' => $expiration,
+            'status'     => $this->status,
+        );
 
         $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+        do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
+        do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as completed
-	 *
-	 * Subscription is completed when the number of payments matches the billing_times field
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function complete() {
+    /**
+     * Marks a subscription as completed
+     *
+     * Subscription is completed when the number of payments matches the billing_times field
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function complete() {
 
-		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
-			return;
-		}
+        // Only mark a subscription as complete if it's not already cancelled.
+        if ( 'cancelled' === $this->status ) {
+            return;
+        }
 
-		$args = array(
-			'status' => 'completed'
-		);
+        $args = array(
+            'status' => 'completed'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'completed';
+            $this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+            do_action( 'wpinv_subscription_completed', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as expired
-	 *
-	 * Subscription is completed when the billing times is reached
-	 *
-	 * @since  1.0.0
-	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
-	 * @return void
-	 */
-	public function expire( $check_expiration = false ) {
+    /**
+     * Marks a subscription as expired
+     *
+     * Subscription is completed when the billing times is reached
+     *
+     * @since  1.0.0
+     * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
+     * @return void
+     */
+    public function expire( $check_expiration = false ) {
 
-		$expiration = $this->expiration;
+        $expiration = $this->expiration;
 
-		if( $check_expiration ) {
+        if( $check_expiration ) {
 
-			// check_expiration() updates $this->expiration so compare to $expiration above
+            // check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+            if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
 
-				return false; // Do not mark as expired since real expiration date is in the future
-			}
+                return false; // Do not mark as expired since real expiration date is in the future
+            }
 
-		}
+        }
 
-		$args = array(
-			'status' => 'expired'
-		);
+        $args = array(
+            'status' => 'expired'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'expired';
+            $this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+            do_action( 'wpinv_subscription_expired', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as failing
-	 *
-	 * @since  2.4.2
-	 * @return void
-	 */
-	public function failing() {
+    /**
+     * Marks a subscription as failing
+     *
+     * @since  2.4.2
+     * @return void
+     */
+    public function failing() {
 
-		$args = array(
-			'status' => 'failing'
-		);
+        $args = array(
+            'status' => 'failing'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'failing';
+            $this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
+            do_action( 'wpinv_subscription_failing', $this->id, $this );
 
 
-		}
+        }
 
-	}
+    }
 
     /**
      * Marks a subscription as cancelled
@@ -581,22 +581,22 @@ 
         }
     }
 
-	/**
-	 * Determines if subscription can be cancelled
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be cancelled with a profile ID through the merchant processor
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_cancel() {
+    /**
+     * Determines if subscription can be cancelled
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be cancelled with a profile ID through the merchant processor
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+        if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
-	}
+        return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+    }
 
     /**
      * Returns an array of subscription statuses that can be cancelled
@@ -609,197 +609,197 @@ 
         return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
     }
 
-	/**
-	 * Retrieves the URL to cancel subscription
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_cancel_url() {
+    /**
+     * Retrieves the URL to cancel subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
-	}
+        return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+    }
 
-	/**
-	 * Determines if subscription can be manually renewed
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be renewed manually
-	 *
-	 * @since  2.5
-	 * @return bool
-	 */
-	public function can_renew() {
+    /**
+     * Determines if subscription can be manually renewed
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be renewed manually
+     *
+     * @since  2.5
+     * @return bool
+     */
+    public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
-	}
-
-	/**
-	 * Retrieves the URL to renew a subscription
-	 *
-	 * @since  2.5
-	 * @return string
-	 */
-	public function get_renew_url() {
-
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
-
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription can have their payment method updated
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
-	}
-
-	/**
-	 * Retrieves the URL to update subscription
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function get_update_url() {
-
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
-
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription is active
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_active() {
-
-		$ret = false;
-
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
-			$ret = true;
-		}
-
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Determines if subscription is expired
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_expired() {
-
-		$ret = false;
-
-		if ( $this->status == 'expired' ) {
-
-			$ret = true;
-
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
-
-			$ret        = false;
-			$expiration = $this->get_expiration_time();
-
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
-				$ret = true;
-
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
-					$this->expire();
-				}
-			}
-
-		}
-
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Retrieves the expiration date
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_expiration() {
-		return $this->expiration;
-	}
-
-	/**
-	 * Retrieves the expiration date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Retrieves the subscription status
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status() {
-
-		// Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
-		$this->is_expired();
-		return $this->status;
-	}
-
-	/**
-	 * Retrieves the subscription status label
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status_label() {
-
-		switch( $this->get_status() ) {
-			case 'active' :
-				$status = __( 'Active', 'invoicing' );
-				break;
-
-			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
-				break;
-
-			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
-				break;
-
-			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
-				break;
-
-			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
-				break;
-
-			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
-				break;
-
-			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
-				break;
-
-			default:
-				$status = ucfirst( $this->get_status() );
-				break;
-		}
-
-		return $status;
-	}
+        return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+    }
+
+    /**
+     * Retrieves the URL to renew a subscription
+     *
+     * @since  2.5
+     * @return string
+     */
+    public function get_renew_url() {
+
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+
+        return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription can have their payment method updated
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_update() {
+        return apply_filters( 'wpinv_subscription_can_update', false, $this );
+    }
+
+    /**
+     * Retrieves the URL to update subscription
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function get_update_url() {
+
+        $url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+
+        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription is active
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_active() {
+
+        $ret = false;
+
+        if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+            $ret = true;
+        }
+
+        return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Determines if subscription is expired
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_expired() {
+
+        $ret = false;
+
+        if ( $this->status == 'expired' ) {
+
+            $ret = true;
+
+        } elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+
+            $ret        = false;
+            $expiration = $this->get_expiration_time();
+
+            if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+                $ret = true;
+
+                if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+                    $this->expire();
+                }
+            }
+
+        }
+
+        return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Retrieves the expiration date
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_expiration() {
+        return $this->expiration;
+    }
+
+    /**
+     * Retrieves the expiration date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_expiration_time() {
+        return strtotime( $this->expiration, current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Retrieves the subscription status
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status() {
+
+        // Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
+        $this->is_expired();
+        return $this->status;
+    }
+
+    /**
+     * Retrieves the subscription status label
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status_label() {
+
+        switch( $this->get_status() ) {
+            case 'active' :
+                $status = __( 'Active', 'invoicing' );
+                break;
+
+            case 'cancelled' :
+                $status = __( 'Cancelled', 'invoicing' );
+                break;
+
+            case 'expired' :
+                $status = __( 'Expired', 'invoicing' );
+                break;
+
+            case 'pending' :
+                $status = __( 'Pending', 'invoicing' );
+                break;
+
+            case 'failing' :
+                $status = __( 'Failing', 'invoicing' );
+                break;
+
+            case 'trialling' :
+                $status = __( 'Trialling', 'invoicing' );
+                break;
+
+            case 'completed' :
+                $status = __( 'Completed', 'invoicing' );
+                break;
+
+            default:
+                $status = ucfirst( $this->get_status() );
+                break;
+        }
+
+        return $status;
+    }
 
     /**
      * Retrieves the subscription status label

Spacing +168 added lines, -168 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,15 +38,15 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+	function __construct($_id_or_object = 0, $_by_profile_id = false) {
 
 		$this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+		if ($_by_profile_id) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+			$_sub = $this->subs_db->get_by('profile_id', $_id_or_object);
 
-			if( empty( $_sub ) ) {
+			if (empty($_sub)) {
 				return false;
 			}
 
@@ -54,7 +54,7 @@ 
 
 		}
 
-		return $this->setup_subscription( $_id_or_object );
+		return $this->setup_subscription($_id_or_object);
 	}
 
 	/**
@@ -63,34 +63,34 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+	private function setup_subscription($id_or_object = 0) {
 
-		if( empty( $id_or_object ) ) {
+		if (empty($id_or_object)) {
 			return false;
 		}
 
-		if( is_numeric( $id_or_object ) ) {
+		if (is_numeric($id_or_object)) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+			$sub = $this->subs_db->get($id_or_object);
 
-		} elseif( is_object( $id_or_object ) ) {
+		} elseif (is_object($id_or_object)) {
 
 			$sub = $id_or_object;
 
 		}
 
-		if( empty( $sub ) ) {
+		if (empty($sub)) {
 			return false;
 		}
 
-		foreach( $sub as $key => $value ) {
+		foreach ($sub as $key => $value) {
 			$this->$key = $value;
 		}
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+		$this->customer = get_userdata($this->customer_id);
+		$this->gateway  = wpinv_get_payment_gateway($this->parent_payment_id);
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+		do_action('wpinv_recurring_setup_subscription', $this);
 
 		return $this;
 	}
@@ -100,15 +100,15 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_' . $key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_' . $key));
 
 		} else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+			return new WP_Error('wpinv-subscription-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
 
 		}
 
@@ -121,9 +121,9 @@ 
 	 * @param  array  $data Array of attributes for a subscription
 	 * @return mixed  false if data isn't passed and class not instantiated for creation
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 ) {
+		if ($this->id != 0) {
 			return false;
 		}
 
@@ -142,11 +142,11 @@ 
 			'profile_id'        => '',
 		);
 
-		$args = wp_parse_args( $data, $defaults );
+		$args = wp_parse_args($data, $defaults);
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+		if ($args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+			if ('active' == $args['status'] || 'trialling' == $args['status']) {
 
 				// Force an active subscription to expired if expiration date is in the past
 				$args['status'] = 'expired';
@@ -154,13 +154,13 @@ 
 			}
 		}
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+		do_action('wpinv_subscription_pre_create', $args);
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+		$id = $this->subs_db->insert($args, 'subscription');
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+		do_action('wpinv_subscription_post_create', $id, $args);
 
-		return $this->setup_subscription( $id );
+		return $this->setup_subscription($id);
 
 	}
 
@@ -171,11 +171,11 @@ 
 	 * @param  array $args Array of fields to update
 	 * @return bool
 	 */
-	public function update( $args = array() ) {
+	public function update($args = array()) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+		$ret = $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+		do_action('wpinv_recurring_update_subscription', $this->id, $args, $this);
 
 		return $ret;
 
@@ -188,7 +188,7 @@ 
 	 * @return bool
 	 */
 	public function delete() {
-		return $this->subs_db->delete( $this->id );
+		return $this->subs_db->delete($this->id);
 	}
 
     /**
@@ -208,14 +208,14 @@ 
      * @return array
      */
     public function get_child_payments() {
-        $payments = get_posts( array(
+        $payments = get_posts(array(
             'post_parent'    => (int) $this->parent_payment_id,
             'posts_per_page' => '999',
-            'post_status'    => array( 'publish', 'wpi-processing', 'wpi-renewal' ),
+            'post_status'    => array('publish', 'wpi-processing', 'wpi-renewal'),
             'orderby'           => 'ID',
             'order'             => 'DESC',
             'post_type'      => 'wpi_invoice'
-        ) );
+        ));
 
         return $payments;
     }
@@ -228,9 +228,9 @@ 
      */
     public function get_total_payments() {
         $child_payments = $this->get_child_payments();
-        $total_payments = !empty( $child_payments ) ? count( $child_payments ) : 0;
+        $total_payments = !empty($child_payments) ? count($child_payments) : 0;
 
-        if ( 'pending' != $this->status ) {
+        if ('pending' != $this->status) {
                 $total_payments++;
         }
 
@@ -244,9 +244,9 @@ 
      * @return int
      */
     public function get_times_billed() {
-        $times_billed = (int)$this->get_total_payments();
+        $times_billed = (int) $this->get_total_payments();
 
-        if ( ! empty( $this->trial_period ) && $times_billed > 0 ) {
+        if (!empty($this->trial_period) && $times_billed > 0) {
             $times_billed--;
         }
 
@@ -260,51 +260,51 @@ 
      * @param  array $args Array of values for the payment, including amount and transaction ID
      * @return bool
      */
-    public function add_payment( $args = array() ) {
-        if ( ! $this->parent_payment_id ) {
+    public function add_payment($args = array()) {
+        if (!$this->parent_payment_id) {
             return false;
         }
 
-        $args = wp_parse_args( $args, array(
+        $args = wp_parse_args($args, array(
             'amount'         => '',
             'transaction_id' => '',
             'gateway'        => ''
-        ) );
+        ));
         
-        if ( empty( $args['transaction_id'] ) || $this->payment_exists( $args['transaction_id'] ) ) {
+        if (empty($args['transaction_id']) || $this->payment_exists($args['transaction_id'])) {
             return false;
         }
         
-        $parent_invoice = wpinv_get_invoice( $this->parent_payment_id );
-        if ( empty( $parent_invoice->ID ) ) {
+        $parent_invoice = wpinv_get_invoice($this->parent_payment_id);
+        if (empty($parent_invoice->ID)) {
             return false;
         }
 
         $invoice = new WPInv_Invoice();
-        $invoice->set( 'post_type', 'wpi_invoice' );
-        $invoice->set( 'parent_invoice', $this->parent_payment_id );
-        $invoice->set( 'currency', $parent_invoice->get_currency() );
-        $invoice->set( 'transaction_id', $args['transaction_id'] );
-        $invoice->set( 'key', $parent_invoice->generate_key() );
-        $invoice->set( 'ip', $parent_invoice->ip );
-        $invoice->set( 'user_id', $parent_invoice->get_user_id() );
-        $invoice->set( 'first_name', $parent_invoice->get_first_name() );
-        $invoice->set( 'last_name', $parent_invoice->get_last_name() );
-        $invoice->set( 'phone', $parent_invoice->phone );
-        $invoice->set( 'address', $parent_invoice->address );
-        $invoice->set( 'city', $parent_invoice->city );
-        $invoice->set( 'country', $parent_invoice->country );
-        $invoice->set( 'state', $parent_invoice->state );
-        $invoice->set( 'zip', $parent_invoice->zip );
-        $invoice->set( 'company', $parent_invoice->company );
-        $invoice->set( 'vat_number', $parent_invoice->vat_number );
-        $invoice->set( 'vat_rate', $parent_invoice->vat_rate );
-        $invoice->set( 'adddress_confirmed', $parent_invoice->adddress_confirmed );
-
-        if ( empty( $args['gateway'] ) ) {
-            $invoice->set( 'gateway', $parent_invoice->get_gateway() );
+        $invoice->set('post_type', 'wpi_invoice');
+        $invoice->set('parent_invoice', $this->parent_payment_id);
+        $invoice->set('currency', $parent_invoice->get_currency());
+        $invoice->set('transaction_id', $args['transaction_id']);
+        $invoice->set('key', $parent_invoice->generate_key());
+        $invoice->set('ip', $parent_invoice->ip);
+        $invoice->set('user_id', $parent_invoice->get_user_id());
+        $invoice->set('first_name', $parent_invoice->get_first_name());
+        $invoice->set('last_name', $parent_invoice->get_last_name());
+        $invoice->set('phone', $parent_invoice->phone);
+        $invoice->set('address', $parent_invoice->address);
+        $invoice->set('city', $parent_invoice->city);
+        $invoice->set('country', $parent_invoice->country);
+        $invoice->set('state', $parent_invoice->state);
+        $invoice->set('zip', $parent_invoice->zip);
+        $invoice->set('company', $parent_invoice->company);
+        $invoice->set('vat_number', $parent_invoice->vat_number);
+        $invoice->set('vat_rate', $parent_invoice->vat_rate);
+        $invoice->set('adddress_confirmed', $parent_invoice->adddress_confirmed);
+
+        if (empty($args['gateway'])) {
+            $invoice->set('gateway', $parent_invoice->get_gateway());
         } else {
-            $invoice->set( 'gateway', $args['gateway'] );
+            $invoice->set('gateway', $args['gateway']);
         }
         
         $recurring_details = $parent_invoice->get_recurring_details();
@@ -312,11 +312,11 @@ 
         // increase the earnings for each item in the subscription
         $items = $recurring_details['cart_details'];
         
-        if ( $items ) {        
+        if ($items) {        
             $add_items      = array();
             $cart_details   = array();
             
-            foreach ( $items as $item ) {
+            foreach ($items as $item) {
                 $add_item             = array();
                 $add_item['id']       = $item['id'];
                 $add_item['quantity'] = $item['quantity'];
@@ -326,7 +326,7 @@ 
                 break;
             }
             
-            $invoice->set( 'items', $add_items );
+            $invoice->set('items', $add_items);
             $invoice->cart_details = $cart_details;
         }
         
@@ -336,32 +336,32 @@ 
         $tax                = $recurring_details['tax'];
         $discount           = $recurring_details['discount'];
         
-        if ( $discount > 0 ) {
-            $invoice->set( 'discount_code', $parent_invoice->discount_code );
+        if ($discount > 0) {
+            $invoice->set('discount_code', $parent_invoice->discount_code);
         }
         
-        $invoice->subtotal = wpinv_round_amount( $subtotal );
-        $invoice->tax      = wpinv_round_amount( $tax );
-        $invoice->discount = wpinv_round_amount( $discount );
-        $invoice->total    = wpinv_round_amount( $total );
+        $invoice->subtotal = wpinv_round_amount($subtotal);
+        $invoice->tax      = wpinv_round_amount($tax);
+        $invoice->discount = wpinv_round_amount($discount);
+        $invoice->total    = wpinv_round_amount($total);
 
-        $invoice  = apply_filters( 'wpinv_subscription_add_payment_save', $invoice, $this, $args );
+        $invoice = apply_filters('wpinv_subscription_add_payment_save', $invoice, $this, $args);
 
         $invoice->save();
-        $invoice->update_meta( '_wpinv_subscription_id', $this->id );
+        $invoice->update_meta('_wpinv_subscription_id', $this->id);
         
-        if ( !empty( $invoice->ID ) ) {
-            wpinv_update_payment_status( $invoice->ID, 'publish' );
+        if (!empty($invoice->ID)) {
+            wpinv_update_payment_status($invoice->ID, 'publish');
             sleep(1);
-            wpinv_update_payment_status( $invoice->ID, 'wpi-renewal' );
+            wpinv_update_payment_status($invoice->ID, 'wpi-renewal');
             
-            $invoice = wpinv_get_invoice( $invoice->ID );
+            $invoice = wpinv_get_invoice($invoice->ID);
 
 			// Send email notifications.
-			wpinv_completed_invoice_notification( $invoice->ID );
+			wpinv_completed_invoice_notification($invoice->ID);
 
-            do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
-            do_action( 'wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id'] );
+            do_action('wpinv_recurring_add_subscription_payment', $invoice, $this);
+            do_action('wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id']);
             
             return $invoice->ID;
         }
@@ -377,12 +377,12 @@ 
 	 */
 	public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+		if (empty($this->transaction_id)) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+			$txn_id = wpinv_get_payment_transaction_id($this->parent_payment_id);
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
+			if (!empty($txn_id) && (int) $this->parent_payment_id !== (int) $txn_id) {
+				$this->set_transaction_id($txn_id);
 			}
 
 		}
@@ -397,8 +397,8 @@ 
 	 * @since  1.0.0.4
 	 * @return bool
 	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
+	public function set_transaction_id($txn_id = '') {
+		$this->update(array('transaction_id' => $txn_id));
 		$this->transaction_id = $txn_id;
 	}
 
@@ -414,35 +414,35 @@ 
 
 
 		// Determine what date to use as the start for the new expiration calculation
-		if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
+		if ($expires > current_time('timestamp') && $this->is_active()) {
 
-			$base_date  = $expires;
+			$base_date = $expires;
 
 		} else {
 
-			$base_date  = current_time( 'timestamp' );
+			$base_date = current_time('timestamp');
 
 		}
 
-		$last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
+		$last_day = wpinv_cal_days_in_month(CAL_GREGORIAN, date('n', $base_date), date('Y', $base_date));
 
 
 		$frequency = isset($this->frequency) ? $this->frequency : 1;
-		$expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
+		$expiration = date('Y-m-d H:i:s', strtotime('+' . $frequency . ' ' . $this->period . ' 23:59:59', $base_date));
 
-		if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
-			$expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
+		if (date('j', $base_date) == $last_day && 'day' != $this->period) {
+			$expiration = date('Y-m-d H:i:s', strtotime($expiration . ' +2 days'));
 		}
 
-		$expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
+		$expiration  = apply_filters('wpinv_subscription_renewal_expiration', $expiration, $this->id, $this);
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
+		do_action('wpinv_subscription_pre_renew', $this->id, $expiration, $this);
 
 		$this->status = 'active';
 		$times_billed = $this->get_times_billed();
 
 		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+		if ($this->bill_times > 0 && $times_billed >= $this->bill_times) {
 			$this->complete();
 			$this->status = 'completed';
 		}
@@ -452,10 +452,10 @@ 
 			'status'     => $this->status,
 		);
 
-        $this->subs_db->update( $this->id, $args );
+        $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+		do_action('wpinv_subscription_post_renew', $this->id, $expiration, $this);
+		do_action('wpinv_recurring_set_subscription_status', $this->id, $this->status, $this);
 
 	}
 
@@ -470,7 +470,7 @@ 
 	public function complete() {
 
 		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
+		if ('cancelled' === $this->status) {
 			return;
 		}
 
@@ -478,11 +478,11 @@ 
 			'status' => 'completed'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+			do_action('wpinv_subscription_completed', $this->id, $this);
 
 		}
 
@@ -497,15 +497,15 @@ 
 	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
 	 * @return void
 	 */
-	public function expire( $check_expiration = false ) {
+	public function expire($check_expiration = false) {
 
 		$expiration = $this->expiration;
 
-		if( $check_expiration ) {
+		if ($check_expiration) {
 
 			// check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+			if ($expiration < $this->get_expiration() && current_time('timestamp') < $this->get_expiration_time()) {
 
 				return false; // Do not mark as expired since real expiration date is in the future
 			}
@@ -516,11 +516,11 @@ 
 			'status' => 'expired'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+			do_action('wpinv_subscription_expired', $this->id, $this);
 
 		}
 
@@ -538,11 +538,11 @@ 
 			'status' => 'failing'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
+			do_action('wpinv_subscription_failing', $this->id, $this);
 
 
 		}
@@ -556,7 +556,7 @@ 
      * @return void
      */
     public function cancel() {
-        if ( 'cancelled' === $this->status ) {
+        if ('cancelled' === $this->status) {
             return; // Already cancelled
         }
 
@@ -564,20 +564,20 @@ 
             'status' => 'cancelled'
         );
 
-        if ( $this->subs_db->update( $this->id, $args ) ) {
-            if ( is_user_logged_in() ) {
-                $userdata = get_userdata( get_current_user_id() );
+        if ($this->subs_db->update($this->id, $args)) {
+            if (is_user_logged_in()) {
+                $userdata = get_userdata(get_current_user_id());
                 $user     = $userdata->display_name;
             } else {
-                $user = __( 'gateway', 'invoicing' );
+                $user = __('gateway', 'invoicing');
             }
 
-            $note = sprintf( __( 'Subscription has been cancelled by %s', 'invoicing' ), $user );
-            wpinv_insert_payment_note( $this->parent_payment_id, $note, '', '', true );
+            $note = sprintf(__('Subscription has been cancelled by %s', 'invoicing'), $user);
+            wpinv_insert_payment_note($this->parent_payment_id, $note, '', '', true);
 
             $this->status = 'cancelled';
 
-            do_action( 'wpinv_subscription_cancelled', $this->id, $this );
+            do_action('wpinv_subscription_cancelled', $this->id, $this);
         }
     }
 
@@ -592,10 +592,10 @@ 
 	 */
 	public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+	    if ($this->gateway === 'manual' || in_array($this->status, $this->get_cancellable_statuses())) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+		return apply_filters('wpinv_subscription_can_cancel', $ret, $this);
 	}
 
     /**
@@ -606,7 +606,7 @@ 
      * @return      array
      */
     public function get_cancellable_statuses() {
-        return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
+        return apply_filters('wpinv_recurring_cancellable_statuses', array('active', 'trialling', 'failing'));
     }
 
 	/**
@@ -617,9 +617,9 @@ 
 	 */
 	public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-cancel');
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+		return apply_filters('wpinv_subscription_cancel_url', $url, $this);
 	}
 
 	/**
@@ -633,7 +633,7 @@ 
 	 */
 	public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+		return apply_filters('wpinv_subscription_can_renew', true, $this);
 	}
 
 	/**
@@ -644,9 +644,9 @@ 
 	 */
 	public function get_renew_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'renew_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-renew');
 
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+		return apply_filters('wpinv_subscription_renew_url', $url, $this);
 	}
 
 	/**
@@ -656,7 +656,7 @@ 
 	 * @return bool
 	 */
 	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
+		return apply_filters('wpinv_subscription_can_update', false, $this);
 	}
 
 	/**
@@ -667,9 +667,9 @@ 
 	 */
 	public function get_update_url() {
 
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+		$url = add_query_arg(array('action' => 'update', 'subscription_id' => $this->id));
 
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+		return apply_filters('wpinv_subscription_update_url', $url, $this);
 	}
 
 	/**
@@ -682,11 +682,11 @@ 
 
 		$ret = false;
 
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+		if (!$this->is_expired() && ($this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling')) {
 			$ret = true;
 		}
 
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_active', $ret, $this->id, $this);
 
 	}
 
@@ -700,26 +700,26 @@ 
 
 		$ret = false;
 
-		if ( $this->status == 'expired' ) {
+		if ($this->status == 'expired') {
 
 			$ret = true;
 
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+		} elseif ('active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling') {
 
 			$ret        = false;
 			$expiration = $this->get_expiration_time();
 
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+			if ($expiration && strtotime('NOW', current_time('timestamp')) > $expiration) {
 				$ret = true;
 
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+				if ('active' === $this->status || $this->status == 'trialling') {
 					$this->expire();
 				}
 			}
 
 		}
 
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_expired', $ret, $this->id, $this);
 
 	}
 
@@ -740,7 +740,7 @@ 
 	 * @return int
 	 */
 	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
+		return strtotime($this->expiration, current_time('timestamp'));
 	}
 
 	/**
@@ -764,37 +764,37 @@ 
 	 */
 	public function get_status_label() {
 
-		switch( $this->get_status() ) {
+		switch ($this->get_status()) {
 			case 'active' :
-				$status = __( 'Active', 'invoicing' );
+				$status = __('Active', 'invoicing');
 				break;
 
 			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
+				$status = __('Cancelled', 'invoicing');
 				break;
 
 			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
+				$status = __('Expired', 'invoicing');
 				break;
 
 			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
+				$status = __('Pending', 'invoicing');
 				break;
 
 			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
+				$status = __('Failing', 'invoicing');
 				break;
 
 			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
+				$status = __('Trialling', 'invoicing');
 				break;
 
 			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
+				$status = __('Completed', 'invoicing');
 				break;
 
 			default:
-				$status = ucfirst( $this->get_status() );
+				$status = ucfirst($this->get_status());
 				break;
 		}
 
@@ -809,51 +809,51 @@ 
      */
     public function get_status_label_html() {
 
-        switch( $get_status = $this->get_status() ) {
+        switch ($get_status = $this->get_status()) {
             case 'active' :
-                $status = __( 'Active', 'invoicing' );
+                $status = __('Active', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'cancelled' :
-                $status = __( 'Cancelled', 'invoicing' );
+                $status = __('Cancelled', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'expired' :
-                $status = __( 'Expired', 'invoicing' );
+                $status = __('Expired', 'invoicing');
                 $class = 'label-default';
                 break;
 
             case 'pending' :
-                $status = __( 'Pending', 'invoicing' );
+                $status = __('Pending', 'invoicing');
                 $class = 'label-primary';
                 break;
 
             case 'failing' :
-                $status = __( 'Failing', 'invoicing' );
+                $status = __('Failing', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'trialling' :
-                $status = __( 'Trialling', 'invoicing' );
+                $status = __('Trialling', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'completed' :
-                $status = __( 'Completed', 'invoicing' );
+                $status = __('Completed', 'invoicing');
                 $class = 'label-success';
                 break;
 
             default:
-                $status = ucfirst( $this->get_status() );
+                $status = ucfirst($this->get_status());
                 $class = 'label-default';
                 break;
         }
 
         $label = '<span class="sub-status label label-sub-' . $get_status . ' ' . $class . '">' . $status . '</span>';
 
-        return apply_filters( 'wpinv_subscription_status_label_html', $label, $get_status, $status );
+        return apply_filters('wpinv_subscription_status_label_html', $label, $get_status, $status);
     }
 
     /**
@@ -863,18 +863,18 @@ 
      * @param  string $txn_id The transaction ID from the merchant processor
      * @return bool
      */
-    public function payment_exists( $txn_id = '' ) {
+    public function payment_exists($txn_id = '') {
         global $wpdb;
 
-        if ( empty( $txn_id ) ) {
+        if (empty($txn_id)) {
             return false;
         }
 
-        $txn_id = esc_sql( $txn_id );
+        $txn_id = esc_sql($txn_id);
 
-        $purchase = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1" );
+        $purchase = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1");
 
-        if ( $purchase != null ) {
+        if ($purchase != null) {
             return true;
         }
 

includes/class-wpinv-discount.php

Indentation +668 added lines, -668 removed lines

@@ -33,173 +33,173 @@ 
  */
 class WPInv_Discount {
 	
-	/**
-	 * Discount ID.
-	 *
-	 * @since 1.0.15
-	 * @var integer|null
-	 */
-	public $ID = null;
-
-	/**
-	 * Old discount status.
-	 *
-	 * @since 1.0.15
-	 * @var string
-	 */
-	public $old_status = 'draft';
+    /**
+     * Discount ID.
+     *
+     * @since 1.0.15
+     * @var integer|null
+     */
+    public $ID = null;
+
+    /**
+     * Old discount status.
+     *
+     * @since 1.0.15
+     * @var string
+     */
+    public $old_status = 'draft';
 	
-	/**
-	 * Data array.
-	 *
-	 * @since 1.0.15
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Discount constructor.
-	 *
-	 * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
-	 * @since 1.0.15
-	 */
-	public function __construct( $discount = array() ) {
+    /**
+     * Data array.
+     *
+     * @since 1.0.15
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Discount constructor.
+     *
+     * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
+     * @since 1.0.15
+     */
+    public function __construct( $discount = array() ) {
         
         // If the discount is an instance of this class...
-		if ( $discount instanceof WPInv_Discount ) {
-			$this->init( $discount->data );
-			return;
+        if ( $discount instanceof WPInv_Discount ) {
+            $this->init( $discount->data );
+            return;
         }
         
         // If the discount is an array of discount details...
         if ( is_array( $discount ) ) {
-			$this->init( $discount );
-			return;
-		}
+            $this->init( $discount );
+            return;
+        }
 		
-		// Try fetching the discount by its post id.
-		$data = false;
+        // Try fetching the discount by its post id.
+        $data = false;
 		
-		if ( ! empty( $discount ) && is_numeric( $discount ) ) {
-			$discount = absint( $discount );
-			$data = self::get_data_by( 'id', $discount );
-		}
-
-		if ( is_array( $data ) ) {
-			$this->init( $data );
-			return;
-		}
+        if ( ! empty( $discount ) && is_numeric( $discount ) ) {
+            $discount = absint( $discount );
+            $data = self::get_data_by( 'id', $discount );
+        }
+
+        if ( is_array( $data ) ) {
+            $this->init( $data );
+            return;
+        }
 		
-		// Try fetching the discount by its discount code.
-		if ( ! empty( $discount ) && is_string( $discount ) ) {
-			$data = self::get_data_by( 'discount_code', $discount );
-		}
-
-		if ( is_array( $data ) ) {
-			$this->init( $data );
-			return;
-		} 
+        // Try fetching the discount by its discount code.
+        if ( ! empty( $discount ) && is_string( $discount ) ) {
+            $data = self::get_data_by( 'discount_code', $discount );
+        }
+
+        if ( is_array( $data ) ) {
+            $this->init( $data );
+            return;
+        } 
 		
-		// If we are here then the discount does not exist.
-		$this->init( array() );
-	}
+        // If we are here then the discount does not exist.
+        $this->init( array() );
+    }
 	
-	/**
-	 * Sets up object properties
-	 *
-	 * @since 1.0.15
-	 * @param array $data An array containing the discount's data
-	 */
-	public function init( $data ) {
-		$data       	  = self::sanitize_discount_data( $data );
-		$this->data 	  = $data;
-		$this->old_status = $data['status'];
-		$this->ID   	  = $data['ID'];
-	}
+    /**
+     * Sets up object properties
+     *
+     * @since 1.0.15
+     * @param array $data An array containing the discount's data
+     */
+    public function init( $data ) {
+        $data       	  = self::sanitize_discount_data( $data );
+        $this->data 	  = $data;
+        $this->old_status = $data['status'];
+        $this->ID   	  = $data['ID'];
+    }
 	
-	/**
-	 * Fetch a discount from the db/cache
-	 *
-	 *
-	 * @static
-	 * @param string $field The field to query against: 'ID', 'discount_code'
-	 * @param string|int $value The field value
-	 * @since 1.0.15
-	 * @return array|bool array of discount details on success. False otherwise.
-	 */
-	public static function get_data_by( $field, $value ) {
-
-		if ( 'id' == strtolower( $field ) ) {
-			// Make sure the value is numeric to avoid casting objects, for example,
-			// to int 1.
-			if ( ! is_numeric( $value ) )
-				return false;
-			$value = intval( $value );
-			if ( $value < 1 )
-				return false;
-		}
-
-		if ( ! $value || ! is_string( $field ) ) {
-			return false;
-		}
+    /**
+     * Fetch a discount from the db/cache
+     *
+     *
+     * @static
+     * @param string $field The field to query against: 'ID', 'discount_code'
+     * @param string|int $value The field value
+     * @since 1.0.15
+     * @return array|bool array of discount details on success. False otherwise.
+     */
+    public static function get_data_by( $field, $value ) {
+
+        if ( 'id' == strtolower( $field ) ) {
+            // Make sure the value is numeric to avoid casting objects, for example,
+            // to int 1.
+            if ( ! is_numeric( $value ) )
+                return false;
+            $value = intval( $value );
+            if ( $value < 1 )
+                return false;
+        }
+
+        if ( ! $value || ! is_string( $field ) ) {
+            return false;
+        }
 		
-		$field = trim( $field );
-
-		// prepare query args
-		switch ( strtolower( $field ) ) {
-			case 'id':
-				$discount_id = $value;
-				$args		 = array( 'include' => array( $value ) );
-				break;
-			case 'discount_code':
-			case 'code':
-				$value       = trim( $value );
-				$discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
-				$args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
-				break;
-			case 'name':
-				$discount_id = 0;
-				$args		 = array( 'name' => trim( $value ) );
-				break;
-			default:
-				$args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
-				if ( ! is_array( $args ) ) {
-					return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
-				}
-
-		}
-
-		// Check if there is a cached value.
-		if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
-			return $discount;
-		}
-
-		$args = array_merge(
-			$args,
-			array(
-				'post_type'      => 'wpi_discount',
-				'posts_per_page' => 1,
-				'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
-			)
-		);
-
-		$discount = get_posts( $args );
+        $field = trim( $field );
+
+        // prepare query args
+        switch ( strtolower( $field ) ) {
+            case 'id':
+                $discount_id = $value;
+                $args		 = array( 'include' => array( $value ) );
+                break;
+            case 'discount_code':
+            case 'code':
+                $value       = trim( $value );
+                $discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
+                $args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
+                break;
+            case 'name':
+                $discount_id = 0;
+                $args		 = array( 'name' => trim( $value ) );
+                break;
+            default:
+                $args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
+                if ( ! is_array( $args ) ) {
+                    return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
+                }
+
+        }
+
+        // Check if there is a cached value.
+        if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
+            return $discount;
+        }
+
+        $args = array_merge(
+            $args,
+            array(
+                'post_type'      => 'wpi_discount',
+                'posts_per_page' => 1,
+                'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+            )
+        );
+
+        $discount = get_posts( $args );
 				
-		if( empty( $discount ) ) {
-			return false;
-		}
+        if( empty( $discount ) ) {
+            return false;
+        }
 
-		$discount = $discount[0];
+        $discount = $discount[0];
 		
-		// Prepare the return data.
-		$return = array(
+        // Prepare the return data.
+        $return = array(
             'ID'                          => $discount->ID,
             'code'                        => get_post_meta( $discount->ID, '_wpi_discount_code', true ),
             'amount'                      => get_post_meta( $discount->ID, '_wpi_discount_amount', true ),
             'date_created'                => $discount->post_date,
-			'date_modified'               => $discount->post_modified,
-			'status'               		  => $discount->post_status,
-			'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
+            'date_modified'               => $discount->post_modified,
+            'status'               		  => $discount->post_status,
+            'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
             'expiration'                  => get_post_meta( $discount->ID, '_wpi_discount_expiration', true ),
             'type'               		  => get_post_meta( $discount->ID, '_wpi_discount_type', true ),
             'description'                 => $discount->post_excerpt,
@@ -213,38 +213,38 @@ 
             'max_total'                   => get_post_meta( $discount->ID, '_wpi_discount_max_total', true ),
         );
 		
-		$return = self::sanitize_discount_data( $return );
-		$return = apply_filters( 'wpinv_discount_properties', $return );
+        $return = self::sanitize_discount_data( $return );
+        $return = apply_filters( 'wpinv_discount_properties', $return );
 
-		// Update the cache with our data
-		wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
-		wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
+        // Update the cache with our data
+        wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
+        wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
 
-		return $return;
-	}
+        return $return;
+    }
 	
-	/**
-	 * Sanitizes discount data
-	 *
-	 * @static
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @return array the sanitized data
-	 */
-	public static function sanitize_discount_data( $data ) {
+    /**
+     * Sanitizes discount data
+     *
+     * @static
+     * @since 1.0.15
+     * @access public
+     *
+     * @return array the sanitized data
+     */
+    public static function sanitize_discount_data( $data ) {
 		
-		$allowed_discount_types = array_keys( wpinv_get_discount_types() );
+        $allowed_discount_types = array_keys( wpinv_get_discount_types() );
 		
-		$return = array(
+        $return = array(
             'ID'                          => null,
             'code'                        => '',
             'amount'                      => 0,
             'date_created'                => current_time('mysql'),
             'date_modified'               => current_time('mysql'),
-			'expiration'                  => null,
-			'start'                  	  => current_time('mysql'),
-			'status'                  	  => 'draft',
+            'expiration'                  => null,
+            'start'                  	  => current_time('mysql'),
+            'status'                  	  => 'draft',
             'type'               		  => 'percent',
             'description'                 => '',
             'uses'                        => 0,
@@ -254,426 +254,426 @@ 
             'max_uses'                    => 0,
             'is_recurring'                => false,
             'min_total'                   => '',
-			'max_total'              	  => '',
-		);
+            'max_total'              	  => '',
+        );
 		
 				
-		// Arrays only please.
-		if ( ! is_array( $data ) ) {
+        // Arrays only please.
+        if ( ! is_array( $data ) ) {
             return $return;
         }
 
-		// If an id is provided, ensure it is a valid discount.
+        // If an id is provided, ensure it is a valid discount.
         if ( ! empty( $data['ID'] ) && ( ! is_numeric( $data['ID'] ) || 'wpi_discount' !== get_post_type( $data['ID'] ) ) ) {
             return $return;
-		}
+        }
 
         $return = array_merge( $return, $data );
 
         // Sanitize some keys.
         $return['amount']         = wpinv_sanitize_amount( $return['amount'] );
-		$return['is_single_use']  = (bool) $return['is_single_use'];
-		$return['is_recurring']   = (bool) $return['is_recurring'];
-		$return['uses']	          = (int) $return['uses'];
-		$return['max_uses']	      = (int) $return['max_uses'];
-		$return['min_total'] 	  = wpinv_sanitize_amount( $return['min_total'] );
+        $return['is_single_use']  = (bool) $return['is_single_use'];
+        $return['is_recurring']   = (bool) $return['is_recurring'];
+        $return['uses']	          = (int) $return['uses'];
+        $return['max_uses']	      = (int) $return['max_uses'];
+        $return['min_total'] 	  = wpinv_sanitize_amount( $return['min_total'] );
         $return['max_total'] 	  = wpinv_sanitize_amount( $return['max_total'] );
 
-		// Trim all values.
-		$return = wpinv_clean( $return );
+        // Trim all values.
+        $return = wpinv_clean( $return );
 		
-		// Ensure the discount type is supported.
+        // Ensure the discount type is supported.
         if ( ! in_array( $return['type'], $allowed_discount_types, true ) ) {
             $return['type'] = 'percent';
-		}
-		$return['type_name'] = wpinv_get_discount_type_name( $return['type'] );
+        }
+        $return['type_name'] = wpinv_get_discount_type_name( $return['type'] );
 		
-		// Do not offer more than a 100% discount.
-		if ( $return['type'] == 'percent' && (float) $return['amount'] > 100 ) {
-			$return['amount'] = 100;
-		}
-
-		// Format dates.
-		foreach( wpinv_parse_list( 'date_created date_modified expiration start') as $prop ) {
-			if( ! empty( $return[$prop] ) ) {
-				$return[$prop]      = date_i18n( 'Y-m-d H:i:s', strtotime( $return[$prop] ) );
-			}
-		}
-
-		// Formart items.
-		foreach( array( 'excluded_items', 'items' ) as $prop ) {
-
-			if( ! empty( $return[$prop] ) ) {
-				// Ensure that the property is an array of non-empty integers.
-				$return[$prop]      = array_filter( array_map( 'intval', wpinv_parse_list( $return[$prop] ) ) );
-			} else {
-				$return[$prop]      = array();
-			}
-
-		}
+        // Do not offer more than a 100% discount.
+        if ( $return['type'] == 'percent' && (float) $return['amount'] > 100 ) {
+            $return['amount'] = 100;
+        }
+
+        // Format dates.
+        foreach( wpinv_parse_list( 'date_created date_modified expiration start') as $prop ) {
+            if( ! empty( $return[$prop] ) ) {
+                $return[$prop]      = date_i18n( 'Y-m-d H:i:s', strtotime( $return[$prop] ) );
+            }
+        }
+
+        // Formart items.
+        foreach( array( 'excluded_items', 'items' ) as $prop ) {
+
+            if( ! empty( $return[$prop] ) ) {
+                // Ensure that the property is an array of non-empty integers.
+                $return[$prop]      = array_filter( array_map( 'intval', wpinv_parse_list( $return[$prop] ) ) );
+            } else {
+                $return[$prop]      = array();
+            }
+
+        }
 		
-		return apply_filters( 'wpinv_sanitize_discount_data', $return, $data );
-	}
+        return apply_filters( 'wpinv_sanitize_discount_data', $return, $data );
+    }
 	
-	/**
-	 * Magic method for checking the existence of a certain custom field.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @return bool Whether the given discount field is set.
-	 */
-	public function __isset( $key ){
-		return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
-	}
+    /**
+     * Magic method for checking the existence of a certain custom field.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @return bool Whether the given discount field is set.
+     */
+    public function __isset( $key ){
+        return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
+    }
 	
-	/**
-	 * Magic method for accessing discount properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @return mixed Value of the given discount property (if set).
-	 */
-	public function __get( $key ) {
-		return $this->get( $key );
-	}
-
-	/**
-	 * Magic method for accessing discount properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @return mixed Value of the given discount property (if set).
-	 */
-	public function get( $key ) {
+    /**
+     * Magic method for accessing discount properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @return mixed Value of the given discount property (if set).
+     */
+    public function __get( $key ) {
+        return $this->get( $key );
+    }
+
+    /**
+     * Magic method for accessing discount properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @return mixed Value of the given discount property (if set).
+     */
+    public function get( $key ) {
 		
-		if ( $key == 'id' ) {
-			$key = 'ID';
-		}
+        if ( $key == 'id' ) {
+            $key = 'ID';
+        }
 		
-		if( method_exists( $this, "get_$key") ) {
-			$value 	= call_user_func( array( $this, "get_$key" ) );
-		} else if( isset( $this->data[$key] ) ) {
-			$value 	= $this->data[$key];
-		} else {
-			$value = null;
-		}
+        if( method_exists( $this, "get_$key") ) {
+            $value 	= call_user_func( array( $this, "get_$key" ) );
+        } else if( isset( $this->data[$key] ) ) {
+            $value 	= $this->data[$key];
+        } else {
+            $value = null;
+        }
 		
-		/**
-		 * Filters a discount's property value.
-		 * 
-		 * The dynamic part ($key) can be any property name e.g items, code, type etc.
-		 * 
-		 * @param mixed          $value    The property's value.
-		 * @param int            $ID       The discount's ID.
-		 * @param WPInv_Discount $discount The discount object.
-		 * @param string         $code     The discount's discount code.
-		 * @param array          $data     The discount's data array.
-		 */
-		return apply_filters( "wpinv_get_discount_{$key}", $value, $this->ID, $this, $this->data['code'], $this->data );
-
-	}
+        /**
+         * Filters a discount's property value.
+         * 
+         * The dynamic part ($key) can be any property name e.g items, code, type etc.
+         * 
+         * @param mixed          $value    The property's value.
+         * @param int            $ID       The discount's ID.
+         * @param WPInv_Discount $discount The discount object.
+         * @param string         $code     The discount's discount code.
+         * @param array          $data     The discount's data array.
+         */
+        return apply_filters( "wpinv_get_discount_{$key}", $value, $this->ID, $this, $this->data['code'], $this->data );
+
+    }
 	
-	/**
-	 * Magic method for setting discount fields.
-	 *
-	 * This method does not update custom fields in the database.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 */
-	public function __set( $key, $value ) {
+    /**
+     * Magic method for setting discount fields.
+     *
+     * This method does not update custom fields in the database.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     */
+    public function __set( $key, $value ) {
 		
-		if ( 'id' == strtolower( $key ) ) {
+        if ( 'id' == strtolower( $key ) ) {
 			
-			$this->ID = $value;
-			$this->data['ID'] = $value;
-			return;
+            $this->ID = $value;
+            $this->data['ID'] = $value;
+            return;
 			
-		}
+        }
 		
-		/**
-		 * Filters a discount's property value before it is saved.
-		 * 
-		 * 
-		 * 
-		 * The dynamic part ($key) can be any property name e.g items, code, type etc.
-		 * 
-		 * @param mixed          $value    The property's value.
-		 * @param int            $ID       The discount's ID.
-		 * @param WPInv_Discount $discount The discount object.
-		 * @param string         $code     The discount's discount code.
-		 * @param array          $data     The discount's data array.
-		 */
-		$value = apply_filters( "wpinv_set_discount_{$key}", $value, $this->ID, $this, $this->code, $this->data );
-
-		if( method_exists( $this, "set_$key") ) {
-			call_user_func( array( $this, "set_$key" ), $value );
-		} else {
-			$this->data[$key] = $value;
-		}
+        /**
+         * Filters a discount's property value before it is saved.
+         * 
+         * 
+         * 
+         * The dynamic part ($key) can be any property name e.g items, code, type etc.
+         * 
+         * @param mixed          $value    The property's value.
+         * @param int            $ID       The discount's ID.
+         * @param WPInv_Discount $discount The discount object.
+         * @param string         $code     The discount's discount code.
+         * @param array          $data     The discount's data array.
+         */
+        $value = apply_filters( "wpinv_set_discount_{$key}", $value, $this->ID, $this, $this->code, $this->data );
+
+        if( method_exists( $this, "set_$key") ) {
+            call_user_func( array( $this, "set_$key" ), $value );
+        } else {
+            $this->data[$key] = $value;
+        }
 		
-	}
+    }
 	
-	/**
-	 * Saves (or updates) a discount to the database
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function save(){
+    /**
+     * Saves (or updates) a discount to the database
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function save(){
 		
-		$data = self::sanitize_discount_data( $this->data );
+        $data = self::sanitize_discount_data( $this->data );
 
-		// Should we create a new post?
-		if( ! $data[ 'ID' ] ) {
+        // Should we create a new post?
+        if( ! $data[ 'ID' ] ) {
 
-			$id = wp_insert_post( array(
-				'post_status'           => $data['status'],
-				'post_type'             => 'wpi_discount',
-				'post_excerpt'          => $data['description'],
-			) );
+            $id = wp_insert_post( array(
+                'post_status'           => $data['status'],
+                'post_type'             => 'wpi_discount',
+                'post_excerpt'          => $data['description'],
+            ) );
 
-			if( empty( $id ) ) {
-				return false;
-			}
+            if( empty( $id ) ) {
+                return false;
+            }
 
-			$data[ 'ID' ] = (int) $id;
-			$this->ID = $data[ 'ID' ];
-			$this->data['ID'] = $data[ 'ID' ];
+            $data[ 'ID' ] = (int) $id;
+            $this->ID = $data[ 'ID' ];
+            $this->data['ID'] = $data[ 'ID' ];
 
-		} else {
-			$this->update_status( $data['status'] );
-		}
+        } else {
+            $this->update_status( $data['status'] );
+        }
 
-		$meta = apply_filters( 'wpinv_update_discount', $data, $this->ID, $this );
+        $meta = apply_filters( 'wpinv_update_discount', $data, $this->ID, $this );
 
-		do_action( 'wpinv_pre_update_discount', $meta, $this->ID, $this );
+        do_action( 'wpinv_pre_update_discount', $meta, $this->ID, $this );
 
-		foreach( wpinv_parse_list( 'ID date_created date_modified status description type_name' ) as $prop ) {
-			if ( isset( $meta[$prop] ) ) {
-				unset( $meta[$prop] );
-			}
-		}
+        foreach( wpinv_parse_list( 'ID date_created date_modified status description type_name' ) as $prop ) {
+            if ( isset( $meta[$prop] ) ) {
+                unset( $meta[$prop] );
+            }
+        }
 
-		if( isset( $meta['uses'] ) && empty( $meta['uses'] ) ) {
-			unset( $meta['uses'] );
-		}
+        if( isset( $meta['uses'] ) && empty( $meta['uses'] ) ) {
+            unset( $meta['uses'] );
+        }
 
-		// Save the metadata.
-		foreach( $meta as $key => $value ) {
-			update_post_meta( $this->ID, "_wpi_discount_$key", $value );
-		}
+        // Save the metadata.
+        foreach( $meta as $key => $value ) {
+            update_post_meta( $this->ID, "_wpi_discount_$key", $value );
+        }
 
-		$this->refresh();
+        $this->refresh();
 
-		do_action( 'wpinv_post_update_discount', $meta, $this->ID );
+        do_action( 'wpinv_post_update_discount', $meta, $this->ID );
 
-		return true;		
-	}
+        return true;		
+    }
 
-	/**
-	 * Refreshes the discount data.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function refresh(){
+    /**
+     * Refreshes the discount data.
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function refresh(){
 
-		// Empty the cache for this discount.
-		wp_cache_delete( $this->ID, 'WPInv_Discounts' );
-		wp_cache_delete( $this->get( 'code' ), 'WPInv_Discount_Codes' );
+        // Empty the cache for this discount.
+        wp_cache_delete( $this->ID, 'WPInv_Discounts' );
+        wp_cache_delete( $this->get( 'code' ), 'WPInv_Discount_Codes' );
 
-		$data = self::get_data_by( 'id', $this->ID );
-		if( is_array( $data ) ) {
-			$this->init( $data );
-		} else {
-			$this->init( array() );
-		}
+        $data = self::get_data_by( 'id', $this->ID );
+        if( is_array( $data ) ) {
+            $this->init( $data );
+        } else {
+            $this->init( array() );
+        }
 
-	}
+    }
 
-	/**
-	 * Saves (or updates) a discount to the database
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function update_status( $status = 'publish' ){
+    /**
+     * Saves (or updates) a discount to the database
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function update_status( $status = 'publish' ){
 
 
-		if ( $this->exists() && $this->old_status != $status ) {
+        if ( $this->exists() && $this->old_status != $status ) {
 
-			do_action( 'wpinv_pre_update_discount_status', $this->ID, $this->old_status, $status );
-        	$updated = wp_update_post( array( 'ID' => $this->ID, 'post_status' => $status ) );
-			do_action( 'wpinv_post_update_discount_status', $this->ID, $this->old_status, $status );
+            do_action( 'wpinv_pre_update_discount_status', $this->ID, $this->old_status, $status );
+            $updated = wp_update_post( array( 'ID' => $this->ID, 'post_status' => $status ) );
+            do_action( 'wpinv_post_update_discount_status', $this->ID, $this->old_status, $status );
 
-			$this->refresh();
+            $this->refresh();
 
-			return $updated !== 0;
+            return $updated !== 0;
 			
-		}
+        }
 
-		return false;		
-	}
+        return false;		
+    }
 	
 	
-	/**
-	 * Checks whether a discount exists in the database or not
-	 * 
-	 * @since 1.0.15
-	 */
-	public function exists(){
-		return ! empty( $this->ID );
-	}
+    /**
+     * Checks whether a discount exists in the database or not
+     * 
+     * @since 1.0.15
+     */
+    public function exists(){
+        return ! empty( $this->ID );
+    }
 	
-	// Boolean methods
+    // Boolean methods
 	
-	/**
-	 * Checks the discount type.
-	 * 
-	 * 
-	 * @param  string $type the discount type to check against
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_type( $type ) {
-		return $this->type == $type;
-	}
+    /**
+     * Checks the discount type.
+     * 
+     * 
+     * @param  string $type the discount type to check against
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_type( $type ) {
+        return $this->type == $type;
+    }
 	
-	/**
-	 * Checks whether the discount is published or not
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_active() {
-		return $this->status == 'publish';
-	}
+    /**
+     * Checks whether the discount is published or not
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_active() {
+        return $this->status == 'publish';
+    }
 	
-	/**
-	 * Checks whether the discount is has exided the usage limit or not
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_exceeded_limit() {
-		if( empty( $this->max_uses ) || empty( $this->uses ) ) { 
-			return false ;
-		}
+    /**
+     * Checks whether the discount is has exided the usage limit or not
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_exceeded_limit() {
+        if( empty( $this->max_uses ) || empty( $this->uses ) ) { 
+            return false ;
+        }
 		
-		$exceeded =  $this->uses >= $this->max_uses;
-		return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->ID, $this, $this->code );
-	}
+        $exceeded =  $this->uses >= $this->max_uses;
+        return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->ID, $this, $this->code );
+    }
 	
-	/**
-	 * Checks if the discount is expired
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_expired() {
-		$expired = empty ( $this->expiration ) ? false : current_time( 'timestamp' ) > strtotime( $this->expiration );
-		return apply_filters( 'wpinv_is_discount_expired', $expired, $this->ID, $this, $this->code );
-	}
-
-	/**
-	 * Checks the discount start date.
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_started() {
-		$started = empty ( $this->start ) ? true : current_time( 'timestamp' ) > strtotime( $this->start );
-		return apply_filters( 'wpinv_is_discount_started', $started, $this->ID, $this, $this->code );		
-	}
+    /**
+     * Checks if the discount is expired
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_expired() {
+        $expired = empty ( $this->expiration ) ? false : current_time( 'timestamp' ) > strtotime( $this->expiration );
+        return apply_filters( 'wpinv_is_discount_expired', $expired, $this->ID, $this, $this->code );
+    }
+
+    /**
+     * Checks the discount start date.
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_started() {
+        $started = empty ( $this->start ) ? true : current_time( 'timestamp' ) > strtotime( $this->start );
+        return apply_filters( 'wpinv_is_discount_started', $started, $this->ID, $this, $this->code );		
+    }
 	
-	/**
-	 * Check if a discount is valid for a given item id.
-	 *
-	 * @param  int|int[]  $item_ids
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_items( $item_ids ) {
+    /**
+     * Check if a discount is valid for a given item id.
+     *
+     * @param  int|int[]  $item_ids
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_items( $item_ids ) {
 		 
-		$item_ids = array_map( 'intval',  wpinv_parse_list( $item_ids ) );
-		$included = array_intersect( $item_ids, $this->items );
-		$excluded = array_intersect( $item_ids, $this->excluded_items );
-
-		if( ! empty( $this->excluded_items ) && ! empty( $excluded ) ) {
-			return false;
-		}
-
-		if( ! empty( $this->items ) && empty( $included ) ) {
-			return false;
-		}
-		return true;
-	}
+        $item_ids = array_map( 'intval',  wpinv_parse_list( $item_ids ) );
+        $included = array_intersect( $item_ids, $this->items );
+        $excluded = array_intersect( $item_ids, $this->excluded_items );
+
+        if( ! empty( $this->excluded_items ) && ! empty( $excluded ) ) {
+            return false;
+        }
+
+        if( ! empty( $this->items ) && empty( $included ) ) {
+            return false;
+        }
+        return true;
+    }
 	
-	/**
-	 * Check if a discount is valid for the given amount
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_amount( $amount ) {
-		return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
-	}
-
-	/**
-	 * Checks if the minimum amount is met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_minimum_amount_met( $amount ) {
-		$amount = floatval( $amount );
-		$min_met= ! ( $this->min_total > 0 && $amount < $this->min_total );
-		return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->ID, $this, $this->code, $amount );
-	}
-
-	/**
-	 * Checks if the maximum amount is met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_maximum_amount_met( $amount ) {
-		$amount = floatval( $amount );
-		$max_met= ! ( $this->max_total > 0 && $amount > $this->max_total );
-		return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->ID, $this, $this->code, $amount );
-	}
-
-	/**
-	 * Check if a discount is valid for the given user
-	 *
-	 * @param  int|string  $user
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_user( $user ) {
-		global $wpi_checkout_id;
-
-		if( empty( $user ) || empty( $this->is_single_use ) ) {
-			return true;
-		}
-
-		$user_id = 0;
+    /**
+     * Check if a discount is valid for the given amount
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_amount( $amount ) {
+        return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
+    }
+
+    /**
+     * Checks if the minimum amount is met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_minimum_amount_met( $amount ) {
+        $amount = floatval( $amount );
+        $min_met= ! ( $this->min_total > 0 && $amount < $this->min_total );
+        return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->ID, $this, $this->code, $amount );
+    }
+
+    /**
+     * Checks if the maximum amount is met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_maximum_amount_met( $amount ) {
+        $amount = floatval( $amount );
+        $max_met= ! ( $this->max_total > 0 && $amount > $this->max_total );
+        return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->ID, $this, $this->code, $amount );
+    }
+
+    /**
+     * Check if a discount is valid for the given user
+     *
+     * @param  int|string  $user
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_user( $user ) {
+        global $wpi_checkout_id;
+
+        if( empty( $user ) || empty( $this->is_single_use ) ) {
+            return true;
+        }
+
+        $user_id = 0;
         if ( is_int( $user ) ) {
             $user_id = absint( $user );
         } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
@@ -682,164 +682,164 @@ 
             $user_id = $user_data->ID;
         } else if ( absint( $user ) > 0 ) {
             $user_id = absint( $user );
-		}
+        }
 
-		if ( empty( $user_id ) ) {
-			return true;
-		}
+        if ( empty( $user_id ) ) {
+            return true;
+        }
 		
-		// Get all payments with matching user id
+        // Get all payments with matching user id
         $payments = wpinv_get_invoices( array( 'user' => $user_id, 'limit' => false ) ); 
-		$code     = strtolower( $this->code );
+        $code     = strtolower( $this->code );
 
-		foreach ( $payments as $payment ) {
+        foreach ( $payments as $payment ) {
 
-			// Don't count discount used for current invoice checkout.
-			if ( ! empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
-				continue;
-			}
+            // Don't count discount used for current invoice checkout.
+            if ( ! empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
+                continue;
+            }
 			
-			if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
-				continue;
-			}
-
-			$discounts = $payment->get_discounts( true );
-			if ( empty( $discounts ) ) {
-				continue;
-			}
-
-			$discounts = array_map( 'strtolower', wpinv_parse_list( $discounts ) );
-			if ( ! empty( $discounts ) && in_array( $code, $discounts ) ) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes the discount from the database
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function remove() {
-
-		if ( empty( $this->ID ) ) {
-			return true;
-		}
-
-		do_action( 'wpinv_pre_delete_discount', $this->ID, $this->data );
-		wp_cache_delete( $this->ID, 'WPInv_Discounts' );
-    	wp_delete_post( $this->ID, true );
-		wp_cache_delete( $this->code, 'WPInv_Discount_Codes' );
-    	do_action( 'wpinv_post_delete_discount', $this->ID, $this->data );
-
-		$this->ID = null;
-		$this->data['id'] = null;
-		return true;
-	}
-
-	/**
-	 * Increases a discount's usage.
-	 *
-	 * @since 1.0.15
-	 * @param int $by The number of usages to increas by.
-	 * @return int
-	 */
-	public function increase_usage( $by = 1 ) {
-
-		$this->uses = $this->uses + $by;
-
-		if( $this->uses  < 0 ) {
-			$this->uses = 0;
-			update_post_meta( $this->ID, "_wpi_discount_uses", 0 );
-		}
-
-		$this->save();
-
-		if( $by > 0 ) {
-			do_action( 'wpinv_discount_increase_use_count', $this->uses, $this->ID, $this->code, $by );
-		} else {
-			do_action( 'wpinv_discount_decrease_use_count', $this->uses, $this->ID, $this->code, absint( $by ) );
-		}
+            if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
+                continue;
+            }
+
+            $discounts = $payment->get_discounts( true );
+            if ( empty( $discounts ) ) {
+                continue;
+            }
+
+            $discounts = array_map( 'strtolower', wpinv_parse_list( $discounts ) );
+            if ( ! empty( $discounts ) && in_array( $code, $discounts ) ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes the discount from the database
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function remove() {
+
+        if ( empty( $this->ID ) ) {
+            return true;
+        }
+
+        do_action( 'wpinv_pre_delete_discount', $this->ID, $this->data );
+        wp_cache_delete( $this->ID, 'WPInv_Discounts' );
+        wp_delete_post( $this->ID, true );
+        wp_cache_delete( $this->code, 'WPInv_Discount_Codes' );
+        do_action( 'wpinv_post_delete_discount', $this->ID, $this->data );
+
+        $this->ID = null;
+        $this->data['id'] = null;
+        return true;
+    }
+
+    /**
+     * Increases a discount's usage.
+     *
+     * @since 1.0.15
+     * @param int $by The number of usages to increas by.
+     * @return int
+     */
+    public function increase_usage( $by = 1 ) {
+
+        $this->uses = $this->uses + $by;
+
+        if( $this->uses  < 0 ) {
+            $this->uses = 0;
+            update_post_meta( $this->ID, "_wpi_discount_uses", 0 );
+        }
+
+        $this->save();
+
+        if( $by > 0 ) {
+            do_action( 'wpinv_discount_increase_use_count', $this->uses, $this->ID, $this->code, $by );
+        } else {
+            do_action( 'wpinv_discount_decrease_use_count', $this->uses, $this->ID, $this->code, absint( $by ) );
+        }
 		
-		return $this->uses;
-	}
-
-	/**
-	 * Retrieves discount data
-	 *
-	 * @since 1.0.15
-	 * @return array
-	 */
-	public function get_data() {
-		$return = array();
-		foreach( array_keys( $this->data ) as $key ) {
-			$return[ $key ] = $this->get( $key );
-		}
-		return $return;
-	}
-
-	/**
-	 * Retrieves discount data as json
-	 *
-	 * @since 1.0.15
-	 * @return string|false
-	 */
-	public function get_data_as_json() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Checks if a discount can only be used once per user.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function get_is_single_use() {
-		return (bool) apply_filters( 'wpinv_is_discount_single_use', $this->data['is_single_use'], $this->ID, $this, $this->code );
-	}
-
-	/**
-	 * Checks if a discount is recurring.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function get_is_recurring() {
-		return (bool) apply_filters( 'wpinv_is_discount_recurring', $this->data['is_recurring'], $this->ID, $this->code, $this );
-	}
-
-	/**
-	 * Returns a discount's included items.
-	 *
-	 * @since 1.0.15
-	 * @return array
-	 */
-	public function get_items() {
-		return wpinv_parse_list( apply_filters( 'wpinv_get_discount_item_reqs', $this->data['items'], $this->ID, $this, $this->code ) );
-	}
-
-	/**
-	 * Returns a discount's discounted amount.
-	 *
-	 * @since 1.0.15
-	 * @return float
-	 */
-	public function get_discounted_amount( $amount ) {
-
-		if ( $this->type == 'flat' ) {
+        return $this->uses;
+    }
+
+    /**
+     * Retrieves discount data
+     *
+     * @since 1.0.15
+     * @return array
+     */
+    public function get_data() {
+        $return = array();
+        foreach( array_keys( $this->data ) as $key ) {
+            $return[ $key ] = $this->get( $key );
+        }
+        return $return;
+    }
+
+    /**
+     * Retrieves discount data as json
+     *
+     * @since 1.0.15
+     * @return string|false
+     */
+    public function get_data_as_json() {
+        return wp_json_encode( $this->get_data() );
+    }
+
+    /**
+     * Checks if a discount can only be used once per user.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function get_is_single_use() {
+        return (bool) apply_filters( 'wpinv_is_discount_single_use', $this->data['is_single_use'], $this->ID, $this, $this->code );
+    }
+
+    /**
+     * Checks if a discount is recurring.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function get_is_recurring() {
+        return (bool) apply_filters( 'wpinv_is_discount_recurring', $this->data['is_recurring'], $this->ID, $this->code, $this );
+    }
+
+    /**
+     * Returns a discount's included items.
+     *
+     * @since 1.0.15
+     * @return array
+     */
+    public function get_items() {
+        return wpinv_parse_list( apply_filters( 'wpinv_get_discount_item_reqs', $this->data['items'], $this->ID, $this, $this->code ) );
+    }
+
+    /**
+     * Returns a discount's discounted amount.
+     *
+     * @since 1.0.15
+     * @return float
+     */
+    public function get_discounted_amount( $amount ) {
+
+        if ( $this->type == 'flat' ) {
             $amount = $amount - $this->amount;
-		} else {
+        } else {
             $amount = $amount - ( $amount * ( $this->amount / 100 ) );
-		}
+        }
 
-		if ( $amount < 0 ) {
-			$amount = 0;
-		}
+        if ( $amount < 0 ) {
+            $amount = 0;
+        }
 
-		return apply_filters( 'wpinv_discounted_amount', $amount, $this->ID, $this, $this->code, $this->amount );
-	}
+        return apply_filters( 'wpinv_discounted_amount', $amount, $this->ID, $this, $this->code, $this->amount );
+    }
 	
 }

Spacing +189 added lines, -189 removed lines

@@ -5,7 +5,7 @@ 
  * @since   1.0.15
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Discount class.
@@ -63,45 +63,45 @@ 
 	 * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
 	 * @since 1.0.15
 	 */
-	public function __construct( $discount = array() ) {
+	public function __construct($discount = array()) {
         
         // If the discount is an instance of this class...
-		if ( $discount instanceof WPInv_Discount ) {
-			$this->init( $discount->data );
+		if ($discount instanceof WPInv_Discount) {
+			$this->init($discount->data);
 			return;
         }
         
         // If the discount is an array of discount details...
-        if ( is_array( $discount ) ) {
-			$this->init( $discount );
+        if (is_array($discount)) {
+			$this->init($discount);
 			return;
 		}
 		
 		// Try fetching the discount by its post id.
 		$data = false;
 		
-		if ( ! empty( $discount ) && is_numeric( $discount ) ) {
-			$discount = absint( $discount );
-			$data = self::get_data_by( 'id', $discount );
+		if (!empty($discount) && is_numeric($discount)) {
+			$discount = absint($discount);
+			$data = self::get_data_by('id', $discount);
 		}
 
-		if ( is_array( $data ) ) {
-			$this->init( $data );
+		if (is_array($data)) {
+			$this->init($data);
 			return;
 		}
 		
 		// Try fetching the discount by its discount code.
-		if ( ! empty( $discount ) && is_string( $discount ) ) {
-			$data = self::get_data_by( 'discount_code', $discount );
+		if (!empty($discount) && is_string($discount)) {
+			$data = self::get_data_by('discount_code', $discount);
 		}
 
-		if ( is_array( $data ) ) {
-			$this->init( $data );
+		if (is_array($data)) {
+			$this->init($data);
 			return;
 		} 
 		
 		// If we are here then the discount does not exist.
-		$this->init( array() );
+		$this->init(array());
 	}
 	
 	/**
@@ -110,8 +110,8 @@ 
 	 * @since 1.0.15
 	 * @param array $data An array containing the discount's data
 	 */
-	public function init( $data ) {
-		$data       	  = self::sanitize_discount_data( $data );
+	public function init($data) {
+		$data       	  = self::sanitize_discount_data($data);
 		$this->data 	  = $data;
 		$this->old_status = $data['status'];
 		$this->ID   	  = $data['ID'];
@@ -127,50 +127,50 @@ 
 	 * @since 1.0.15
 	 * @return array|bool array of discount details on success. False otherwise.
 	 */
-	public static function get_data_by( $field, $value ) {
+	public static function get_data_by($field, $value) {
 
-		if ( 'id' == strtolower( $field ) ) {
+		if ('id' == strtolower($field)) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
+			if (!is_numeric($value))
 				return false;
-			$value = intval( $value );
-			if ( $value < 1 )
+			$value = intval($value);
+			if ($value < 1)
 				return false;
 		}
 
-		if ( ! $value || ! is_string( $field ) ) {
+		if (!$value || !is_string($field)) {
 			return false;
 		}
 		
-		$field = trim( $field );
+		$field = trim($field);
 
 		// prepare query args
-		switch ( strtolower( $field ) ) {
+		switch (strtolower($field)) {
 			case 'id':
 				$discount_id = $value;
-				$args		 = array( 'include' => array( $value ) );
+				$args = array('include' => array($value));
 				break;
 			case 'discount_code':
 			case 'code':
-				$value       = trim( $value );
-				$discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
-				$args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
+				$value       = trim($value);
+				$discount_id = wp_cache_get($value, 'WPInv_Discount_Codes');
+				$args = array('meta_key' => '_wpi_discount_code', 'meta_value' => $value);
 				break;
 			case 'name':
 				$discount_id = 0;
-				$args		 = array( 'name' => trim( $value ) );
+				$args		 = array('name' => trim($value));
 				break;
 			default:
-				$args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
-				if ( ! is_array( $args ) ) {
-					return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
+				$args		 = apply_filters("wpinv_discount_get_data_by_{$field}_args", null, $value);
+				if (!is_array($args)) {
+					return apply_filters("wpinv_discount_get_data_by_$field", false, $value);
 				}
 
 		}
 
 		// Check if there is a cached value.
-		if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
+		if (!empty($discount_id) && $discount = wp_cache_get((int) $discount_id, 'WPInv_Discounts')) {
 			return $discount;
 		}
 
@@ -179,13 +179,13 @@ 
 			array(
 				'post_type'      => 'wpi_discount',
 				'posts_per_page' => 1,
-				'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+				'post_status'    => array('publish', 'pending', 'draft', 'expired')
 			)
 		);
 
-		$discount = get_posts( $args );
+		$discount = get_posts($args);
 				
-		if( empty( $discount ) ) {
+		if (empty($discount)) {
 			return false;
 		}
 
@@ -194,31 +194,31 @@ 
 		// Prepare the return data.
 		$return = array(
             'ID'                          => $discount->ID,
-            'code'                        => get_post_meta( $discount->ID, '_wpi_discount_code', true ),
-            'amount'                      => get_post_meta( $discount->ID, '_wpi_discount_amount', true ),
+            'code'                        => get_post_meta($discount->ID, '_wpi_discount_code', true),
+            'amount'                      => get_post_meta($discount->ID, '_wpi_discount_amount', true),
             'date_created'                => $discount->post_date,
 			'date_modified'               => $discount->post_modified,
 			'status'               		  => $discount->post_status,
-			'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
-            'expiration'                  => get_post_meta( $discount->ID, '_wpi_discount_expiration', true ),
-            'type'               		  => get_post_meta( $discount->ID, '_wpi_discount_type', true ),
+			'start'                  	  => get_post_meta($discount->ID, '_wpi_discount_start', true),
+            'expiration'                  => get_post_meta($discount->ID, '_wpi_discount_expiration', true),
+            'type'               		  => get_post_meta($discount->ID, '_wpi_discount_type', true),
             'description'                 => $discount->post_excerpt,
-            'uses'                 		  => get_post_meta( $discount->ID, '_wpi_discount_uses', true ),
-            'is_single_use'               => get_post_meta( $discount->ID, '_wpi_discount_is_single_use', true ),
-            'items'              	      => get_post_meta( $discount->ID, '_wpi_discount_items', true ),
-            'excluded_items'              => get_post_meta( $discount->ID, '_wpi_discount_excluded_items', true ),
-            'max_uses'                    => get_post_meta( $discount->ID, '_wpi_discount_max_uses', true ),
-            'is_recurring'                => get_post_meta( $discount->ID, '_wpi_discount_is_recurring', true ),
-            'min_total'                   => get_post_meta( $discount->ID, '_wpi_discount_min_total', true ),
-            'max_total'                   => get_post_meta( $discount->ID, '_wpi_discount_max_total', true ),
+            'uses'                 		  => get_post_meta($discount->ID, '_wpi_discount_uses', true),
+            'is_single_use'               => get_post_meta($discount->ID, '_wpi_discount_is_single_use', true),
+            'items'              	      => get_post_meta($discount->ID, '_wpi_discount_items', true),
+            'excluded_items'              => get_post_meta($discount->ID, '_wpi_discount_excluded_items', true),
+            'max_uses'                    => get_post_meta($discount->ID, '_wpi_discount_max_uses', true),
+            'is_recurring'                => get_post_meta($discount->ID, '_wpi_discount_is_recurring', true),
+            'min_total'                   => get_post_meta($discount->ID, '_wpi_discount_min_total', true),
+            'max_total'                   => get_post_meta($discount->ID, '_wpi_discount_max_total', true),
         );
 		
-		$return = self::sanitize_discount_data( $return );
-		$return = apply_filters( 'wpinv_discount_properties', $return );
+		$return = self::sanitize_discount_data($return);
+		$return = apply_filters('wpinv_discount_properties', $return);
 
 		// Update the cache with our data
-		wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
-		wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
+		wp_cache_add($discount->ID, $return, 'WPInv_Discounts');
+		wp_cache_add($return['code'], $discount->ID, 'WPInv_Discount_Codes');
 
 		return $return;
 	}
@@ -232,9 +232,9 @@ 
 	 *
 	 * @return array the sanitized data
 	 */
-	public static function sanitize_discount_data( $data ) {
+	public static function sanitize_discount_data($data) {
 		
-		$allowed_discount_types = array_keys( wpinv_get_discount_types() );
+		$allowed_discount_types = array_keys(wpinv_get_discount_types());
 		
 		$return = array(
             'ID'                          => null,
@@ -259,60 +259,60 @@ 
 		
 				
 		// Arrays only please.
-		if ( ! is_array( $data ) ) {
+		if (!is_array($data)) {
             return $return;
         }
 
 		// If an id is provided, ensure it is a valid discount.
-        if ( ! empty( $data['ID'] ) && ( ! is_numeric( $data['ID'] ) || 'wpi_discount' !== get_post_type( $data['ID'] ) ) ) {
+        if (!empty($data['ID']) && (!is_numeric($data['ID']) || 'wpi_discount' !== get_post_type($data['ID']))) {
             return $return;
 		}
 
-        $return = array_merge( $return, $data );
+        $return = array_merge($return, $data);
 
         // Sanitize some keys.
-        $return['amount']         = wpinv_sanitize_amount( $return['amount'] );
+        $return['amount'] = wpinv_sanitize_amount($return['amount']);
 		$return['is_single_use']  = (bool) $return['is_single_use'];
 		$return['is_recurring']   = (bool) $return['is_recurring'];
 		$return['uses']	          = (int) $return['uses'];
 		$return['max_uses']	      = (int) $return['max_uses'];
-		$return['min_total'] 	  = wpinv_sanitize_amount( $return['min_total'] );
-        $return['max_total'] 	  = wpinv_sanitize_amount( $return['max_total'] );
+		$return['min_total'] = wpinv_sanitize_amount($return['min_total']);
+        $return['max_total'] = wpinv_sanitize_amount($return['max_total']);
 
 		// Trim all values.
-		$return = wpinv_clean( $return );
+		$return = wpinv_clean($return);
 		
 		// Ensure the discount type is supported.
-        if ( ! in_array( $return['type'], $allowed_discount_types, true ) ) {
+        if (!in_array($return['type'], $allowed_discount_types, true)) {
             $return['type'] = 'percent';
 		}
-		$return['type_name'] = wpinv_get_discount_type_name( $return['type'] );
+		$return['type_name'] = wpinv_get_discount_type_name($return['type']);
 		
 		// Do not offer more than a 100% discount.
-		if ( $return['type'] == 'percent' && (float) $return['amount'] > 100 ) {
+		if ($return['type'] == 'percent' && (float) $return['amount'] > 100) {
 			$return['amount'] = 100;
 		}
 
 		// Format dates.
-		foreach( wpinv_parse_list( 'date_created date_modified expiration start') as $prop ) {
-			if( ! empty( $return[$prop] ) ) {
-				$return[$prop]      = date_i18n( 'Y-m-d H:i:s', strtotime( $return[$prop] ) );
+		foreach (wpinv_parse_list('date_created date_modified expiration start') as $prop) {
+			if (!empty($return[$prop])) {
+				$return[$prop] = date_i18n('Y-m-d H:i:s', strtotime($return[$prop]));
 			}
 		}
 
 		// Formart items.
-		foreach( array( 'excluded_items', 'items' ) as $prop ) {
+		foreach (array('excluded_items', 'items') as $prop) {
 
-			if( ! empty( $return[$prop] ) ) {
+			if (!empty($return[$prop])) {
 				// Ensure that the property is an array of non-empty integers.
-				$return[$prop]      = array_filter( array_map( 'intval', wpinv_parse_list( $return[$prop] ) ) );
+				$return[$prop]      = array_filter(array_map('intval', wpinv_parse_list($return[$prop])));
 			} else {
 				$return[$prop]      = array();
 			}
 
 		}
 		
-		return apply_filters( 'wpinv_sanitize_discount_data', $return, $data );
+		return apply_filters('wpinv_sanitize_discount_data', $return, $data);
 	}
 	
 	/**
@@ -323,8 +323,8 @@ 
 	 *
 	 * @return bool Whether the given discount field is set.
 	 */
-	public function __isset( $key ){
-		return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
+	public function __isset($key) {
+		return isset($this->data[$key]) || method_exists($this, "get_$key");
 	}
 	
 	/**
@@ -336,8 +336,8 @@ 
 	 * @param string $key Discount data to retrieve
 	 * @return mixed Value of the given discount property (if set).
 	 */
-	public function __get( $key ) {
-		return $this->get( $key );
+	public function __get($key) {
+		return $this->get($key);
 	}
 
 	/**
@@ -349,15 +349,15 @@ 
 	 * @param string $key Discount data to retrieve
 	 * @return mixed Value of the given discount property (if set).
 	 */
-	public function get( $key ) {
+	public function get($key) {
 		
-		if ( $key == 'id' ) {
+		if ($key == 'id') {
 			$key = 'ID';
 		}
 		
-		if( method_exists( $this, "get_$key") ) {
-			$value 	= call_user_func( array( $this, "get_$key" ) );
-		} else if( isset( $this->data[$key] ) ) {
+		if (method_exists($this, "get_$key")) {
+			$value 	= call_user_func(array($this, "get_$key"));
+		} else if (isset($this->data[$key])) {
 			$value 	= $this->data[$key];
 		} else {
 			$value = null;
@@ -374,7 +374,7 @@ 
 		 * @param string         $code     The discount's discount code.
 		 * @param array          $data     The discount's data array.
 		 */
-		return apply_filters( "wpinv_get_discount_{$key}", $value, $this->ID, $this, $this->data['code'], $this->data );
+		return apply_filters("wpinv_get_discount_{$key}", $value, $this->ID, $this, $this->data['code'], $this->data);
 
 	}
 	
@@ -387,9 +387,9 @@ 
 	 * @access public
 	 *
 	 */
-	public function __set( $key, $value ) {
+	public function __set($key, $value) {
 		
-		if ( 'id' == strtolower( $key ) ) {
+		if ('id' == strtolower($key)) {
 			
 			$this->ID = $value;
 			$this->data['ID'] = $value;
@@ -410,10 +410,10 @@ 
 		 * @param string         $code     The discount's discount code.
 		 * @param array          $data     The discount's data array.
 		 */
-		$value = apply_filters( "wpinv_set_discount_{$key}", $value, $this->ID, $this, $this->code, $this->data );
+		$value = apply_filters("wpinv_set_discount_{$key}", $value, $this->ID, $this, $this->code, $this->data);
 
-		if( method_exists( $this, "set_$key") ) {
-			call_user_func( array( $this, "set_$key" ), $value );
+		if (method_exists($this, "set_$key")) {
+			call_user_func(array($this, "set_$key"), $value);
 		} else {
 			$this->data[$key] = $value;
 		}
@@ -428,53 +428,53 @@ 
 	 * @return bool
 	 *
 	 */
-	public function save(){
+	public function save() {
 		
-		$data = self::sanitize_discount_data( $this->data );
+		$data = self::sanitize_discount_data($this->data);
 
 		// Should we create a new post?
-		if( ! $data[ 'ID' ] ) {
+		if (!$data['ID']) {
 
-			$id = wp_insert_post( array(
+			$id = wp_insert_post(array(
 				'post_status'           => $data['status'],
 				'post_type'             => 'wpi_discount',
 				'post_excerpt'          => $data['description'],
-			) );
+			));
 
-			if( empty( $id ) ) {
+			if (empty($id)) {
 				return false;
 			}
 
-			$data[ 'ID' ] = (int) $id;
-			$this->ID = $data[ 'ID' ];
-			$this->data['ID'] = $data[ 'ID' ];
+			$data['ID'] = (int) $id;
+			$this->ID = $data['ID'];
+			$this->data['ID'] = $data['ID'];
 
 		} else {
-			$this->update_status( $data['status'] );
+			$this->update_status($data['status']);
 		}
 
-		$meta = apply_filters( 'wpinv_update_discount', $data, $this->ID, $this );
+		$meta = apply_filters('wpinv_update_discount', $data, $this->ID, $this);
 
-		do_action( 'wpinv_pre_update_discount', $meta, $this->ID, $this );
+		do_action('wpinv_pre_update_discount', $meta, $this->ID, $this);
 
-		foreach( wpinv_parse_list( 'ID date_created date_modified status description type_name' ) as $prop ) {
-			if ( isset( $meta[$prop] ) ) {
-				unset( $meta[$prop] );
+		foreach (wpinv_parse_list('ID date_created date_modified status description type_name') as $prop) {
+			if (isset($meta[$prop])) {
+				unset($meta[$prop]);
 			}
 		}
 
-		if( isset( $meta['uses'] ) && empty( $meta['uses'] ) ) {
-			unset( $meta['uses'] );
+		if (isset($meta['uses']) && empty($meta['uses'])) {
+			unset($meta['uses']);
 		}
 
 		// Save the metadata.
-		foreach( $meta as $key => $value ) {
-			update_post_meta( $this->ID, "_wpi_discount_$key", $value );
+		foreach ($meta as $key => $value) {
+			update_post_meta($this->ID, "_wpi_discount_$key", $value);
 		}
 
 		$this->refresh();
 
-		do_action( 'wpinv_post_update_discount', $meta, $this->ID );
+		do_action('wpinv_post_update_discount', $meta, $this->ID);
 
 		return true;		
 	}
@@ -487,17 +487,17 @@ 
 	 * @return bool
 	 *
 	 */
-	public function refresh(){
+	public function refresh() {
 
 		// Empty the cache for this discount.
-		wp_cache_delete( $this->ID, 'WPInv_Discounts' );
-		wp_cache_delete( $this->get( 'code' ), 'WPInv_Discount_Codes' );
+		wp_cache_delete($this->ID, 'WPInv_Discounts');
+		wp_cache_delete($this->get('code'), 'WPInv_Discount_Codes');
 
-		$data = self::get_data_by( 'id', $this->ID );
-		if( is_array( $data ) ) {
-			$this->init( $data );
+		$data = self::get_data_by('id', $this->ID);
+		if (is_array($data)) {
+			$this->init($data);
 		} else {
-			$this->init( array() );
+			$this->init(array());
 		}
 
 	}
@@ -510,14 +510,14 @@ 
 	 * @return bool
 	 *
 	 */
-	public function update_status( $status = 'publish' ){
+	public function update_status($status = 'publish') {
 
 
-		if ( $this->exists() && $this->old_status != $status ) {
+		if ($this->exists() && $this->old_status != $status) {
 
-			do_action( 'wpinv_pre_update_discount_status', $this->ID, $this->old_status, $status );
-        	$updated = wp_update_post( array( 'ID' => $this->ID, 'post_status' => $status ) );
-			do_action( 'wpinv_post_update_discount_status', $this->ID, $this->old_status, $status );
+			do_action('wpinv_pre_update_discount_status', $this->ID, $this->old_status, $status);
+        	$updated = wp_update_post(array('ID' => $this->ID, 'post_status' => $status));
+			do_action('wpinv_post_update_discount_status', $this->ID, $this->old_status, $status);
 
 			$this->refresh();
 
@@ -534,8 +534,8 @@ 
 	 * 
 	 * @since 1.0.15
 	 */
-	public function exists(){
-		return ! empty( $this->ID );
+	public function exists() {
+		return !empty($this->ID);
 	}
 	
 	// Boolean methods
@@ -548,7 +548,7 @@ 
 	 * @since 1.0.15
 	 * @return bool
 	 */
-	public function is_type( $type ) {
+	public function is_type($type) {
 		return $this->type == $type;
 	}
 	
@@ -569,12 +569,12 @@ 
 	 * @return bool
 	 */
 	public function has_exceeded_limit() {
-		if( empty( $this->max_uses ) || empty( $this->uses ) ) { 
-			return false ;
+		if (empty($this->max_uses) || empty($this->uses)) { 
+			return false;
 		}
 		
-		$exceeded =  $this->uses >= $this->max_uses;
-		return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->ID, $this, $this->code );
+		$exceeded = $this->uses >= $this->max_uses;
+		return apply_filters('wpinv_is_discount_maxed_out', $exceeded, $this->ID, $this, $this->code);
 	}
 	
 	/**
@@ -584,8 +584,8 @@ 
 	 * @return bool
 	 */
 	public function is_expired() {
-		$expired = empty ( $this->expiration ) ? false : current_time( 'timestamp' ) > strtotime( $this->expiration );
-		return apply_filters( 'wpinv_is_discount_expired', $expired, $this->ID, $this, $this->code );
+		$expired = empty ($this->expiration) ? false : current_time('timestamp') > strtotime($this->expiration);
+		return apply_filters('wpinv_is_discount_expired', $expired, $this->ID, $this, $this->code);
 	}
 
 	/**
@@ -595,8 +595,8 @@ 
 	 * @return bool
 	 */
 	public function has_started() {
-		$started = empty ( $this->start ) ? true : current_time( 'timestamp' ) > strtotime( $this->start );
-		return apply_filters( 'wpinv_is_discount_started', $started, $this->ID, $this, $this->code );		
+		$started = empty ($this->start) ? true : current_time('timestamp') > strtotime($this->start);
+		return apply_filters('wpinv_is_discount_started', $started, $this->ID, $this, $this->code);		
 	}
 	
 	/**
@@ -606,17 +606,17 @@ 
 	 * @since 1.0.15
 	 * @return boolean
 	 */
-	public function is_valid_for_items( $item_ids ) {
+	public function is_valid_for_items($item_ids) {
 		 
-		$item_ids = array_map( 'intval',  wpinv_parse_list( $item_ids ) );
-		$included = array_intersect( $item_ids, $this->items );
-		$excluded = array_intersect( $item_ids, $this->excluded_items );
+		$item_ids = array_map('intval', wpinv_parse_list($item_ids));
+		$included = array_intersect($item_ids, $this->items);
+		$excluded = array_intersect($item_ids, $this->excluded_items);
 
-		if( ! empty( $this->excluded_items ) && ! empty( $excluded ) ) {
+		if (!empty($this->excluded_items) && !empty($excluded)) {
 			return false;
 		}
 
-		if( ! empty( $this->items ) && empty( $included ) ) {
+		if (!empty($this->items) && empty($included)) {
 			return false;
 		}
 		return true;
@@ -629,8 +629,8 @@ 
 	 * @since 1.0.15
 	 * @return boolean
 	 */
-	public function is_valid_for_amount( $amount ) {
-		return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
+	public function is_valid_for_amount($amount) {
+		return $this->is_minimum_amount_met($amount) && $this->is_maximum_amount_met($amount);
 	}
 
 	/**
@@ -640,10 +640,10 @@ 
 	 * @since 1.0.15
 	 * @return boolean
 	 */
-	public function is_minimum_amount_met( $amount ) {
-		$amount = floatval( $amount );
-		$min_met= ! ( $this->min_total > 0 && $amount < $this->min_total );
-		return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->ID, $this, $this->code, $amount );
+	public function is_minimum_amount_met($amount) {
+		$amount = floatval($amount);
+		$min_met = !($this->min_total > 0 && $amount < $this->min_total);
+		return apply_filters('wpinv_is_discount_min_met', $min_met, $this->ID, $this, $this->code, $amount);
 	}
 
 	/**
@@ -653,10 +653,10 @@ 
 	 * @since 1.0.15
 	 * @return boolean
 	 */
-	public function is_maximum_amount_met( $amount ) {
-		$amount = floatval( $amount );
-		$max_met= ! ( $this->max_total > 0 && $amount > $this->max_total );
-		return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->ID, $this, $this->code, $amount );
+	public function is_maximum_amount_met($amount) {
+		$amount = floatval($amount);
+		$max_met = !($this->max_total > 0 && $amount > $this->max_total);
+		return apply_filters('wpinv_is_discount_max_met', $max_met, $this->ID, $this, $this->code, $amount);
 	}
 
 	/**
@@ -666,50 +666,50 @@ 
 	 * @since 1.0.15
 	 * @return boolean
 	 */
-	public function is_valid_for_user( $user ) {
+	public function is_valid_for_user($user) {
 		global $wpi_checkout_id;
 
-		if( empty( $user ) || empty( $this->is_single_use ) ) {
+		if (empty($user) || empty($this->is_single_use)) {
 			return true;
 		}
 
 		$user_id = 0;
-        if ( is_int( $user ) ) {
-            $user_id = absint( $user );
-        } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
+        if (is_int($user)) {
+            $user_id = absint($user);
+        } else if (is_email($user) && $user_data = get_user_by('email', $user)) {
             $user_id = $user_data->ID;
-        } else if ( $user_data = get_user_by( 'login', $user ) ) {
+        } else if ($user_data = get_user_by('login', $user)) {
             $user_id = $user_data->ID;
-        } else if ( absint( $user ) > 0 ) {
-            $user_id = absint( $user );
+        } else if (absint($user) > 0) {
+            $user_id = absint($user);
 		}
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return true;
 		}
 		
 		// Get all payments with matching user id
-        $payments = wpinv_get_invoices( array( 'user' => $user_id, 'limit' => false ) ); 
-		$code     = strtolower( $this->code );
+        $payments = wpinv_get_invoices(array('user' => $user_id, 'limit' => false)); 
+		$code = strtolower($this->code);
 
-		foreach ( $payments as $payment ) {
+		foreach ($payments as $payment) {
 
 			// Don't count discount used for current invoice checkout.
-			if ( ! empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
+			if (!empty($wpi_checkout_id) && $wpi_checkout_id == $payment->ID) {
 				continue;
 			}
 			
-			if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
+			if ($payment->has_status(array('wpi-cancelled', 'wpi-failed'))) {
 				continue;
 			}
 
-			$discounts = $payment->get_discounts( true );
-			if ( empty( $discounts ) ) {
+			$discounts = $payment->get_discounts(true);
+			if (empty($discounts)) {
 				continue;
 			}
 
-			$discounts = array_map( 'strtolower', wpinv_parse_list( $discounts ) );
-			if ( ! empty( $discounts ) && in_array( $code, $discounts ) ) {
+			$discounts = array_map('strtolower', wpinv_parse_list($discounts));
+			if (!empty($discounts) && in_array($code, $discounts)) {
 				return false;
 			}
 		}
@@ -725,15 +725,15 @@ 
 	 */
 	public function remove() {
 
-		if ( empty( $this->ID ) ) {
+		if (empty($this->ID)) {
 			return true;
 		}
 
-		do_action( 'wpinv_pre_delete_discount', $this->ID, $this->data );
-		wp_cache_delete( $this->ID, 'WPInv_Discounts' );
-    	wp_delete_post( $this->ID, true );
-		wp_cache_delete( $this->code, 'WPInv_Discount_Codes' );
-    	do_action( 'wpinv_post_delete_discount', $this->ID, $this->data );
+		do_action('wpinv_pre_delete_discount', $this->ID, $this->data);
+		wp_cache_delete($this->ID, 'WPInv_Discounts');
+    	wp_delete_post($this->ID, true);
+		wp_cache_delete($this->code, 'WPInv_Discount_Codes');
+    	do_action('wpinv_post_delete_discount', $this->ID, $this->data);
 
 		$this->ID = null;
 		$this->data['id'] = null;
@@ -747,21 +747,21 @@ 
 	 * @param int $by The number of usages to increas by.
 	 * @return int
 	 */
-	public function increase_usage( $by = 1 ) {
+	public function increase_usage($by = 1) {
 
 		$this->uses = $this->uses + $by;
 
-		if( $this->uses  < 0 ) {
+		if ($this->uses < 0) {
 			$this->uses = 0;
-			update_post_meta( $this->ID, "_wpi_discount_uses", 0 );
+			update_post_meta($this->ID, "_wpi_discount_uses", 0);
 		}
 
 		$this->save();
 
-		if( $by > 0 ) {
-			do_action( 'wpinv_discount_increase_use_count', $this->uses, $this->ID, $this->code, $by );
+		if ($by > 0) {
+			do_action('wpinv_discount_increase_use_count', $this->uses, $this->ID, $this->code, $by);
 		} else {
-			do_action( 'wpinv_discount_decrease_use_count', $this->uses, $this->ID, $this->code, absint( $by ) );
+			do_action('wpinv_discount_decrease_use_count', $this->uses, $this->ID, $this->code, absint($by));
 		}
 		
 		return $this->uses;
@@ -775,8 +775,8 @@ 
 	 */
 	public function get_data() {
 		$return = array();
-		foreach( array_keys( $this->data ) as $key ) {
-			$return[ $key ] = $this->get( $key );
+		foreach (array_keys($this->data) as $key) {
+			$return[$key] = $this->get($key);
 		}
 		return $return;
 	}
@@ -788,7 +788,7 @@ 
 	 * @return string|false
 	 */
 	public function get_data_as_json() {
-		return wp_json_encode( $this->get_data() );
+		return wp_json_encode($this->get_data());
 	}
 
 	/**
@@ -798,7 +798,7 @@ 
 	 * @return bool
 	 */
 	public function get_is_single_use() {
-		return (bool) apply_filters( 'wpinv_is_discount_single_use', $this->data['is_single_use'], $this->ID, $this, $this->code );
+		return (bool) apply_filters('wpinv_is_discount_single_use', $this->data['is_single_use'], $this->ID, $this, $this->code);
 	}
 
 	/**
@@ -808,7 +808,7 @@ 
 	 * @return bool
 	 */
 	public function get_is_recurring() {
-		return (bool) apply_filters( 'wpinv_is_discount_recurring', $this->data['is_recurring'], $this->ID, $this->code, $this );
+		return (bool) apply_filters('wpinv_is_discount_recurring', $this->data['is_recurring'], $this->ID, $this->code, $this);
 	}
 
 	/**
@@ -818,7 +818,7 @@ 
 	 * @return array
 	 */
 	public function get_items() {
-		return wpinv_parse_list( apply_filters( 'wpinv_get_discount_item_reqs', $this->data['items'], $this->ID, $this, $this->code ) );
+		return wpinv_parse_list(apply_filters('wpinv_get_discount_item_reqs', $this->data['items'], $this->ID, $this, $this->code));
 	}
 
 	/**
@@ -827,19 +827,19 @@ 
 	 * @since 1.0.15
 	 * @return float
 	 */
-	public function get_discounted_amount( $amount ) {
+	public function get_discounted_amount($amount) {
 
-		if ( $this->type == 'flat' ) {
+		if ($this->type == 'flat') {
             $amount = $amount - $this->amount;
 		} else {
-            $amount = $amount - ( $amount * ( $this->amount / 100 ) );
+            $amount = $amount - ($amount * ($this->amount / 100));
 		}
 
-		if ( $amount < 0 ) {
+		if ($amount < 0) {
 			$amount = 0;
 		}
 
-		return apply_filters( 'wpinv_discounted_amount', $amount, $this->ID, $this, $this->code, $this->amount );
+		return apply_filters('wpinv_discounted_amount', $amount, $this->ID, $this, $this->code, $this->amount);
 	}
 	
 }

Braces +6 added lines, -4 removed lines

@@ -132,11 +132,13 @@
 		if ( 'id' == strtolower( $field ) ) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
-				return false;
+			if ( ! is_numeric( $value ) ) {
+							return false;
+			}
 			$value = intval( $value );
-			if ( $value < 1 )
-				return false;
+			if ( $value < 1 ) {
+							return false;
+			}
 		}
 
 		if ( ! $value || ! is_string( $field ) ) {

includes/wpinv-helper-functions.php

Indentation +13 added lines, -13 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,11 +1038,11 @@ 
  * @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;
 }
 
 /**
@@ -1062,9 +1062,9 @@ 
     }
 
     $data = apply_filters( "wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php" );
-	wp_cache_set( "wpinv-$key", $data, 'wpinv' );
+    wp_cache_set( "wpinv-$key", $data, 'wpinv' );
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -1093,17 +1093,17 @@ 
  */
 function wpinv_clean( $var ) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+    if ( is_array( $var ) ) {
+        return array_map( 'wpinv_clean', $var );
     }
 
     if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+        $object_vars = get_object_vars( $var );
+        foreach ( $object_vars as $property_name => $property_value ) {
+            $var->$property_name = wpinv_clean( $property_value );
         }
         return $var;
-	}
+    }
     
     return is_string( $var ) ? sanitize_text_field( $var ) : $var;
 }
\ No newline at end of file

Spacing +408 added lines, -408 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;
@@ -1053,16 +1053,16 @@ 
  * @param string $key Type of data to fetch.
  * @return mixed Fetched data.
  */
-function wpinv_get_data( $key ) {
+function wpinv_get_data($key) {
     
     // Try fetching it from the cache.
-    $data = wp_cache_get( "wpinv-$key", 'wpinv' );
-    if( $data ) {
+    $data = wp_cache_get("wpinv-$key", 'wpinv');
+    if ($data) {
         return $data;
     }
 
-    $data = apply_filters( "wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php" );
-	wp_cache_set( "wpinv-$key", $data, 'wpinv' );
+    $data = apply_filters("wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php");
+	wp_cache_set("wpinv-$key", $data, 'wpinv');
 
 	return $data;
 }
@@ -1076,10 +1076,10 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return mixed Fetched data.
  */
-function wpinv_maybe_add_empty_option( $options, $first_empty ) {
+function wpinv_maybe_add_empty_option($options, $first_empty) {
 
-    if ( ! empty( $options ) && $first_empty ) {
-        return array_merge( array( '' => '' ), $options );
+    if (!empty($options) && $first_empty) {
+        return array_merge(array('' => ''), $options);
     }
     return $options;
 
@@ -1091,19 +1091,19 @@ 
  * @param mixed $var Data to sanitize.
  * @return string|array
  */
-function wpinv_clean( $var ) {
+function wpinv_clean($var) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+	if (is_array($var)) {
+		return array_map('wpinv_clean', $var);
     }
 
-    if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+    if (is_object($var)) {
+		$object_vars = get_object_vars($var);
+		foreach ($object_vars as $property_name => $property_value) {
+			$var->$property_name = wpinv_clean($property_value);
         }
         return $var;
 	}
     
-    return is_string( $var ) ? sanitize_text_field( $var ) : $var;
+    return is_string($var) ? sanitize_text_field($var) : $var;
 }
\ No newline at end of file

vendor/composer/autoload_static.php

Spacing +7 added lines, -7 removed lines

@@ -6,32 +6,32 @@
 
 class ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5
 {
-    public static $files = array (
+    public static $files = array(
         '24583d3588ebda5228dd453cfaa070da' => __DIR__ . '/..' . '/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php',
     );
 
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'C' => 
-        array (
+        array(
             'Composer\\Installers\\' => 20,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'Composer\\Installers\\' => 
-        array (
+        array(
             0 => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers',
         ),
     );
 
-    public static $classMap = array (
+    public static $classMap = array(
         'AyeCode_Connect_Helper' => __DIR__ . '/..' . '/ayecode/ayecode-connect-helper/ayecode-connect-helper.php',
         'WP_Super_Duper' => __DIR__ . '/..' . '/ayecode/wp-super-duper/wp-super-duper.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$classMap;

invoicing.php

Spacing +7 added lines, -7 removed lines

@@ -12,19 +12,19 @@
 */
 
 // 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__));
 }
 
-if ( !defined( 'WPINV_VERSION' ) ) {
-    define( 'WPINV_VERSION', '1.0.15' );
+if (!defined('WPINV_VERSION')) {
+    define('WPINV_VERSION', '1.0.15');
 }
 
-if ( !defined( 'WPINV_PLUGIN_FILE' ) ) {
-    define( 'WPINV_PLUGIN_FILE', __FILE__ );
+if (!defined('WPINV_PLUGIN_FILE')) {
+    define('WPINV_PLUGIN_FILE', __FILE__);
 }
 
-require plugin_dir_path( __FILE__ ) . 'includes/class-wpinv.php';
+require plugin_dir_path(__FILE__) . 'includes/class-wpinv.php';
 
 function wpinv_run() {
     global $invoicing;

vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php

Indentation +310 added lines, -310 removed lines

@@ -1,271 +1,271 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
-	/**
-	 * Allow the quick setup and connection of our AyeCode Connect plugin.
-	 *
-	 * Class AyeCode_Connect_Helper
-	 */
-	class AyeCode_Connect_Helper {
-
-		// Hold the version number
-		var $version = "1.0.3";
-
-		// Hold the default strings.
-		var $strings = array();
-
-		// Hold the default pages.
-		var $pages = array();
-
-		/**
-		 * The constructor.
-		 *
-		 * AyeCode_Connect_Helper constructor.
-		 *
-		 * @param array $strings
-		 * @param array $pages
-		 */
-		public function __construct( $strings = array(), $pages = array() ) {
-
-			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
-
-
-				// set default strings
-				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!" ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?" ),
-					'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s" ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site" ),
-					'connecting_button' => __( "Connecting..." ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost." ),
-					'error'             => __( "Something went wrong, please refresh and try again." ),
-				);
-				$this->strings   = array_merge( $default_strings, $strings );
-
-
-				// set default pages
-				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
-
-				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
-
-				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
-				}
-			}
-
-			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
-			}
-
-		}
-
-		/**
-		 * Give a way to check we can connect via a external redirect.
-		 */
-		public function ayecode_connect_helper_installed(){
-			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
-			);
-			wp_send_json_success( $active );
-			wp_die();
-		}
-
-		/**
-		 * Get slug from path
-		 *
-		 * @param  string $key
-		 *
-		 * @return string
-		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
-
-			return $slug[0];
-		}
-
-		/**
-		 * Install and activate the AyeCode Connect Plugin
-		 */
-		public function ayecode_connect_install() {
-
-			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-
-			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
-
-			$success     = true;
-			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-
-				WP_Filesystem();
-
-				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
-				$plugin_slug       = $plugin_slug;
-				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
-				$installed         = false;
-				$activate          = false;
-
-				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
-					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
-				}
-
-				// Install this thing!
-				if ( ! $installed ) {
-
-					// Suppress feedback
-					ob_start();
-
-					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
-							'slug'   => $plugin_slug,
-							'fields' => array(
-								'short_description' => false,
-								'sections'          => false,
-								'requires'          => false,
-								'rating'            => false,
-								'ratings'           => false,
-								'downloaded'        => false,
-								'last_updated'      => false,
-								'added'             => false,
-								'tags'              => false,
-								'homepage'          => false,
-								'donate_link'       => false,
-								'author_profile'    => false,
-								'author'            => false,
-							),
-						) );
-
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
-						}
-
-						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
-
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
-						}
-
-						$working_dir = $upgrader->unpack_package( $download, true );
-
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
-						}
-
-						$result = $upgrader->install_package( array(
-							'source'                      => $working_dir,
-							'destination'                 => WP_PLUGIN_DIR,
-							'clear_destination'           => false,
-							'abort_if_destination_exists' => false,
-							'clear_working'               => true,
-							'hook_extra'                  => array(
-								'type'   => 'plugin',
-								'action' => 'install',
-							),
-						) );
-
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
-						}
-
-						$activate = true;
-
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-
-					// Discard feedback
-					ob_end_clean();
-				}
-
-				wp_clean_plugins_cache();
-
-				// Activate this thing
-				if ( $activate ) {
-					try {
-						$result = activate_plugin( $plugin );
-
-						if ( is_wp_error( $result ) ) {
-							$success = false;
-						} else {
-							$success = true;
-						}
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-				}
-			}
-
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
-				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
-			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-			wp_die();
-		}
-
-		/**
-		 * Check if maybe localhost.
-		 *
-		 * @return bool
-		 */
-		public function is_localhost() {
-			$localhost = false;
-
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
-			$localhost_domains = array(
-				'localhost',
-				'localhost.localdomain',
-				'127.0.0.1',
-				'::1'
-			);
-
-			if ( in_array( $host, $localhost_domains ) ) {
-				$localhost = true;
-			}
-
-			return $localhost;
-		}
-
-		/**
-		 * Show notice to connect site.
-		 */
-		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
-				$connect_title_string     = $this->strings['connect_title'];
-				$connect_external_string  = $this->strings['connect_external'];
-				$connect_string           = $this->strings['connect'];
-				$connect_button_string    = $this->strings['connect_button'];
-				$connecting_button_string = $this->strings['connecting_button'];
-				?>
+    /**
+     * Allow the quick setup and connection of our AyeCode Connect plugin.
+     *
+     * Class AyeCode_Connect_Helper
+     */
+    class AyeCode_Connect_Helper {
+
+        // Hold the version number
+        var $version = "1.0.3";
+
+        // Hold the default strings.
+        var $strings = array();
+
+        // Hold the default pages.
+        var $pages = array();
+
+        /**
+         * The constructor.
+         *
+         * AyeCode_Connect_Helper constructor.
+         *
+         * @param array $strings
+         * @param array $pages
+         */
+        public function __construct( $strings = array(), $pages = array() ) {
+
+            // Only fire if not localhost and the current user has the right permissions.
+            if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+
+
+                // set default strings
+                $default_strings = array(
+                    'connect_title'     => __( "Thanks for choosing an AyeCode Product!" ),
+                    'connect_external'  => __( "Please confirm you wish to connect your site?" ),
+                    'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s" ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
+                    'connect_button'    => __( "Connect Site" ),
+                    'connecting_button' => __( "Connecting..." ),
+                    'error_localhost'   => __( "This service will only work with a live domain, not a localhost." ),
+                    'error'             => __( "Something went wrong, please refresh and try again." ),
+                );
+                $this->strings   = array_merge( $default_strings, $strings );
+
+
+                // set default pages
+                $default_pages = array();
+                $this->pages   = array_merge( $default_pages, $pages );
+
+                // maybe show connect site notice
+                add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+
+                // add ajax action if not already added
+                if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
+                    add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+                }
+            }
+
+            // add ajax action if not already added
+            if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
+                add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+            }
+
+        }
+
+        /**
+         * Give a way to check we can connect via a external redirect.
+         */
+        public function ayecode_connect_helper_installed(){
+            $active = array(
+                'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
+                'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
+                'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+            );
+            wp_send_json_success( $active );
+            wp_die();
+        }
+
+        /**
+         * Get slug from path
+         *
+         * @param  string $key
+         *
+         * @return string
+         */
+        private function format_plugin_slug( $key ) {
+            $slug = explode( '/', $key );
+            $slug = explode( '.', end( $slug ) );
+
+            return $slug[0];
+        }
+
+        /**
+         * Install and activate the AyeCode Connect Plugin
+         */
+        public function ayecode_connect_install() {
+
+            // bail if localhost
+            if ( $this->is_localhost() ) {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+
+            // Explicitly clear the event.
+            wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+
+            $success     = true;
+            $plugin_slug = "ayecode-connect";
+            if ( ! empty( $plugin_slug ) ) {
+                require_once( ABSPATH . 'wp-admin/includes/file.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+                require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+                WP_Filesystem();
+
+                $skin              = new Automatic_Upgrader_Skin;
+                $upgrader          = new WP_Upgrader( $skin );
+                $installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+                $plugin_slug       = $plugin_slug;
+                $plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
+                $installed         = false;
+                $activate          = false;
+
+                // See if the plugin is installed already
+                if ( in_array( $plugin_slug, $installed_plugins ) ) {
+                    $installed = true;
+                    $activate  = ! is_plugin_active( $plugin );
+                }
+
+                // Install this thing!
+                if ( ! $installed ) {
+
+                    // Suppress feedback
+                    ob_start();
+
+                    try {
+                        $plugin_information = plugins_api( 'plugin_information', array(
+                            'slug'   => $plugin_slug,
+                            'fields' => array(
+                                'short_description' => false,
+                                'sections'          => false,
+                                'requires'          => false,
+                                'rating'            => false,
+                                'ratings'           => false,
+                                'downloaded'        => false,
+                                'last_updated'      => false,
+                                'added'             => false,
+                                'tags'              => false,
+                                'homepage'          => false,
+                                'donate_link'       => false,
+                                'author_profile'    => false,
+                                'author'            => false,
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $plugin_information ) ) {
+                            throw new Exception( $plugin_information->get_error_message() );
+                        }
+
+                        $package  = $plugin_information->download_link;
+                        $download = $upgrader->download_package( $package );
+
+                        if ( is_wp_error( $download ) ) {
+                            throw new Exception( $download->get_error_message() );
+                        }
+
+                        $working_dir = $upgrader->unpack_package( $download, true );
+
+                        if ( is_wp_error( $working_dir ) ) {
+                            throw new Exception( $working_dir->get_error_message() );
+                        }
+
+                        $result = $upgrader->install_package( array(
+                            'source'                      => $working_dir,
+                            'destination'                 => WP_PLUGIN_DIR,
+                            'clear_destination'           => false,
+                            'abort_if_destination_exists' => false,
+                            'clear_working'               => true,
+                            'hook_extra'                  => array(
+                                'type'   => 'plugin',
+                                'action' => 'install',
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $result ) ) {
+                            throw new Exception( $result->get_error_message() );
+                        }
+
+                        $activate = true;
+
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+
+                    // Discard feedback
+                    ob_end_clean();
+                }
+
+                wp_clean_plugins_cache();
+
+                // Activate this thing
+                if ( $activate ) {
+                    try {
+                        $result = activate_plugin( $plugin );
+
+                        if ( is_wp_error( $result ) ) {
+                            $success = false;
+                        } else {
+                            $success = true;
+                        }
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+                }
+            }
+
+            if ( $success && function_exists( 'ayecode_connect_args' ) ) {
+                ayecode_connect();// init
+                $args        = ayecode_connect_args();
+                $client      = new AyeCode_Connect( $args );
+                $redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
+                $redirect    = $client->build_connect_url( $redirect_to );
+                wp_send_json_success( array( 'connect_url' => $redirect ) );
+            } else {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+            wp_die();
+        }
+
+        /**
+         * Check if maybe localhost.
+         *
+         * @return bool
+         */
+        public function is_localhost() {
+            $localhost = false;
+
+            $host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+            $localhost_domains = array(
+                'localhost',
+                'localhost.localdomain',
+                '127.0.0.1',
+                '::1'
+            );
+
+            if ( in_array( $host, $localhost_domains ) ) {
+                $localhost = true;
+            }
+
+            return $localhost;
+        }
+
+        /**
+         * Show notice to connect site.
+         */
+        public function ayecode_connect_install_notice() {
+            if ( $this->maybe_show() ) {
+                $connect_title_string     = $this->strings['connect_title'];
+                $connect_external_string  = $this->strings['connect_external'];
+                $connect_string           = $this->strings['connect'];
+                $connect_button_string    = $this->strings['connect_button'];
+                $connecting_button_string = $this->strings['connecting_button'];
+                ?>
 				<div class="notice notice-info acch-notice">
 					<span class="acch-float-left">
 						<svg width="61px" height="61px" viewBox="0 0 61 61" version="1.1"
@@ -304,8 +304,8 @@ 
 						<h3 class="acch-title"><?php echo esc_attr( $connect_title_string ); ?></h3>
 					<p>
 						<?php
-						echo $connect_string;
-						?>
+                        echo $connect_string;
+                        ?>
 					</p>
 					</span>
 
@@ -318,9 +318,9 @@ 
 				</div>
 
 				<?php
-				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-					?>
+                // only include the popup HTML if needed.
+                if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                    ?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
 					<span class="acch-float-left">
@@ -369,23 +369,23 @@ 
 						</div>
 					</div>
 					<?php
-				}
-
-				// add required scripts
-				$this->script();
-			}
-		}
-
-		/**
-		 * Get the JS Script.
-		 */
-		public function script() {
-
-			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-				add_thickbox();
-			}
-			?>
+                }
+
+                // add required scripts
+                $this->script();
+            }
+        }
+
+        /**
+         * Get the JS Script.
+         */
+        public function script() {
+
+            // add thickbox if external request is requested
+            if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                add_thickbox();
+            }
+            ?>
 			<style>
 				.acch-title {
 					margin: 0;
@@ -454,43 +454,43 @@ 
 
 
 				<?php
-				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
-				?>
+                // add thickbox if external request is requested
+                if(! empty( $_REQUEST['external-connect-request'] )) {
+                ?>
 				jQuery(function () {
 					setTimeout(function () {
 						tb_show("AyeCode Connect", "?TB_inline?width=300&height=80&inlineId=ayecode-connect-helper-external-confirm");
 					}, 200);
 				});
 				<?php
-				}
-				?>
+                }
+                ?>
 
 			</script>
 			<?php
-		}
-
-		/**
-		 * Decide what pages to show on.
-		 *
-		 * @return bool
-		 */
-		public function maybe_show() {
-			$show = false;
-
-			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
-
-				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
-					$show = true;
-				}
+        }
+
+        /**
+         * Decide what pages to show on.
+         *
+         * @return bool
+         */
+        public function maybe_show() {
+            $show = false;
+
+            // check if on a page set to show
+            if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+
+                // check if not active and connected
+                if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+                    $show = true;
+                }
 
-			}
+            }
 
-			return $show;
-		}
+            return $show;
+        }
 
-	}
+    }
 
 }

Spacing +78 added lines, -78 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
+if (!class_exists("AyeCode_Connect_Helper")) {
 	/**
 	 * Allow the quick setup and connection of our AyeCode Connect plugin.
 	 *
@@ -29,41 +29,41 @@ 
 		 * @param array $strings
 		 * @param array $pages
 		 */
-		public function __construct( $strings = array(), $pages = array() ) {
+		public function __construct($strings = array(), $pages = array()) {
 
 			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+			if (!$this->is_localhost() && current_user_can('manage_options')) {
 
 
 				// set default strings
 				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!" ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?" ),
-					'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s" ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site" ),
-					'connecting_button' => __( "Connecting..." ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost." ),
-					'error'             => __( "Something went wrong, please refresh and try again." ),
+					'connect_title'     => __("Thanks for choosing an AyeCode Product!"),
+					'connect_external'  => __("Please confirm you wish to connect your site?"),
+					'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+					'connect_button'    => __("Connect Site"),
+					'connecting_button' => __("Connecting..."),
+					'error_localhost'   => __("This service will only work with a live domain, not a localhost."),
+					'error'             => __("Something went wrong, please refresh and try again."),
 				);
-				$this->strings   = array_merge( $default_strings, $strings );
+				$this->strings = array_merge($default_strings, $strings);
 
 
 				// set default pages
 				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
+				$this->pages   = array_merge($default_pages, $pages);
 
 				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+				add_action('admin_notices', array($this, 'ayecode_connect_install_notice'));
 
 				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+				if (!has_action('wp_ajax_ayecode_connect_helper')) {
+					add_action('wp_ajax_ayecode_connect_helper', array($this, 'ayecode_connect_install'));
 				}
 			}
 
 			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+			if (!has_action('wp_ajax_nopriv_ayecode_connect_helper_installed')) {
+				add_action('wp_ajax_nopriv_ayecode_connect_helper_installed', array($this, 'ayecode_connect_helper_installed'));
 			}
 
 		}
@@ -71,13 +71,13 @@ 
 		/**
 		 * Give a way to check we can connect via a external redirect.
 		 */
-		public function ayecode_connect_helper_installed(){
+		public function ayecode_connect_helper_installed() {
 			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION, '2.0.0.79', '>') ? 1 : 0,
+				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION, '1.2.1.5', '>') ? 1 : 0,
+				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION, '1.0.14', '>') ? 1 : 0,
 			);
-			wp_send_json_success( $active );
+			wp_send_json_success($active);
 			wp_die();
 		}
 
@@ -88,9 +88,9 @@ 
 		 *
 		 * @return string
 		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
+		private function format_plugin_slug($key) {
+			$slug = explode('/', $key);
+			$slug = explode('.', end($slug));
 
 			return $slug[0];
 		}
@@ -101,45 +101,45 @@ 
 		public function ayecode_connect_install() {
 
 			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
+			if ($this->is_localhost()) {
+				wp_send_json_error($this->strings['error_localhost']);
 			}
 
 			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+			wp_clear_scheduled_hook('geodir_plugin_background_installer', func_get_args());
 
 			$success     = true;
 			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+			if (!empty($plugin_slug)) {
+				require_once(ABSPATH . 'wp-admin/includes/file.php');
+				require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');
+				require_once(ABSPATH . 'wp-admin/includes/class-wp-upgrader.php');
+				require_once(ABSPATH . 'wp-admin/includes/plugin.php');
 
 				WP_Filesystem();
 
 				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+				$upgrader          = new WP_Upgrader($skin);
+				$installed_plugins = array_map(array($this, 'format_plugin_slug'), array_keys(get_plugins()));
 				$plugin_slug       = $plugin_slug;
 				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
 				$installed         = false;
 				$activate          = false;
 
 				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
+				if (in_array($plugin_slug, $installed_plugins)) {
 					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
+					$activate  = !is_plugin_active($plugin);
 				}
 
 				// Install this thing!
-				if ( ! $installed ) {
+				if (!$installed) {
 
 					// Suppress feedback
 					ob_start();
 
 					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
+						$plugin_information = plugins_api('plugin_information', array(
 							'slug'   => $plugin_slug,
 							'fields' => array(
 								'short_description' => false,
@@ -156,26 +156,26 @@ 
 								'author_profile'    => false,
 								'author'            => false,
 							),
-						) );
+						));
 
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
+						if (is_wp_error($plugin_information)) {
+							throw new Exception($plugin_information->get_error_message());
 						}
 
 						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
+						$download = $upgrader->download_package($package);
 
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
+						if (is_wp_error($download)) {
+							throw new Exception($download->get_error_message());
 						}
 
-						$working_dir = $upgrader->unpack_package( $download, true );
+						$working_dir = $upgrader->unpack_package($download, true);
 
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
+						if (is_wp_error($working_dir)) {
+							throw new Exception($working_dir->get_error_message());
 						}
 
-						$result = $upgrader->install_package( array(
+						$result = $upgrader->install_package(array(
 							'source'                      => $working_dir,
 							'destination'                 => WP_PLUGIN_DIR,
 							'clear_destination'           => false,
@@ -185,15 +185,15 @@ 
 								'type'   => 'plugin',
 								'action' => 'install',
 							),
-						) );
+						));
 
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
+						if (is_wp_error($result)) {
+							throw new Exception($result->get_error_message());
 						}
 
 						$activate = true;
 
-					} catch ( Exception $e ) {
+					} catch (Exception $e) {
 						$success = false;
 					}
 
@@ -204,30 +204,30 @@ 
 				wp_clean_plugins_cache();
 
 				// Activate this thing
-				if ( $activate ) {
+				if ($activate) {
 					try {
-						$result = activate_plugin( $plugin );
+						$result = activate_plugin($plugin);
 
-						if ( is_wp_error( $result ) ) {
+						if (is_wp_error($result)) {
 							$success = false;
 						} else {
 							$success = true;
 						}
-					} catch ( Exception $e ) {
+					} catch (Exception $e) {
 						$success = false;
 					}
 				}
 			}
 
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
+			if ($success && function_exists('ayecode_connect_args')) {
+				ayecode_connect(); // init
 				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
+				$client      = new AyeCode_Connect($args);
+				$redirect_to = !empty($_POST['redirect_to']) ? esc_url_raw($_POST['redirect_to']) : '';
+				$redirect    = $client->build_connect_url($redirect_to);
+				wp_send_json_success(array('connect_url' => $redirect));
 			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
+				wp_send_json_error($this->strings['error_localhost']);
 			}
 			wp_die();
 		}
@@ -240,7 +240,7 @@ 
 		public function is_localhost() {
 			$localhost = false;
 
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+			$host              = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
 			$localhost_domains = array(
 				'localhost',
 				'localhost.localdomain',
@@ -248,7 +248,7 @@ 
 				'::1'
 			);
 
-			if ( in_array( $host, $localhost_domains ) ) {
+			if (in_array($host, $localhost_domains)) {
 				$localhost = true;
 			}
 
@@ -259,7 +259,7 @@ 
 		 * Show notice to connect site.
 		 */
 		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
+			if ($this->maybe_show()) {
 				$connect_title_string     = $this->strings['connect_title'];
 				$connect_external_string  = $this->strings['connect_external'];
 				$connect_string           = $this->strings['connect'];
@@ -301,7 +301,7 @@ 
 					</svg>
 					</span>
 					<span class="acch-float-left acch-text">
-						<h3 class="acch-title"><?php echo esc_attr( $connect_title_string ); ?></h3>
+						<h3 class="acch-title"><?php echo esc_attr($connect_title_string); ?></h3>
 					<p>
 						<?php
 						echo $connect_string;
@@ -312,14 +312,14 @@ 
 					<span class="acch-float-left acch-button">
 						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site"
 						        class="button button-primary"
-						        data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						        data-connecting="<?php echo esc_attr($connecting_button_string); ?>"><?php echo esc_attr($connect_button_string) ?></button>
 					</span>
 
 				</div>
 
 				<?php
 				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+				if (!empty($_REQUEST['external-connect-request'])) {
 					?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
@@ -357,13 +357,13 @@ 
 					</svg>
 					</span>
 					<span class="acch-float-left acch-text">
-						<h3 class="acch-title"><?php echo esc_attr( $connect_external_string ); ?></h3>
+						<h3 class="acch-title"><?php echo esc_attr($connect_external_string); ?></h3>
 					</span>
 
 					<span class="acch-float-left acch-button">
 						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site"
 						        class="button button-primary"
-						        data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						        data-connecting="<?php echo esc_attr($connecting_button_string); ?>"><?php echo esc_attr($connect_button_string) ?></button>
 					</span>
 
 						</div>
@@ -382,7 +382,7 @@ 
 		public function script() {
 
 			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+			if (!empty($_REQUEST['external-connect-request'])) {
 				add_thickbox();
 			}
 			?>
@@ -434,7 +434,7 @@ 
 						url: ajaxurl,
 						data: {
 							action: 'ayecode_connect_helper',
-							security: '<?php echo wp_create_nonce( 'ayecode-connect-helper' );?>',
+							security: '<?php echo wp_create_nonce('ayecode-connect-helper'); ?>',
 							redirect_to: $current_url
 						},
 						beforeSend: function () {
@@ -455,7 +455,7 @@ 
 
 				<?php
 				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
+				if (!empty($_REQUEST['external-connect-request'])) {
 				?>
 				jQuery(function () {
 					setTimeout(function () {
@@ -479,10 +479,10 @@ 
 			$show = false;
 
 			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+			if (isset($_REQUEST['page']) && in_array($_REQUEST['page'], $this->pages)) {
 
 				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+				if (!defined('AYECODE_CONNECT_VERSION') || !get_option('ayecode_connect_blog_token')) {
 					$show = true;
 				}