AyeCode / invoicing

widgets/checkout.php

Indentation +10 added lines, -10 removed lines

@@ -46,18 +46,18 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    return wpinv_checkout_form();
+        return wpinv_checkout_form();
 
     }
 

widgets/subscriptions.php

Indentation +15 added lines, -15 removed lines

@@ -46,25 +46,25 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    do_action( 'wpinv_before_user_subscriptions' );
-	    wpinv_get_template_part( 'wpinv-subscriptions-history' );
-	    do_action( 'wpinv_after_user_subscriptions' );
+        do_action( 'wpinv_before_user_subscriptions' );
+        wpinv_get_template_part( 'wpinv-subscriptions-history' );
+        do_action( 'wpinv_after_user_subscriptions' );
 
-	    $output = ob_get_clean();
-	    return trim($output);
+        $output = ob_get_clean();
+        return trim($output);
 
     }
 

widgets/invoice-receipt.php

Indentation +15 added lines, -15 removed lines

@@ -44,25 +44,25 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    do_action( 'wpinv_success_content_before' );
-	    echo wpinv_payment_receipt( $args );
-	    do_action( 'wpinv_success_content_after' );
+        do_action( 'wpinv_success_content_before' );
+        echo wpinv_payment_receipt( $args );
+        do_action( 'wpinv_success_content_after' );
 
-	    $output = ob_get_clean();
-	    return trim($output);
+        $output = ob_get_clean();
+        return trim($output);
 
     }
 

includes/class-wpinv.php

Indentation +18 added lines, -18 removed lines

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

includes/admin/register-settings.php

Indentation +328 added lines, -328 removed lines

@@ -984,326 +984,326 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if( $default_label !== NULL && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+    if ( !empty( $args['desc'] ) ) {
         echo $args['desc'];
     }
 }
 
 function wpinv_hidden_callback( $args ) {
-	global $wpinv_options;
-
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    global $wpinv_options;
+
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    } elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
     
-	echo $html;
+    echo $html;
 }
 
 function wpinv_checkbox_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$name = '';
-	} else {
-		$name = 'name="wpinv_settings[' . $sanitize_id . ']"';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $name = '';
+    } else {
+        $name = 'name="wpinv_settings[' . $sanitize_id . ']"';
+    }
 
-	$checked = isset( $wpinv_options[ $args['id'] ] ) ? checked( 1, $wpinv_options[ $args['id'] ], false ) : '';
-	$html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $checked = isset( $wpinv_options[ $args['id'] ] ) ? checked( 1, $wpinv_options[ $args['id'] ], false ) : '';
+    $html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_multicheck_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
+    if ( ! empty( $args['options'] ) ) {
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
         foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
-				$enabled = $sanitize_key;
-			} else { 
-				$enabled = NULL; 
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . $args['desc'] . '</p>';
-	}
+            $sanitize_key = wpinv_sanitize_key( $key );
+            if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
+                $enabled = $sanitize_key;
+            } else { 
+                $enabled = NULL; 
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . $args['desc'] . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = NULL;
-			}
-
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
-
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-						$content_dir = WP_CONTENT_DIR;
-
-						if ( function_exists( 'wp_normalize_path' ) ) {
-							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
-						}
-
-						$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo $option . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if( isset( $wpinv_options[$args['id']][$key] ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = NULL;
+            }
+
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                    echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                    $card = strtolower( str_replace( ' ', '', $option ) );
+
+                    if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                        $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                        $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                        $content_dir = WP_CONTENT_DIR;
+
+                        if ( function_exists( 'wp_normalize_path' ) ) {
+                            // Replaces backslashes with forward slashes for Windows systems
+                            $image = wp_normalize_path( $image );
+                            $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                        $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                    echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo $option . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 function wpinv_radio_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     
     foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         $checked = false;
 
-		if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
-			$checked = true;
-		elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
-			$checked = true;
+        if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
+            $checked = true;
+        elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
+            $checked = true;
 
-		echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
+    endforeach;
 
-	echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+    echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
 }
 
 function wpinv_gateways_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+    foreach ( $args['options'] as $key => $option ) :
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         if ( isset( $wpinv_options['gateways'][ $key ] ) )
-			$enabled = '1';
-		else
-			$enabled = null;
+            $enabled = '1';
+        else
+            $enabled = null;
 
-		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
+    endforeach;
 }
 
 function wpinv_gateway_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+    echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    foreach ( $args['options'] as $key => $option ) :
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             $selected = selected( $key, $args['selected'], false );
         } else {
             $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 function wpinv_text_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
-
-	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
-	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
-	$html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
-
-	echo $html;
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+    $class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+
+    $readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
+    $size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
+    $html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+
+    echo $html;
 }
 
 function wpinv_number_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$max  = isset( $args['max'] ) ? $args['max'] : 999999;
-	$min  = isset( $args['min'] ) ? $args['min'] : 0;
-	$step = isset( $args['step'] ) ? $args['step'] : 1;
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
-
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
-
-	echo $html;
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $max  = isset( $args['max'] ) ? $args['max'] : 999999;
+    $min  = isset( $args['min'] ) ? $args['min'] : 0;
+    $step = isset( $args['step'] ) ? $args['step'] : 1;
+    $class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+
+    echo $html;
 }
 
 function wpinv_textarea_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_password_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_missing_callback($args) {
-	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . $args['id'] . '</strong>'
-	);
+    printf(
+        __( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . $args['id'] . '</strong>'
+    );
 }
 
 function wpinv_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
         $value = $args['selected'];
     }
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
     
     if( !empty( $args['onchange'] ) ) {
         $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
@@ -1313,142 +1313,142 @@ 
 
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
 
-	foreach ( $args['options'] as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $name ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_select_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wpinv_options, $wp_version;
+    global $wpinv_options, $wp_version;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
-		}
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+        if( empty( $args['allow_blank'] ) && empty( $value ) ) {
+            $value = isset( $args['std'] ) ? $args['std'] : '';
+        }
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
-		$html = ob_get_clean();
-	} else {
-		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        ob_start();
+        wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+        $html = ob_get_clean();
+    } else {
+        $html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	$html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_upload_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[$args['id']];
-	} else {
-		$value = isset($args['std']) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[$args['id']];
+    } else {
+        $value = isset($args['std']) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+    $default = isset( $args['std'] ) ? $args['std'] : '';
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_country_states_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_tax_rates_callback($args) {
-	global $wpinv_options;
-	$rates = wpinv_get_tax_rates();
-	ob_start(); ?>
+    global $wpinv_options;
+    $rates = wpinv_get_tax_rates();
+    ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tax_tdbox">
 	<p><?php echo $args['desc']; ?></p>
@@ -1472,40 +1472,40 @@ 
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
-						'name'             => 'tax_rates[' . $sanitized_key . '][country]',
+                    echo wpinv_html_select( array(
+                        'options'          => wpinv_get_country_list( true ),
+                        'name'             => 'tax_rates[' . $sanitized_key . '][country]',
                         'id'               => 'tax_rates[' . $sanitized_key . '][country]',
-						'selected'         => $rate['country'],
-						'show_option_all'  => false,
-						'show_option_none' => false,
-						'class'            => 'wpinv-tax-country wpi_select2',
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) );
-					?>
+                        'selected'         => $rate['country'],
+                        'show_option_all'  => false,
+                        'show_option_none' => false,
+                        'class'            => 'wpinv-tax-country wpi_select2',
+                        'placeholder'      => __( 'Choose a country', 'invoicing' )
+                    ) );
+                    ?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php
-					$states = wpinv_get_country_states( $rate['country'] );
-					if( !empty( $states ) ) {
-						echo wpinv_html_select( array(
-							'options'          => array_merge( array( '' => '' ), $states ),
-							'name'             => 'tax_rates[' . $sanitized_key . '][state]',
+                    $states = wpinv_get_country_states( $rate['country'] );
+                    if( !empty( $states ) ) {
+                        echo wpinv_html_select( array(
+                            'options'          => array_merge( array( '' => '' ), $states ),
+                            'name'             => 'tax_rates[' . $sanitized_key . '][state]',
                             'id'               => 'tax_rates[' . $sanitized_key . '][state]',
-							'selected'         => $rate['state'],
-							'show_option_all'  => false,
-							'show_option_none' => false,
+                            'selected'         => $rate['state'],
+                            'show_option_all'  => false,
+                            'show_option_none' => false,
                             'class'            => 'wpi_select2',
-							'placeholder'      => __( 'Choose a state', 'invoicing' )
-						) );
-					} else {
-						echo wpinv_html_text( array(
-							'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
-							'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
+                            'placeholder'      => __( 'Choose a state', 'invoicing' )
+                        ) );
+                    } else {
+                        echo wpinv_html_text( array(
+                            'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
+                            'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
                             'id'    => 'tax_rates[' . $sanitized_key . '][state]',
-						) );
-					}
-					?>
+                        ) );
+                    }
+                    ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[<?php echo $sanitized_key; ?>][global]" id="tax_rates[<?php echo $sanitized_key; ?>][global]" value="1"<?php checked( true, ! empty( $rate['global'] ) ); ?>/>
@@ -1520,19 +1520,19 @@ 
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
-						'name'             => 'tax_rates[0][country]',
-						'show_option_all'  => false,
-						'show_option_none' => false,
-						'class'            => 'wpinv-tax-country wpi_select2',
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) ); ?>
+                    echo wpinv_html_select( array(
+                        'options'          => wpinv_get_country_list( true ),
+                        'name'             => 'tax_rates[0][country]',
+                        'show_option_all'  => false,
+                        'show_option_none' => false,
+                        'class'            => 'wpinv-tax-country wpi_select2',
+                        'placeholder'      => __( 'Choose a country', 'invoicing' )
+                    ) ); ?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php echo wpinv_html_text( array(
-						'name' => 'tax_rates[0][state]'
-					) ); ?>
+                        'name' => 'tax_rates[0][state]'
+                    ) ); ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[0][global]" id="tax_rates[0][global]" value="1"/>
@@ -1547,7 +1547,7 @@ 
         <tfoot><tr><td colspan="5"></td><td class="wpinv_tax_action"><span class="button-secondary" id="wpinv_add_tax_rate"><?php _e( 'Add Tax Rate', 'invoicing' ); ?></span></td></tr></tfoot>
 	</table>
 	<?php
-	echo ob_get_clean();
+    echo ob_get_clean();
 }
 
 function wpinv_tools_callback($args) {
@@ -1575,15 +1575,15 @@ 
 }
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 

includes/admin/wpinv-admin-functions.php

Indentation +45 added lines, -45 removed lines

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

includes/wpinv-user-functions.php

Indentation +4 added lines, -4 removed lines

@@ -159,11 +159,11 @@
  */
 function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
 
-	if ( current_user_can( 'manage_options' ) ) {
-		return 'manage_options';
-	};
+    if ( current_user_can( 'manage_options' ) ) {
+        return 'manage_options';
+    };
 
-	return $capalibilty;
+    return $capalibilty;
 }
 
 /**

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

Indentation +987 added lines, -987 removed lines

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

includes/gateways/paypal.php

Indentation +255 added lines, -255 removed lines

@@ -219,262 +219,262 @@ 
 add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
 
 function wpinv_process_paypal_ipn() {
-	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
-		return;
-	}
-
-	// Set initial post data to empty string
-	$post_data = '';
-
-	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
-	} else {
-		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
-	}
-	// Start the encoded data collection with notification command
-	$encoded_data = 'cmd=_notify-validate';
-
-	// Get current arg separator
-	$arg_separator = wpinv_get_php_arg_separator_output();
-
-	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
-		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
-	} else {
-		// Check if POST is empty
-		if ( empty( $_POST ) ) {
-			// Nothing to do
-			return;
-		} else {
-			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
-				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
-			}
-		}
-	}
-
-	// Convert collected post data to an array
-	wp_parse_str( $encoded_data, $encoded_data_array );
-
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
-
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
-		}
-	}
-
-	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
-
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
-		// Validate the IPN
-
-		$remote_post_vars      = array(
-			'method'           => 'POST',
-			'timeout'          => 45,
-			'redirection'      => 5,
-			'httpversion'      => '1.1',
-			'blocking'         => true,
-			'headers'          => array(
-				'host'         => 'www.paypal.com',
-				'connection'   => 'close',
-				'content-type' => 'application/x-www-form-urlencoded',
-				'post'         => '/cgi-bin/webscr HTTP/1.1',
-
-			),
-			'sslverify'        => false,
-			'body'             => $encoded_data_array
-		);
-
-		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
-
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Something went wrong
-		}
-
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Response not okay
-		}
-	}
-
-	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
-
-	$defaults = array(
-		'txn_type'       => '',
-		'payment_status' => ''
-	);
-
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
-
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+    // Check the request method is POST
+    if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+        return;
+    }
+
+    // Set initial post data to empty string
+    $post_data = '';
+
+    // Fallback just in case post_max_size is lower than needed
+    if ( ini_get( 'allow_url_fopen' ) ) {
+        $post_data = file_get_contents( 'php://input' );
+    } else {
+        // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
+        ini_set( 'post_max_size', '12M' );
+    }
+    // Start the encoded data collection with notification command
+    $encoded_data = 'cmd=_notify-validate';
+
+    // Get current arg separator
+    $arg_separator = wpinv_get_php_arg_separator_output();
+
+    // Verify there is a post_data
+    if ( $post_data || strlen( $post_data ) > 0 ) {
+        // Append the data
+        $encoded_data .= $arg_separator.$post_data;
+    } else {
+        // Check if POST is empty
+        if ( empty( $_POST ) ) {
+            // Nothing to do
+            return;
+        } else {
+            // Loop through each POST
+            foreach ( $_POST as $key => $value ) {
+                // Encode the value and append the data
+                $encoded_data .= $arg_separator."$key=" . urlencode( $value );
+            }
+        }
+    }
+
+    // Convert collected post data to an array
+    wp_parse_str( $encoded_data, $encoded_data_array );
+
+    foreach ( $encoded_data_array as $key => $value ) {
+        if ( false !== strpos( $key, 'amp;' ) ) {
+            $new_key = str_replace( '&', '&', $key );
+            $new_key = str_replace( 'amp;', '&' , $new_key );
+
+            unset( $encoded_data_array[ $key ] );
+            $encoded_data_array[ $new_key ] = $value;
+        }
+    }
+
+    // Get the PayPal redirect uri
+    $paypal_redirect = wpinv_get_paypal_redirect( true );
+
+    if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+        // Validate the IPN
+
+        $remote_post_vars      = array(
+            'method'           => 'POST',
+            'timeout'          => 45,
+            'redirection'      => 5,
+            'httpversion'      => '1.1',
+            'blocking'         => true,
+            'headers'          => array(
+                'host'         => 'www.paypal.com',
+                'connection'   => 'close',
+                'content-type' => 'application/x-www-form-urlencoded',
+                'post'         => '/cgi-bin/webscr HTTP/1.1',
+
+            ),
+            'sslverify'        => false,
+            'body'             => $encoded_data_array
+        );
+
+        // Get response
+        $api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+
+        if ( is_wp_error( $api_response ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Something went wrong
+        }
+
+        if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Response not okay
+        }
+    }
+
+    // Check if $post_data_array has been populated
+    if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+        return;
+
+    $defaults = array(
+        'txn_type'       => '',
+        'payment_status' => ''
+    );
+
+    $encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+
+    $invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-	wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
-
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
-		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
-	} else {
-		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
-	}
-	exit;
+    wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+    wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
+
+    if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+        // Allow PayPal IPN types to be processed separately
+        do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+    } else {
+        // Fallback to web accept just in case the txn_type isn't present
+        do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+    }
+    exit;
 }
 add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
 
 function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
-		return;
-	}
-
-	if( empty( $invoice_id ) ) {
-		return;
-	}
-
-	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
-	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
-
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
-		return; // this isn't a PayPal standard IPN
-	}
-
-	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
-		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
-		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
-
-		// Setup and store the customer's details
-		$user_info = array(
-			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
-			'discount'   => '',
-		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
-
-		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
-	}
-
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
-		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
-	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
-			return; // Only paid payments once
-		}
-
-		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
-
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
-			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
-			// Look for possible pending reasons, such as an echeck
-			$note = '';
-
-			switch( strtolower( $data['pending_reason'] ) ) {
-				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
-					break;
+    if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+        return;
+    }
+
+    if( empty( $invoice_id ) ) {
+        return;
+    }
+
+    // Collect payment details
+    $purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+    $paypal_amount  = $data['mc_gross'];
+    $payment_status = strtolower( $data['payment_status'] );
+    $currency_code  = strtolower( $data['mc_currency'] );
+    $business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
+    $payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+
+    if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+        return; // this isn't a PayPal standard IPN
+    }
+
+    // Verify payment recipient
+    if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    // Verify payment currency
+    if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+        // This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
+        // No email associated with purchase, so store from PayPal
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+
+        // Setup and store the customer's details
+        $user_info = array(
+            'user_id'    => '-1',
+            'email'      => sanitize_text_field( $data['payer_email'] ),
+            'first_name' => sanitize_text_field( $data['first_name'] ),
+            'last_name'  => sanitize_text_field( $data['last_name'] ),
+            'discount'   => '',
+        );
+        $user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
+        $user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
+        $user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
+        $user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
+        $user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+
+        $payment_meta['user_info'] = $user_info;
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+    }
+
+    if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+        // Process a refund
+        wpinv_process_paypal_refund( $data, $invoice_id );
+    } else {
+        if ( get_post_status( $invoice_id ) == 'publish' ) {
+            return; // Only paid payments once
+        }
+
+        // Retrieve the total purchase amount (before PayPal)
+        $payment_amount = wpinv_payment_total( $invoice_id );
+
+        if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+            // The prices don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+        if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+            // Purchase keys don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+
+        if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
+            wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
+            wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
+            wpinv_update_payment_status( $invoice_id, 'publish' );
+        } else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+            // Look for possible pending reasons, such as an echeck
+            $note = '';
+
+            switch( strtolower( $data['pending_reason'] ) ) {
+                case 'echeck' :
+                    $note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+                    break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+                    break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+                    break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
-					break;
+                    $note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+                    break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
-					break;
+                    $note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+                    break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
-					break;
-
-				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
-					break;
-			}
-
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
-			}
-		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
-		}
-	}
+                    $note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+                    break;
+
+                case 'other' :
+                    $note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+                    break;
+            }
+
+            if ( ! empty( $note ) ) {
+                wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
+            }
+        } else {
+            wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
+        }
+    }
 }
 add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
 
@@ -668,34 +668,34 @@ 
 }
 
 function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
-	// Collect payment details
+    // Collect payment details
 
-	if( empty( $invoice_id ) ) {
-		return;
-	}
+    if( empty( $invoice_id ) ) {
+        return;
+    }
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
-		return; // Only refund payments once
-	}
+    if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+        return; // Only refund payments once
+    }
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
-	$refund_amount  = $data['mc_gross'] * -1;
+    $payment_amount = wpinv_payment_total( $invoice_id );
+    $refund_amount  = $data['mc_gross'] * -1;
 
-	do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
+    do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
 
-		do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
+        do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
 
-		return; // This is a partial refund
-	}
+        return; // This is a partial refund
+    }
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
+    wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
 
-	do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
+    do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
 }
 
 function wpinv_get_paypal_redirect( $ssl_check = false ) {