AyeCode / invoicing

includes/wpinv-template-functions.php

Braces +21 added lines, -15 removed lines

@@ -173,8 +173,9 @@ 
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
+	if ( isset( $name ) ) {
+			$templates[] = $slug . '-' . $name . '.php';
+	}
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
@@ -192,8 +193,9 @@ 
 	foreach ( (array)$template_names as $template_name ) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+		if ( empty( $template_name ) ) {
+					continue;
+		}
 
 		// Trim off any slashes from the template name
 		$template_name = ltrim( $template_name, '/' );
@@ -212,8 +214,9 @@ 
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ( ( true == $load ) && ! empty( $located ) ) {
+			load_template( $located, $require_once );
+	}
 
 	return $located;
 }
@@ -289,8 +292,9 @@ 
 function wpinv_html_dropdown( $name = 'wpinv_discounts', $selected = 0, $status = '' ) {
     $args = array( 'nopaging' => true );
 
-    if ( ! empty( $status ) )
-        $args['post_status'] = $status;
+    if ( ! empty( $status ) ) {
+            $args['post_status'] = $status;
+    }
 
     $discounts = wpinv_get_discounts( $args );
     $options   = array();
@@ -1457,17 +1461,19 @@ 
 add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
 
 function wpinv_save_cart_button() {
-    if ( wpinv_is_cart_saving_disabled() )
-        return;
-?>
+    if ( wpinv_is_cart_saving_disabled() ) {
+            return;
+    }
+    ?>
     <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url( add_query_arg( 'wpi_action', 'save_cart' ) ); ?>"><?php _e( 'Save Cart', 'invoicing' ); ?></a>
 <?php
 }
 
 function wpinv_update_cart_button() {
-    if ( !wpinv_item_quantities_enabled() )
-        return;
-?>
+    if ( !wpinv_item_quantities_enabled() ) {
+            return;
+    }
+    ?>
     <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e( 'Update Cart', 'invoicing' ); ?>"/>
     <input type="hidden" name="wpi_action" value="update_cart"/>
 <?php
@@ -1606,7 +1612,7 @@ 
 		                    </div>
 		                    <?php
 	                    }
-                    }else{
+                    } else{
 	                    echo '<div class="alert alert-warning">'. __('No payment gateway active','invoicing') .'</div>';
                     }
 

Spacing +694 added lines, -694 removed lines

@@ -7,101 +7,101 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-if ( !is_admin() ) {
-    add_filter( 'template_include', 'wpinv_template', 10, 1 );
-    add_action( 'wpinv_invoice_print_body_start', 'wpinv_display_invoice_top_bar' );
-    add_action( 'wpinv_invoice_top_bar_left', 'wpinv_invoice_display_left_actions' );
-    add_action( 'wpinv_invoice_top_bar_right', 'wpinv_invoice_display_right_actions' );
+if (!is_admin()) {
+    add_filter('template_include', 'wpinv_template', 10, 1);
+    add_action('wpinv_invoice_print_body_start', 'wpinv_display_invoice_top_bar');
+    add_action('wpinv_invoice_top_bar_left', 'wpinv_invoice_display_left_actions');
+    add_action('wpinv_invoice_top_bar_right', 'wpinv_invoice_display_right_actions');
 }
 
 function wpinv_template_path() {
-    return apply_filters( 'wpinv_template_path', 'invoicing/' );
+    return apply_filters('wpinv_template_path', 'invoicing/');
 }
 
-function wpinv_post_class( $classes, $class, $post_id ) {
+function wpinv_post_class($classes, $class, $post_id) {
     global $pagenow, $typenow;
 
-    if ( $pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type( $post_id ) == $typenow && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' ) {
+    if ($pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type($post_id) == $typenow && get_post_meta($post_id, '_wpinv_type', true) == 'package') {
         $classes[] = 'wpi-gd-package';
     }
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_post_class', 10, 3 );
+add_filter('post_class', 'wpinv_post_class', 10, 3);
 
-function wpinv_display_invoice_top_bar( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_display_invoice_top_bar($invoice) {
+    if (empty($invoice)) {
         return;
     }
     ?>
     <div class="row wpinv-top-bar no-print">
         <div class="container">
             <div class="col-xs-6">
-                <?php do_action( 'wpinv_invoice_top_bar_left', $invoice );?>
+                <?php do_action('wpinv_invoice_top_bar_left', $invoice); ?>
             </div>
             <div class="col-xs-6 text-right">
-                <?php do_action( 'wpinv_invoice_top_bar_right', $invoice );?>
+                <?php do_action('wpinv_invoice_top_bar_right', $invoice); ?>
             </div>
         </div>
     </div>
     <?php
 }
 
-function wpinv_invoice_display_left_actions( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_display_left_actions($invoice) {
+    if (empty($invoice)) {
         return; // Exit if invoice is not set.
     }
     
-    if ( $invoice->post_type == 'wpi_invoice' ) {
-        if ( $invoice->needs_payment() ) {
-            ?> <a class="btn btn-success btn-sm" title="<?php esc_attr_e( 'Pay This Invoice', 'invoicing' ); ?>" href="<?php echo esc_url( $invoice->get_checkout_payment_url() ); ?>"><?php _e( 'Pay For Invoice', 'invoicing' ); ?></a><?php
+    if ($invoice->post_type == 'wpi_invoice') {
+        if ($invoice->needs_payment()) {
+            ?> <a class="btn btn-success btn-sm" title="<?php esc_attr_e('Pay This Invoice', 'invoicing'); ?>" href="<?php echo esc_url($invoice->get_checkout_payment_url()); ?>"><?php _e('Pay For Invoice', 'invoicing'); ?></a><?php
         }
     }
     do_action('wpinv_invoice_display_left_actions', $invoice);
 }
 
-function wpinv_invoice_display_right_actions( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_display_right_actions($invoice) {
+    if (empty($invoice)) {
         return; // Exit if invoice is not set.
     }
 
-    if ( $invoice->post_type == 'wpi_invoice' ) { ?>
-        <a class="btn btn-primary btn-sm" onclick="window.print();" href="javascript:void(0)"><?php _e( 'Print Invoice', 'invoicing' ); ?></a>
-        <?php if ( is_user_logged_in() ) { ?>
-        &nbsp;&nbsp;<a class="btn btn-warning btn-sm" href="<?php echo esc_url( wpinv_get_history_page_uri() ); ?>"><?php _e( 'Invoice History', 'invoicing' ); ?></a>
+    if ($invoice->post_type == 'wpi_invoice') { ?>
+        <a class="btn btn-primary btn-sm" onclick="window.print();" href="javascript:void(0)"><?php _e('Print Invoice', 'invoicing'); ?></a>
+        <?php if (is_user_logged_in()) { ?>
+        &nbsp;&nbsp;<a class="btn btn-warning btn-sm" href="<?php echo esc_url(wpinv_get_history_page_uri()); ?>"><?php _e('Invoice History', 'invoicing'); ?></a>
         <?php }
     }
     do_action('wpinv_invoice_display_right_actions', $invoice);
 }
 
-function wpinv_before_invoice_content( $content ) {
+function wpinv_before_invoice_content($content) {
     global $post;
 
-    if ( !empty( $post ) && $post->post_type == 'wpi_invoice' && is_singular( 'wpi_invoice' ) && is_main_query() ) {
+    if (!empty($post) && $post->post_type == 'wpi_invoice' && is_singular('wpi_invoice') && is_main_query()) {
         ob_start();
-        do_action( 'wpinv_before_invoice_content', $post->ID );
+        do_action('wpinv_before_invoice_content', $post->ID);
         $content = ob_get_clean() . $content;
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_before_invoice_content' );
+add_filter('the_content', 'wpinv_before_invoice_content');
 
-function wpinv_after_invoice_content( $content ) {
+function wpinv_after_invoice_content($content) {
     global $post;
 
-    if ( !empty( $post ) && $post->post_type == 'wpi_invoice' && is_singular( 'wpi_invoice' ) && is_main_query() ) {
+    if (!empty($post) && $post->post_type == 'wpi_invoice' && is_singular('wpi_invoice') && is_main_query()) {
         ob_start();
-        do_action( 'wpinv_after_invoice_content', $post->ID );
+        do_action('wpinv_after_invoice_content', $post->ID);
         $content .= ob_get_clean();
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_after_invoice_content' );
+add_filter('the_content', 'wpinv_after_invoice_content');
 
 function wpinv_get_templates_dir() {
     return WPINV_PLUGIN_DIR . 'templates';
@@ -111,105 +111,105 @@ 
     return WPINV_PLUGIN_URL . 'templates';
 }
 
-function wpinv_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-    if ( ! empty( $args ) && is_array( $args ) ) {
-		extract( $args );
+function wpinv_get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
+    if (!empty($args) && is_array($args)) {
+		extract($args);
 	}
 
-	$located = wpinv_locate_template( $template_name, $template_path, $default_path );
+	$located = wpinv_locate_template($template_name, $template_path, $default_path);
 	// Allow 3rd party plugin filter template file from their plugin.
-	$located = apply_filters( 'wpinv_get_template', $located, $template_name, $args, $template_path, $default_path );
+	$located = apply_filters('wpinv_get_template', $located, $template_name, $args, $template_path, $default_path);
 
-	if ( ! file_exists( $located ) ) {
-        _doing_it_wrong( __FUNCTION__, sprintf( '<code>%s</code> does not exist.', $located ), '2.1' );
+	if (!file_exists($located)) {
+        _doing_it_wrong(__FUNCTION__, sprintf('<code>%s</code> does not exist.', $located), '2.1');
 		return;
 	}
 
-	do_action( 'wpinv_before_template_part', $template_name, $template_path, $located, $args );
+	do_action('wpinv_before_template_part', $template_name, $template_path, $located, $args);
 
-	include( $located );
+	include($located);
 
-	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
+	do_action('wpinv_after_template_part', $template_name, $template_path, $located, $args);
 }
 
-function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+function wpinv_get_template_html($template_name, $args = array(), $template_path = '', $default_path = '') {
 	ob_start();
-	wpinv_get_template( $template_name, $args, $template_path, $default_path );
+	wpinv_get_template($template_name, $args, $template_path, $default_path);
 	return ob_get_clean();
 }
 
-function wpinv_locate_template( $template_name, $template_path = '', $default_path = '' ) {
-    if ( ! $template_path ) {
+function wpinv_locate_template($template_name, $template_path = '', $default_path = '') {
+    if (!$template_path) {
         $template_path = wpinv_template_path();
     }
 
-    if ( ! $default_path ) {
+    if (!$default_path) {
         $default_path = WPINV_PLUGIN_DIR . 'templates/';
     }
 
     // Look within passed path within the theme - this is priority.
     $template = locate_template(
         array(
-            trailingslashit( $template_path ) . $template_name,
+            trailingslashit($template_path) . $template_name,
             $template_name
         )
     );
 
     // Get default templates/
-    if ( !$template && $default_path ) {
-        $template = trailingslashit( $default_path ) . $template_name;
+    if (!$template && $default_path) {
+        $template = trailingslashit($default_path) . $template_name;
     }
 
     // Return what we found.
-    return apply_filters( 'wpinv_locate_template', $template, $template_name, $template_path );
+    return apply_filters('wpinv_locate_template', $template, $template_name, $template_path);
 }
 
-function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+function wpinv_get_template_part($slug, $name = null, $load = true) {
+	do_action('get_template_part_' . $slug, $slug, $name);
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
+	if (isset($name))
 		$templates[] = $slug . '-' . $name . '.php';
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+	$templates = apply_filters('wpinv_get_template_part', $templates, $slug, $name);
 
 	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+	return wpinv_locate_tmpl($templates, $load, false);
 }
 
-function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
+function wpinv_locate_tmpl($template_names, $load = false, $require_once = true) {
 	// No file found yet
 	$located = false;
 
 	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+	foreach ((array)$template_names as $template_name) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
+		if (empty($template_name))
 			continue;
 
 		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+		$template_name = ltrim($template_name, '/');
 
 		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+		foreach (wpinv_get_theme_template_paths() as $template_path) {
 
-			if( file_exists( $template_path . $template_name ) ) {
+			if (file_exists($template_path . $template_name)) {
 				$located = $template_path . $template_name;
 				break;
 			}
 		}
 
-		if( !empty( $located ) ) {
+		if (!empty($located)) {
 			break;
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ((true == $load) && !empty($located))
+		load_template($located, $require_once);
 
 	return $located;
 }
@@ -218,143 +218,143 @@ 
 	$template_dir = wpinv_get_theme_template_dir_name();
 
 	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
+		1 => trailingslashit(get_stylesheet_directory()) . $template_dir,
+		10 => trailingslashit(get_template_directory()) . $template_dir,
 		100 => wpinv_get_templates_dir()
 	);
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+	$file_paths = apply_filters('wpinv_template_paths', $file_paths);
 
 	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+	ksort($file_paths, SORT_NUMERIC);
 
-	return array_map( 'trailingslashit', $file_paths );
+	return array_map('trailingslashit', $file_paths);
 }
 
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'wpinv_templates' ) );
+	return trailingslashit(apply_filters('wpinv_templates_dir', 'wpinv_templates'));
 }
 
 function wpinv_checkout_meta_tags() {
 
 	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
+	$pages[] = wpinv_get_option('success_page');
+	$pages[] = wpinv_get_option('failure_page');
+	$pages[] = wpinv_get_option('invoice_history_page');
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+	if (!wpinv_is_checkout() && !is_page($pages)) {
 		return;
 	}
 
 	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
-add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
+add_action('wp_head', 'wpinv_checkout_meta_tags');
 
-function wpinv_add_body_classes( $class ) {
+function wpinv_add_body_classes($class) {
 	$classes = (array)$class;
 
-	if( wpinv_is_checkout() ) {
+	if (wpinv_is_checkout()) {
 		$classes[] = 'wpinv-checkout';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_success_page() ) {
+	if (wpinv_is_success_page()) {
 		$classes[] = 'wpinv-success';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_failed_transaction_page() ) {
+	if (wpinv_is_failed_transaction_page()) {
 		$classes[] = 'wpinv-failed-transaction';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_invoice_history_page() ) {
+	if (wpinv_is_invoice_history_page()) {
 		$classes[] = 'wpinv-history';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_test_mode() ) {
+	if (wpinv_is_test_mode()) {
 		$classes[] = 'wpinv-test-mode';
 		$classes[] = 'wpinv-page';
 	}
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
-add_filter( 'body_class', 'wpinv_add_body_classes' );
+add_filter('body_class', 'wpinv_add_body_classes');
 
-function wpinv_html_dropdown( $name = 'wpinv_discounts', $selected = 0, $status = '' ) {
-    $args = array( 'nopaging' => true );
+function wpinv_html_dropdown($name = 'wpinv_discounts', $selected = 0, $status = '') {
+    $args = array('nopaging' => true);
 
-    if ( ! empty( $status ) )
+    if (!empty($status))
         $args['post_status'] = $status;
 
-    $discounts = wpinv_get_discounts( $args );
+    $discounts = wpinv_get_discounts($args);
     $options   = array();
 
-    if ( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $options[ absint( $discount->ID ) ] = esc_html( get_the_title( $discount->ID ) );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $options[absint($discount->ID)] = esc_html(get_the_title($discount->ID));
         }
     } else {
-        $options[0] = __( 'No discounts found', 'invoicing' );
+        $options[0] = __('No discounts found', 'invoicing');
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false,
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_year_dropdown( $name = 'year', $selected = 0, $years_before = 5, $years_after = 0 ) {
-    $current     = date( 'Y' );
-    $start_year  = $current - absint( $years_before );
-    $end_year    = $current + absint( $years_after );
-    $selected    = empty( $selected ) ? date( 'Y' ) : $selected;
+function wpinv_html_year_dropdown($name = 'year', $selected = 0, $years_before = 5, $years_after = 0) {
+    $current     = date('Y');
+    $start_year  = $current - absint($years_before);
+    $end_year    = $current + absint($years_after);
+    $selected    = empty($selected) ? date('Y') : $selected;
     $options     = array();
 
-    while ( $start_year <= $end_year ) {
-        $options[ absint( $start_year ) ] = $start_year;
+    while ($start_year <= $end_year) {
+        $options[absint($start_year)] = $start_year;
         $start_year++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_month_dropdown( $name = 'month', $selected = 0 ) {
+function wpinv_html_month_dropdown($name = 'month', $selected = 0) {
     $month   = 1;
     $options = array();
-    $selected = empty( $selected ) ? date( 'n' ) : $selected;
+    $selected = empty($selected) ? date('n') : $selected;
 
-    while ( $month <= 12 ) {
-        $options[ absint( $month ) ] = wpinv_month_num_to_name( $month );
+    while ($month <= 12) {
+        $options[absint($month)] = wpinv_month_num_to_name($month);
         $month++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_select( $args = array() ) {
+function wpinv_html_select($args = array()) {
     $defaults = array(
         'options'          => array(),
         'name'             => null,
@@ -364,8 +364,8 @@ 
         'chosen'           => false,
         'placeholder'      => null,
         'multiple'         => false,
-        'show_option_all'  => _x( 'All', 'all dropdown items', 'invoicing' ),
-        'show_option_none' => _x( 'None', 'no dropdown items', 'invoicing' ),
+        'show_option_all'  => _x('All', 'all dropdown items', 'invoicing'),
+        'show_option_none' => _x('None', 'no dropdown items', 'invoicing'),
         'data'             => array(),
         'onchange'         => null,
         'required'         => false,
@@ -373,78 +373,78 @@ 
         'readonly'         => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $data_elements = '';
-    foreach ( $args['data'] as $key => $value ) {
-        $data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+    foreach ($args['data'] as $key => $value) {
+        $data_elements .= ' data-' . esc_attr($key) . '="' . esc_attr($value) . '"';
     }
 
-    if( $args['multiple'] ) {
+    if ($args['multiple']) {
         $multiple = ' MULTIPLE';
     } else {
         $multiple = '';
     }
 
-    if( $args['chosen'] ) {
+    if ($args['chosen']) {
         $args['class'] .= ' wpinv-select-chosen';
     }
 
-    if( $args['placeholder'] ) {
+    if ($args['placeholder']) {
         $placeholder = $args['placeholder'];
     } else {
         $placeholder = '';
     }
     
     $options = '';
-    if( !empty( $args['onchange'] ) ) {
-        $options .= ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $options .= ' onchange="' . esc_attr($args['onchange']) . '"';
     }
     
-    if( !empty( $args['required'] ) ) {
+    if (!empty($args['required'])) {
         $options .= ' required="required"';
     }
     
-    if( !empty( $args['disabled'] ) ) {
+    if (!empty($args['disabled'])) {
         $options .= ' disabled';
     }
     
-    if( !empty( $args['readonly'] ) ) {
+    if (!empty($args['readonly'])) {
         $options .= ' readonly';
     }
 
-    $class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-    $output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim( $options ) . $data_elements . '>';
+    $class  = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
+    $output = '<select name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim($options) . $data_elements . '>';
 
-    if ( $args['show_option_all'] ) {
-        if( $args['multiple'] ) {
-            $selected = selected( true, in_array( 0, $args['selected'] ), false );
+    if ($args['show_option_all']) {
+        if ($args['multiple']) {
+            $selected = selected(true, in_array(0, $args['selected']), false);
         } else {
-            $selected = selected( $args['selected'], 0, false );
+            $selected = selected($args['selected'], 0, false);
         }
-        $output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+        $output .= '<option value="all"' . $selected . '>' . esc_html($args['show_option_all']) . '</option>';
     }
 
-    if ( !empty( $args['options'] ) ) {
+    if (!empty($args['options'])) {
 
-        if ( $args['show_option_none'] ) {
-            if( $args['multiple'] ) {
-                $selected = selected( true, in_array( "", $args['selected'] ), false );
+        if ($args['show_option_none']) {
+            if ($args['multiple']) {
+                $selected = selected(true, in_array("", $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'] === "", true, false );
+                $selected = selected($args['selected'] === "", true, false);
             }
-            $output .= '<option value=""' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+            $output .= '<option value=""' . $selected . '>' . esc_html($args['show_option_none']) . '</option>';
         }
 
-        foreach( $args['options'] as $key => $option ) {
+        foreach ($args['options'] as $key => $option) {
 
-            if( $args['multiple'] && is_array( $args['selected'] ) ) {
-                $selected = selected( true, (bool)in_array( $key, $args['selected'] ), false );
+            if ($args['multiple'] && is_array($args['selected'])) {
+                $selected = selected(true, (bool)in_array($key, $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'], $key, false );
+                $selected = selected($args['selected'], $key, false);
             }
 
-            $output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+            $output .= '<option value="' . esc_attr($key) . '"' . $selected . '>' . esc_html($option) . '</option>';
         }
     }
 
@@ -453,7 +453,7 @@ 
     return $output;
 }
 
-function wpinv_item_dropdown( $args = array() ) {
+function wpinv_item_dropdown($args = array()) {
     $defaults = array(
         'name'              => 'wpi_item',
         'id'                => 'wpi_item',
@@ -462,15 +462,15 @@ 
         'selected'          => 0,
         'chosen'            => false,
         'number'            => 100,
-        'placeholder'       => __( 'Choose a item', 'invoicing' ),
-        'data'              => array( 'search-type' => 'item' ),
+        'placeholder'       => __('Choose a item', 'invoicing'),
+        'data'              => array('search-type' => 'item'),
         'show_option_all'   => false,
         'show_option_none'  => false,
         'with_packages'     => true,
         'show_recurring'    => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $item_args = array(
         'post_type'      => 'wpi_item',
@@ -479,7 +479,7 @@ 
         'posts_per_page' => $args['number']
     );
     
-    if ( !$args['with_packages'] ) {
+    if (!$args['with_packages']) {
         $item_args['meta_query'] = array(
             array(
                 'key'       => '_wpinv_type',
@@ -489,42 +489,42 @@ 
         );
     }
 
-    $items      = get_posts( $item_args );
+    $items      = get_posts($item_args);
     $options    = array();
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            $title = esc_html( $item->post_title );
+    if ($items) {
+        foreach ($items as $item) {
+            $title = esc_html($item->post_title);
             
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $item->ID, false );
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($item->ID, false);
             }
             
-            $options[ absint( $item->ID ) ] = $title;
+            $options[absint($item->ID)] = $title;
         }
     }
 
     // This ensures that any selected items are included in the drop down
-    if( is_array( $args['selected'] ) ) {
-        foreach( $args['selected'] as $item ) {
-            if( ! in_array( $item, $options ) ) {
-                $title = get_the_title( $item );
-                if ( !empty( $args['show_recurring'] ) ) {
-                    $title .= wpinv_get_item_suffix( $item, false );
+    if (is_array($args['selected'])) {
+        foreach ($args['selected'] as $item) {
+            if (!in_array($item, $options)) {
+                $title = get_the_title($item);
+                if (!empty($args['show_recurring'])) {
+                    $title .= wpinv_get_item_suffix($item, false);
                 }
                 $options[$item] = $title;
             }
         }
-    } elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-        if ( ! in_array( $args['selected'], $options ) ) {
-            $title = get_the_title( $args['selected'] );
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $args['selected'], false );
+    } elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+        if (!in_array($args['selected'], $options)) {
+            $title = get_the_title($args['selected']);
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($args['selected'], false);
             }
-            $options[$args['selected']] = get_the_title( $args['selected'] );
+            $options[$args['selected']] = get_the_title($args['selected']);
         }
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $args['name'],
         'selected'         => $args['selected'],
         'id'               => $args['id'],
@@ -536,12 +536,12 @@ 
         'show_option_all'  => $args['show_option_all'],
         'show_option_none' => $args['show_option_none'],
         'data'             => $args['data'],
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_checkbox( $args = array() ) {
+function wpinv_html_checkbox($args = array()) {
     $defaults = array(
         'name'     => null,
         'current'  => null,
@@ -552,38 +552,38 @@ 
         )
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if ( ! empty( $args['options']['disabled'] ) ) {
+    if (!empty($args['options']['disabled'])) {
         $options .= ' disabled="disabled"';
-    } elseif ( ! empty( $args['options']['readonly'] ) ) {
+    } elseif (!empty($args['options']['readonly'])) {
         $options .= ' readonly';
     }
 
-    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $class . ' ' . esc_attr( $args['name'] ) . '" ' . checked( 1, $args['current'], false ) . ' />';
+    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['name']) . '" class="' . $class . ' ' . esc_attr($args['name']) . '" ' . checked(1, $args['current'], false) . ' />';
 
     return $output;
 }
 
-function wpinv_html_text( $args = array() ) {
+function wpinv_html_text($args = array()) {
     // Backwards compatibility
-    if ( func_num_args() > 1 ) {
+    if (func_num_args() > 1) {
         $args = func_get_args();
 
         $name  = $args[0];
-        $value = isset( $args[1] ) ? $args[1] : '';
-        $label = isset( $args[2] ) ? $args[2] : '';
-        $desc  = isset( $args[3] ) ? $args[3] : '';
+        $value = isset($args[1]) ? $args[1] : '';
+        $label = isset($args[2]) ? $args[2] : '';
+        $desc  = isset($args[3]) ? $args[3] : '';
     }
 
     $defaults = array(
         'id'           => '',
-        'name'         => isset( $name )  ? $name  : 'text',
-        'value'        => isset( $value ) ? $value : null,
-        'label'        => isset( $label ) ? $label : null,
-        'desc'         => isset( $desc )  ? $desc  : null,
+        'name'         => isset($name) ? $name : 'text',
+        'value'        => isset($value) ? $value : null,
+        'label'        => isset($label) ? $label : null,
+        'desc'         => isset($desc) ? $desc : null,
         'placeholder'  => '',
         'class'        => 'regular-text',
         'disabled'     => false,
@@ -593,51 +593,51 @@ 
         'data'         => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if( $args['required'] ) {
+    if ($args['required']) {
         $options .= ' required="required"';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
 
     $data = '';
-    if ( !empty( $args['data'] ) ) {
-        foreach ( $args['data'] as $key => $value ) {
-            $data .= 'data-' . wpinv_sanitize_key( $key ) . '="' . esc_attr( $value ) . '" ';
+    if (!empty($args['data'])) {
+        foreach ($args['data'] as $key => $value) {
+            $data .= 'data-' . wpinv_sanitize_key($key) . '="' . esc_attr($value) . '" ';
         }
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['id'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['id']) . '">' . esc_html($args['label']) . '</label>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
 
-    $output .= '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] )  . '" autocomplete="' . esc_attr( $args['autocomplete'] )  . '" value="' . esc_attr( $args['value'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="' . $class . '" ' . $data . ' ' . trim( $options ) . '/>';
+    $output .= '<input type="text" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" autocomplete="' . esc_attr($args['autocomplete']) . '" value="' . esc_attr($args['value']) . '" placeholder="' . esc_attr($args['placeholder']) . '" class="' . $class . '" ' . $data . ' ' . trim($options) . '/>';
 
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_date_field( $args = array() ) {
-    if( empty( $args['class'] ) ) {
+function wpinv_html_date_field($args = array()) {
+    if (empty($args['class'])) {
         $args['class'] = 'wpiDatepicker';
-    } elseif( ! strpos( $args['class'], 'wpiDatepicker' ) ) {
+    } elseif (!strpos($args['class'], 'wpiDatepicker')) {
         $args['class'] .= ' wpiDatepicker';
     }
 
-    return wpinv_html_text( $args );
+    return wpinv_html_text($args);
 }
 
-function wpinv_html_textarea( $args = array() ) {
+function wpinv_html_textarea($args = array()) {
     $defaults = array(
         'name'        => 'textarea',
         'value'       => null,
@@ -647,31 +647,31 @@ 
         'disabled'    => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $disabled = '';
-    if( $args['disabled'] ) {
+    if ($args['disabled']) {
         $disabled = ' disabled="disabled"';
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    $output .= '<textarea name="' . esc_attr( $args['name'] ) . '" id="' . wpinv_sanitize_key( $args['name'] ) . '" class="' . $class . '"' . $disabled . '>' . esc_attr( $args['value'] ) . '</textarea>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['name']) . '">' . esc_html($args['label']) . '</label>';
+    $output .= '<textarea name="' . esc_attr($args['name']) . '" id="' . wpinv_sanitize_key($args['name']) . '" class="' . $class . '"' . $disabled . '>' . esc_attr($args['value']) . '</textarea>';
 
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_ajax_user_search( $args = array() ) {
+function wpinv_html_ajax_user_search($args = array()) {
     $defaults = array(
         'name'        => 'user_id',
         'value'       => null,
-        'placeholder' => __( 'Enter username', 'invoicing' ),
+        'placeholder' => __('Enter username', 'invoicing'),
         'label'       => null,
         'desc'        => null,
         'class'       => '',
@@ -680,13 +680,13 @@ 
         'data'        => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $args['class'] = 'wpinv-ajax-user-search ' . $args['class'];
 
     $output  = '<span class="wpinv_user_search_wrap">';
-        $output .= wpinv_html_text( $args );
-        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __( 'Cancel', 'invoicing' ) . '" aria-label="' . __( 'Cancel', 'invoicing' ) . '" href="#">x</a><span></span></span>';
+        $output .= wpinv_html_text($args);
+        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __('Cancel', 'invoicing') . '" aria-label="' . __('Cancel', 'invoicing') . '" href="#">x</a><span></span></span>';
     $output .= '</span>';
 
     return $output;
@@ -695,7 +695,7 @@ 
 function wpinv_ip_geolocation() {
     global $wpinv_euvat;
     
-    $ip         = !empty( $_GET['ip'] ) ? sanitize_text_field( $_GET['ip'] ) : '';    
+    $ip         = !empty($_GET['ip']) ? sanitize_text_field($_GET['ip']) : '';    
     $content    = '';
     $iso        = '';
     $country    = '';
@@ -706,69 +706,69 @@ 
     $credit     = '';
     $address    = '';
     
-    if ( wpinv_get_option( 'vat_ip_lookup' ) == 'geoip2' && $geoip2_city = $wpinv_euvat->geoip2_city_record( $ip ) ) {
+    if (wpinv_get_option('vat_ip_lookup') == 'geoip2' && $geoip2_city = $wpinv_euvat->geoip2_city_record($ip)) {
         try {
             $iso        = $geoip2_city->country->isoCode;
             $country    = $geoip2_city->country->name;
-            $region     = !empty( $geoip2_city->subdivisions ) && !empty( $geoip2_city->subdivisions[0]->name ) ? $geoip2_city->subdivisions[0]->name : '';
+            $region     = !empty($geoip2_city->subdivisions) && !empty($geoip2_city->subdivisions[0]->name) ? $geoip2_city->subdivisions[0]->name : '';
             $city       = $geoip2_city->city->name;
             $longitude  = $geoip2_city->location->longitude;
             $latitude   = $geoip2_city->location->latitude;
-            $credit     = __( 'Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing' );
-        } catch( Exception $e ) { }
+            $credit     = __('Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing');
+        } catch (Exception $e) { }
     }
     
-    if ( !( $iso && $longitude && $latitude ) && function_exists( 'simplexml_load_file' ) ) {
+    if (!($iso && $longitude && $latitude) && function_exists('simplexml_load_file')) {
         try {
-            $load_xml = simplexml_load_file( 'http://www.geoplugin.net/xml.gp?ip=' . $ip );
+            $load_xml = simplexml_load_file('http://www.geoplugin.net/xml.gp?ip=' . $ip);
             
-            if ( !empty( $load_xml ) && isset( $load_xml->geoplugin_countryCode ) && !empty( $load_xml->geoplugin_latitude ) && !empty( $load_xml->geoplugin_longitude ) ) {
+            if (!empty($load_xml) && isset($load_xml->geoplugin_countryCode) && !empty($load_xml->geoplugin_latitude) && !empty($load_xml->geoplugin_longitude)) {
                 $iso        = $load_xml->geoplugin_countryCode;
                 $country    = $load_xml->geoplugin_countryName;
-                $region     = !empty( $load_xml->geoplugin_regionName ) ? $load_xml->geoplugin_regionName : '';
-                $city       = !empty( $load_xml->geoplugin_city ) ? $load_xml->geoplugin_city : '';
+                $region     = !empty($load_xml->geoplugin_regionName) ? $load_xml->geoplugin_regionName : '';
+                $city       = !empty($load_xml->geoplugin_city) ? $load_xml->geoplugin_city : '';
                 $longitude  = $load_xml->geoplugin_longitude;
                 $latitude   = $load_xml->geoplugin_latitude;
                 $credit     = $load_xml->geoplugin_credit;
-                $credit     = __( 'Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing' ) . '<br>' . $load_xml->geoplugin_credit;
+                $credit     = __('Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing') . '<br>' . $load_xml->geoplugin_credit;
             }
-        } catch( Exception $e ) { }
+        } catch (Exception $e) { }
     }
     
-    if ( $iso && $longitude && $latitude ) {
-        if ( $city ) {
+    if ($iso && $longitude && $latitude) {
+        if ($city) {
             $address .= $city . ', ';
         }
         
-        if ( $region ) {
+        if ($region) {
             $address .= $region . ', ';
         }
         
         $address .= $country . ' (' . $iso . ')';
-        $content = '<p>'. sprintf( __( '<b>Address:</b> %s', 'invoicing' ), $address ) . '</p>';
-        $content .= '<p>'. $credit . '</p>';
+        $content = '<p>' . sprintf(__('<b>Address:</b> %s', 'invoicing'), $address) . '</p>';
+        $content .= '<p>' . $credit . '</p>';
     } else {
-        $content = '<p>'. sprintf( __( 'Unable to find geolocation for the IP address: %s', 'invoicing' ), $ip ) . '</p>';
+        $content = '<p>' . sprintf(__('Unable to find geolocation for the IP address: %s', 'invoicing'), $ip) . '</p>';
     }
     ?>
 <!DOCTYPE html>
-<html><head><title><?php echo sprintf( __( 'IP: %s', 'invoicing' ), $ip );?></title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.css" /><style>html,body{height:100%;margin:0;padding:0;width:100%}body{text-align:center;background:#fff;color:#222;font-size:small;}body,p{font-family: arial,sans-serif}#map{margin:auto;width:100%;height:calc(100% - 120px);min-height:240px}</style></head>
+<html><head><title><?php echo sprintf(__('IP: %s', 'invoicing'), $ip); ?></title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.css" /><style>html,body{height:100%;margin:0;padding:0;width:100%}body{text-align:center;background:#fff;color:#222;font-size:small;}body,p{font-family: arial,sans-serif}#map{margin:auto;width:100%;height:calc(100% - 120px);min-height:240px}</style></head>
 <body>
-    <?php if ( $latitude && $latitude ) { ?>
+    <?php if ($latitude && $latitude) { ?>
     <div id="map"></div>
         <script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.js"></script>
         <script type="text/javascript">
         var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
             osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
             osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
-            latlng = new L.LatLng(<?php echo $latitude;?>, <?php echo $longitude;?>);
+            latlng = new L.LatLng(<?php echo $latitude; ?>, <?php echo $longitude; ?>);
 
         var map = new L.Map('map', {center: latlng, zoom: 12, layers: [osm]});
 
         var marker = new L.Marker(latlng);
         map.addLayer(marker);
 
-        marker.bindPopup("<p><?php esc_attr_e( $address );?></p>");
+        marker.bindPopup("<p><?php esc_attr_e($address); ?></p>");
     </script>
     <?php } ?>
     <div style="height:100px"><?php echo $content; ?></div>
@@ -776,18 +776,18 @@ 
 <?php
     exit;
 }
-add_action( 'wp_ajax_wpinv_ip_geolocation', 'wpinv_ip_geolocation' );
-add_action( 'wp_ajax_nopriv_wpinv_ip_geolocation', 'wpinv_ip_geolocation' );
+add_action('wp_ajax_wpinv_ip_geolocation', 'wpinv_ip_geolocation');
+add_action('wp_ajax_nopriv_wpinv_ip_geolocation', 'wpinv_ip_geolocation');
 
 // Set up the template for the invoice.
-function wpinv_template( $template ) {
+function wpinv_template($template) {
     global $post, $wp_query;
     
-    if ( ( is_single() || is_404() ) && !empty( $post->ID ) && (get_post_type( $post->ID ) == 'wpi_invoice' or get_post_type( $post->ID ) == 'wpi_quote')) {
-        if ( wpinv_user_can_view_invoice( $post->ID ) ) {
-            $template = wpinv_get_template_part( 'wpinv-invoice-print', false, false );
+    if ((is_single() || is_404()) && !empty($post->ID) && (get_post_type($post->ID) == 'wpi_invoice' or get_post_type($post->ID) == 'wpi_quote')) {
+        if (wpinv_user_can_view_invoice($post->ID)) {
+            $template = wpinv_get_template_part('wpinv-invoice-print', false, false);
         } else {
-            $template = wpinv_get_template_part( 'wpinv-invalid-access', false, false );
+            $template = wpinv_get_template_part('wpinv-invalid-access', false, false);
         }
     }
 
@@ -796,7 +796,7 @@ 
 
 function wpinv_get_business_address() {
     $business_address   = wpinv_store_address();
-    $business_address   = !empty( $business_address ) ? wpautop( wp_kses_post( $business_address ) ) : '';
+    $business_address   = !empty($business_address) ? wpautop(wp_kses_post($business_address)) : '';
     
     /*
     $default_country    = wpinv_get_default_country();
@@ -820,7 +820,7 @@ 
     
     $business_address = $business_address ? '<div class="address">' . $business_address . '</div>' : '';
     
-    return apply_filters( 'wpinv_get_business_address', $business_address );
+    return apply_filters('wpinv_get_business_address', $business_address);
 }
 
 function wpinv_display_from_address() {
@@ -830,187 +830,187 @@ 
     if (empty($from_name)) {
         $from_name = wpinv_get_business_name();
     }
-    ?><div class="from col-xs-2"><strong><?php _e( 'From:', 'invoicing' ) ?></strong></div>
+    ?><div class="from col-xs-2"><strong><?php _e('From:', 'invoicing') ?></strong></div>
     <div class="wrapper col-xs-10">
-        <div class="name"><?php echo esc_html( $from_name ); ?></div>
-        <?php if ( $address = wpinv_get_business_address() ) { ?>
-        <div class="address"><?php echo wpautop( wp_kses_post( $address ) );?></div>
+        <div class="name"><?php echo esc_html($from_name); ?></div>
+        <?php if ($address = wpinv_get_business_address()) { ?>
+        <div class="address"><?php echo wpautop(wp_kses_post($address)); ?></div>
         <?php } ?>
-        <?php if ( $email_from = wpinv_mail_get_from_address() ) { ?>
-        <div class="email_from"><?php echo wp_sprintf( __( 'Email: %s', 'invoicing' ), $email_from );?></div>
+        <?php if ($email_from = wpinv_mail_get_from_address()) { ?>
+        <div class="email_from"><?php echo wp_sprintf(__('Email: %s', 'invoicing'), $email_from); ?></div>
         <?php } ?>
     </div>
     <?php
 }
 
-function wpinv_watermark( $id = 0 ) {
-    $output = wpinv_get_watermark( $id );
+function wpinv_watermark($id = 0) {
+    $output = wpinv_get_watermark($id);
     
-    return apply_filters( 'wpinv_get_watermark', $output, $id );
+    return apply_filters('wpinv_get_watermark', $output, $id);
 }
 
-function wpinv_get_watermark( $id ) {
-    if ( !$id > 0 ) {
+function wpinv_get_watermark($id) {
+    if (!$id > 0) {
         return NULL;
     }
-    $invoice = wpinv_get_invoice( $id );
+    $invoice = wpinv_get_invoice($id);
     
-    if ( !empty( $invoice ) && "wpi_invoice" === $invoice->post_type ) {
-        if ( $invoice->is_paid() ) {
-            return __( 'Paid', 'invoicing' );
+    if (!empty($invoice) && "wpi_invoice" === $invoice->post_type) {
+        if ($invoice->is_paid()) {
+            return __('Paid', 'invoicing');
         }
-        if ( $invoice->is_refunded() ) {
-            return __( 'Refunded', 'invoicing' );
+        if ($invoice->is_refunded()) {
+            return __('Refunded', 'invoicing');
         }
-        if ( $invoice->has_status( array( 'wpi-cancelled' ) ) ) {
-            return __( 'Cancelled', 'invoicing' );
+        if ($invoice->has_status(array('wpi-cancelled'))) {
+            return __('Cancelled', 'invoicing');
         }
     }
     
     return NULL;
 }
 
-function wpinv_display_invoice_details( $invoice ) {
+function wpinv_display_invoice_details($invoice) {
     global $wpinv_euvat;
     
     $invoice_id = $invoice->ID;
     $vat_name   = $wpinv_euvat->get_vat_name();
     $use_taxes  = wpinv_use_taxes();
     
-    $invoice_status = wpinv_get_invoice_status( $invoice_id );
+    $invoice_status = wpinv_get_invoice_status($invoice_id);
     ?>
     <table class="table table-bordered table-sm">
-        <?php if ( $invoice_number = wpinv_get_invoice_number( $invoice_id ) ) { ?>
+        <?php if ($invoice_number = wpinv_get_invoice_number($invoice_id)) { ?>
             <tr class="wpi-row-number">
-                <th><?php echo apply_filters( 'wpinv_invoice_number_label', __( 'Invoice Number', 'invoicing' ), $invoice ); ?></th>
-                <td><?php echo esc_html( $invoice_number ); ?></td>
+                <th><?php echo apply_filters('wpinv_invoice_number_label', __('Invoice Number', 'invoicing'), $invoice); ?></th>
+                <td><?php echo esc_html($invoice_number); ?></td>
             </tr>
         <?php } ?>
         <tr class="wpi-row-status">
-            <th><?php echo apply_filters( 'wpinv_invoice_status_label', __( 'Invoice Status', 'invoicing' ), $invoice ); ?></th>
-            <td><?php echo wpinv_invoice_status_label( $invoice_status, wpinv_get_invoice_status( $invoice_id, true ) ); ?></td>
+            <th><?php echo apply_filters('wpinv_invoice_status_label', __('Invoice Status', 'invoicing'), $invoice); ?></th>
+            <td><?php echo wpinv_invoice_status_label($invoice_status, wpinv_get_invoice_status($invoice_id, true)); ?></td>
         </tr>
-        <?php if ( $invoice->is_renewal() ) { ?>
+        <?php if ($invoice->is_renewal()) { ?>
         <tr class="wpi-row-parent">
-            <th><?php echo apply_filters( 'wpinv_invoice_parent_invoice_label', __( 'Parent Invoice', 'invoicing' ), $invoice ); ?></th>
-            <td><?php echo wpinv_invoice_link( $invoice->parent_invoice ); ?></td>
+            <th><?php echo apply_filters('wpinv_invoice_parent_invoice_label', __('Parent Invoice', 'invoicing'), $invoice); ?></th>
+            <td><?php echo wpinv_invoice_link($invoice->parent_invoice); ?></td>
         </tr>
         <?php } ?>
-        <?php if ( $gateway_name = wpinv_get_payment_gateway_name( $invoice_id ) ) { ?>
+        <?php if ($gateway_name = wpinv_get_payment_gateway_name($invoice_id)) { ?>
             <tr class="wpi-row-gateway">
-                <th><?php echo apply_filters( 'wpinv_invoice_payment_method_label', __( 'Payment Method', 'invoicing' ), $invoice ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_payment_method_label', __('Payment Method', 'invoicing'), $invoice); ?></th>
                 <td><?php echo $gateway_name; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $invoice_date = wpinv_get_invoice_date( $invoice_id ) ) { ?>
+        <?php if ($invoice_date = wpinv_get_invoice_date($invoice_id)) { ?>
             <tr class="wpi-row-date">
-                <th><?php echo apply_filters( 'wpinv_invoice_date_label', __( 'Invoice Date', 'invoicing' ), $invoice ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_date_label', __('Invoice Date', 'invoicing'), $invoice); ?></th>
                 <td><?php echo $invoice_date; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && $invoice->needs_payment() && ( $due_date = $invoice->get_due_date( true ) ) ) { ?>
+        <?php if (wpinv_get_option('overdue_active') && $invoice->needs_payment() && ($due_date = $invoice->get_due_date(true))) { ?>
             <tr class="wpi-row-date">
-                <th><?php echo apply_filters( 'wpinv_invoice_due_date_label', __( 'Due Date', 'invoicing' ), $invoice ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_due_date_label', __('Due Date', 'invoicing'), $invoice); ?></th>
                 <td><?php echo $due_date; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $owner_vat_number = $wpinv_euvat->get_vat_number() ) { ?>
+        <?php if ($owner_vat_number = $wpinv_euvat->get_vat_number()) { ?>
             <tr class="wpi-row-ovatno">
-                <th><?php echo apply_filters( 'wpinv_invoice_owner_vat_number_label', wp_sprintf( __( 'Owner %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_owner_vat_number_label', wp_sprintf(__('Owner %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></th>
                 <td><?php echo $owner_vat_number; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $use_taxes && $user_vat_number = wpinv_get_invoice_vat_number( $invoice_id ) ) { ?>
+        <?php if ($use_taxes && $user_vat_number = wpinv_get_invoice_vat_number($invoice_id)) { ?>
             <tr class="wpi-row-uvatno">
-                <th><?php echo apply_filters( 'wpinv_invoice_user_vat_number_label', wp_sprintf( __( 'Invoice %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_user_vat_number_label', wp_sprintf(__('Invoice %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></th>
                 <td><?php echo $user_vat_number; ?></td>
             </tr>
         <?php } ?>
         <tr class="table-active tr-total wpi-row-total">
-            <th><strong><?php _e( 'Total Amount', 'invoicing' ) ?></strong></th>
-            <td><strong><?php echo wpinv_payment_total( $invoice_id, true ); ?></strong></td>
+            <th><strong><?php _e('Total Amount', 'invoicing') ?></strong></th>
+            <td><strong><?php echo wpinv_payment_total($invoice_id, true); ?></strong></td>
         </tr>
     </table>
 <?php
 }
 
-function wpinv_display_to_address( $invoice_id = 0 ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_display_to_address($invoice_id = 0) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $billing_details = $invoice->get_user_info();
-    $output = '<div class="to col-xs-2"><strong>' . __( 'To:', 'invoicing' ) . '</strong></div>';
+    $output = '<div class="to col-xs-2"><strong>' . __('To:', 'invoicing') . '</strong></div>';
     $output .= '<div class="wrapper col-xs-10">';
     
     ob_start();
-    do_action( 'wpinv_display_to_address_top', $invoice );
+    do_action('wpinv_display_to_address_top', $invoice);
     $output .= ob_get_clean();
     
-    $output .= '<div class="name">' . esc_html( trim( $billing_details['first_name'] . ' ' . $billing_details['last_name'] ) ) . '</div>';
-    if ( $company = $billing_details['company'] ) {
-        $output .= '<div class="company">' . wpautop( wp_kses_post( $company ) ) . '</div>';
+    $output .= '<div class="name">' . esc_html(trim($billing_details['first_name'] . ' ' . $billing_details['last_name'])) . '</div>';
+    if ($company = $billing_details['company']) {
+        $output .= '<div class="company">' . wpautop(wp_kses_post($company)) . '</div>';
     }
     $address_row = '';
-    if ( $address = $billing_details['address'] ) {
-        $address_row .= wpautop( wp_kses_post( $address ) );
+    if ($address = $billing_details['address']) {
+        $address_row .= wpautop(wp_kses_post($address));
     }
     
     $address_fields = array();
-    if ( !empty( $billing_details['city'] ) ) {
+    if (!empty($billing_details['city'])) {
         $address_fields[] = $billing_details['city'];
     }
     
-    $billing_country = !empty( $billing_details['country'] ) ? $billing_details['country'] : '';
-    if ( !empty( $billing_details['state'] ) ) {
-        $address_fields[] = wpinv_state_name( $billing_details['state'], $billing_country );
+    $billing_country = !empty($billing_details['country']) ? $billing_details['country'] : '';
+    if (!empty($billing_details['state'])) {
+        $address_fields[] = wpinv_state_name($billing_details['state'], $billing_country);
     }
     
-    if ( !empty( $billing_country ) ) {
-        $address_fields[] = wpinv_country_name( $billing_country );
+    if (!empty($billing_country)) {
+        $address_fields[] = wpinv_country_name($billing_country);
     }
     
-    if ( !empty( $address_fields ) ) {
-        $address_fields = implode( ", ", $address_fields );
+    if (!empty($address_fields)) {
+        $address_fields = implode(", ", $address_fields);
         
-        if ( !empty( $billing_details['zip'] ) ) {
+        if (!empty($billing_details['zip'])) {
             $address_fields .= ' ' . $billing_details['zip'];
         }
         
-        $address_row .= wpautop( wp_kses_post( $address_fields ) );
+        $address_row .= wpautop(wp_kses_post($address_fields));
     }
     
-    if ( $address_row ) {
+    if ($address_row) {
         $output .= '<div class="address">' . $address_row . '</div>';
     }
     
-    if ( $phone = $invoice->get_phone() ) {
-        $output .= '<div class="phone">' . wp_sprintf( __( 'Phone: %s', 'invoicing' ), esc_html( $phone ) ) . '</div>';
+    if ($phone = $invoice->get_phone()) {
+        $output .= '<div class="phone">' . wp_sprintf(__('Phone: %s', 'invoicing'), esc_html($phone)) . '</div>';
     }
-    if ( $email = $invoice->get_email() ) {
-        $output .= '<div class="email">' . wp_sprintf( __( 'Email: %s' , 'invoicing'), esc_html( $email ) ) . '</div>';
+    if ($email = $invoice->get_email()) {
+        $output .= '<div class="email">' . wp_sprintf(__('Email: %s', 'invoicing'), esc_html($email)) . '</div>';
     }
     
     ob_start();
-    do_action( 'wpinv_display_to_address_bottom', $invoice );
+    do_action('wpinv_display_to_address_bottom', $invoice);
     $output .= ob_get_clean();
     
     $output .= '</div>';
-    $output = apply_filters( 'wpinv_display_to_address', $output, $invoice );
+    $output = apply_filters('wpinv_display_to_address', $output, $invoice);
 
     echo $output;
 }
 
-function wpinv_display_line_items( $invoice_id = 0 ) {
+function wpinv_display_line_items($invoice_id = 0) {
     global $wpinv_euvat, $ajax_cart_details;
-    $invoice            = wpinv_get_invoice( $invoice_id );
+    $invoice            = wpinv_get_invoice($invoice_id);
     $quantities_enabled = wpinv_item_quantities_enabled();
     $use_taxes          = wpinv_use_taxes();
     $zero_tax           = !(float)$invoice->get_tax() > 0 ? true : false;
-    $tax_label           = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __( 'Tax', 'invoicing' );
-    $tax_title          = !$zero_tax && $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+    $tax_label = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __('Tax', 'invoicing');
+    $tax_title          = !$zero_tax && $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
     
     $cart_details       = $invoice->get_cart_details();
     $ajax_cart_details  = $cart_details;
@@ -1019,68 +1019,68 @@ 
     <table class="table table-sm table-bordered table-responsive">
         <thead>
             <tr>
-                <th class="name"><strong><?php _e( "Item Name", "invoicing" );?></strong></th>
-                <th class="rate"><strong><?php _e( "Price", "invoicing" );?></strong></th>
+                <th class="name"><strong><?php _e("Item Name", "invoicing"); ?></strong></th>
+                <th class="rate"><strong><?php _e("Price", "invoicing"); ?></strong></th>
                 <?php if ($quantities_enabled) { ?>
-                    <th class="qty"><strong><?php _e( "Qty", "invoicing" );?></strong></th>
+                    <th class="qty"><strong><?php _e("Qty", "invoicing"); ?></strong></th>
                 <?php } ?>
                 <?php if ($use_taxes && !$zero_tax) { ?>
                     <th class="tax"><strong><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></strong></th>
                 <?php } ?>
-                <th class="total"><strong><?php echo __( "Item Total", "invoicing" ) . ' <span class="normal small">' . $tax_title . '<span>';?></strong></th>
+                <th class="total"><strong><?php echo __("Item Total", "invoicing") . ' <span class="normal small">' . $tax_title . '<span>'; ?></strong></th>
             </tr>
         </thead>
         <tbody>
         <?php 
-            if ( !empty( $cart_details ) ) {
-                do_action( 'wpinv_display_line_items_start', $invoice );
+            if (!empty($cart_details)) {
+                do_action('wpinv_display_line_items_start', $invoice);
                 
                 $count = 0;
                 $cols  = 3;
-                foreach ( $cart_details as $key => $cart_item ) {
-                    $item_id    = !empty($cart_item['id']) ? absint( $cart_item['id'] ) : '';
-                    $item_price = isset($cart_item["item_price"]) ? wpinv_round_amount( $cart_item["item_price"] ) : 0;
-                    $line_total = isset($cart_item["subtotal"]) ? wpinv_round_amount( $cart_item["subtotal"] ) : 0;
-                    $quantity   = !empty($cart_item['quantity']) && (int)$cart_item['quantity'] > 0 ? absint( $cart_item['quantity'] ) : 1;
+                foreach ($cart_details as $key => $cart_item) {
+                    $item_id    = !empty($cart_item['id']) ? absint($cart_item['id']) : '';
+                    $item_price = isset($cart_item["item_price"]) ? wpinv_round_amount($cart_item["item_price"]) : 0;
+                    $line_total = isset($cart_item["subtotal"]) ? wpinv_round_amount($cart_item["subtotal"]) : 0;
+                    $quantity   = !empty($cart_item['quantity']) && (int)$cart_item['quantity'] > 0 ? absint($cart_item['quantity']) : 1;
                     
-                    $item       = $item_id ? new WPInv_Item( $item_id ) : NULL;
+                    $item       = $item_id ? new WPInv_Item($item_id) : NULL;
                     $summary    = '';
                     $cols       = 3;
-                    if ( !empty($item) ) {
+                    if (!empty($item)) {
                         $item_name  = $item->get_name();
                         $summary    = $item->get_summary();
                     }
-                    $item_name  = !empty($cart_item['name']) ? $cart_item['name'] : $item_name;
+                    $item_name = !empty($cart_item['name']) ? $cart_item['name'] : $item_name;
                     
                     if (!empty($item) && $item->is_package() && !empty($cart_item['meta']['post_id'])) {
-                        $post_link = '<a href="' . get_edit_post_link( $cart_item['meta']['post_id'] ) .'" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title( $cart_item['meta']['post_id']) ) . '</a>';
-                        $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $item->get_custom_singular_name(), $post_link );
+                        $post_link = '<a href="' . get_edit_post_link($cart_item['meta']['post_id']) . '" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title($cart_item['meta']['post_id'])) . '</a>';
+                        $summary = wp_sprintf(__('%s: %s', 'invoicing'), $item->get_custom_singular_name(), $post_link);
                     }
-                    $summary = apply_filters( 'wpinv_print_invoice_line_item_summary', $summary, $cart_item, $item, $invoice );
+                    $summary = apply_filters('wpinv_print_invoice_line_item_summary', $summary, $cart_item, $item, $invoice);
                     
                     $item_tax       = '';
                     $tax_rate       = '';
-                    if ( $use_taxes && $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0 ) {
-                        $item_tax = wpinv_price( wpinv_format_amount( $cart_item['tax'] ) );
-                        $tax_rate = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : ( $cart_item['tax'] / $cart_item['subtotal'] ) * 100;
-                        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+                    if ($use_taxes && $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0) {
+                        $item_tax = wpinv_price(wpinv_format_amount($cart_item['tax']));
+                        $tax_rate = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : ($cart_item['tax'] / $cart_item['subtotal']) * 100;
+                        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount($tax_rate, 4) : '';
                         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate">(' . $tax_rate . '%)</small>' : '';
                     }
                     
                     $line_item_tax = $item_tax . $tax_rate;
                     
-                    if ( $line_item_tax === '' ) {
+                    if ($line_item_tax === '') {
                         $line_item_tax = 0; // Zero tax
                     }
                     
-                    $line_item = '<tr class="row-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . ' wpinv-item">';
-                        $line_item .= '<td class="name">' . esc_html__( $item_name, 'invoicing' ) . wpinv_get_item_suffix( $item );
-                        if ( $summary !== '' ) {
-                            $line_item .= '<br/><small class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</small>';
+                    $line_item = '<tr class="row-' . (($count % 2 == 0) ? 'even' : 'odd') . ' wpinv-item">';
+                        $line_item .= '<td class="name">' . esc_html__($item_name, 'invoicing') . wpinv_get_item_suffix($item);
+                        if ($summary !== '') {
+                            $line_item .= '<br/><small class="meta">' . wpautop(wp_kses_post($summary)) . '</small>';
                         }
                         $line_item .= '</td>';
                         
-                        $line_item .= '<td class="rate">' . esc_html__( wpinv_price( wpinv_format_amount( $item_price ), $invoice->get_currency() ) ) . '</td>';
+                        $line_item .= '<td class="rate">' . esc_html__(wpinv_price(wpinv_format_amount($item_price), $invoice->get_currency())) . '</td>';
                         if ($quantities_enabled) {
                             $cols++;
                             $line_item .= '<td class="qty">' . $quantity . '</td>';
@@ -1089,55 +1089,55 @@ 
                             $cols++;
                             $line_item .= '<td class="tax">' . $line_item_tax . '</td>';
                         }
-                        $line_item .= '<td class="total">' . esc_html__( wpinv_price( wpinv_format_amount( $line_total ), $invoice->get_currency() ) ) . '</td>';
+                        $line_item .= '<td class="total">' . esc_html__(wpinv_price(wpinv_format_amount($line_total), $invoice->get_currency())) . '</td>';
                     $line_item .= '</tr>';
                     
-                    echo apply_filters( 'wpinv_display_line_item', $line_item, $cart_item, $invoice, $cols );
+                    echo apply_filters('wpinv_display_line_item', $line_item, $cart_item, $invoice, $cols);
 
                     $count++;
                 }
                 
-                do_action( 'wpinv_display_before_subtotal', $invoice, $cols );
+                do_action('wpinv_display_before_subtotal', $invoice, $cols);
                 ?>
                 <tr class="row-sub-total row_odd">
-                    <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_subtotal_label', '<strong>' . __( 'Sub Total', 'invoicing' ) . ':</strong>', $invoice ); ?></td>
-                    <td class="total"><strong><?php _e( wpinv_subtotal( $invoice_id, true ) ) ?></strong></td>
+                    <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_subtotal_label', '<strong>' . __('Sub Total', 'invoicing') . ':</strong>', $invoice); ?></td>
+                    <td class="total"><strong><?php _e(wpinv_subtotal($invoice_id, true)) ?></strong></td>
                 </tr>
                 <?php
-                do_action( 'wpinv_display_after_subtotal', $invoice, $cols );
+                do_action('wpinv_display_after_subtotal', $invoice, $cols);
                 
-                if ( wpinv_discount( $invoice_id, false ) > 0 ) {
-                    do_action( 'wpinv_display_before_discount', $invoice, $cols );
+                if (wpinv_discount($invoice_id, false) > 0) {
+                    do_action('wpinv_display_before_discount', $invoice, $cols);
                     ?>
                         <tr class="row-discount">
-                            <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?>:</td>
-                            <td class="total"><?php echo wpinv_discount( $invoice_id, true, true ); ?></td>
+                            <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?>:</td>
+                            <td class="total"><?php echo wpinv_discount($invoice_id, true, true); ?></td>
                         </tr>
                     <?php
-                    do_action( 'wpinv_display_after_discount', $invoice, $cols );
+                    do_action('wpinv_display_after_discount', $invoice, $cols);
                 }
                 
-                if ( $use_taxes ) {
-                    do_action( 'wpinv_display_before_tax', $invoice, $cols );
+                if ($use_taxes) {
+                    do_action('wpinv_display_before_tax', $invoice, $cols);
                     ?>
                     <tr class="row-tax">
-                        <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_tax_label', '<strong>' . $tax_label . ':</strong>', $invoice ); ?></td>
-                        <td class="total"><?php _e( wpinv_tax( $invoice_id, true ) ) ?></td>
+                        <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_tax_label', '<strong>' . $tax_label . ':</strong>', $invoice); ?></td>
+                        <td class="total"><?php _e(wpinv_tax($invoice_id, true)) ?></td>
                     </tr>
                     <?php
-                    do_action( 'wpinv_display_after_tax', $invoice, $cols );
+                    do_action('wpinv_display_after_tax', $invoice, $cols);
                 }
                 
-                do_action( 'wpinv_display_before_total', $invoice, $cols );
+                do_action('wpinv_display_before_total', $invoice, $cols);
                 ?>
                 <tr class="table-active row-total">
-                    <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?></td>
-                    <td class="total"><strong><?php _e( wpinv_payment_total( $invoice_id, true ) ) ?></strong></td>
+                    <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?></td>
+                    <td class="total"><strong><?php _e(wpinv_payment_total($invoice_id, true)) ?></strong></td>
                 </tr>
                 <?php
-                do_action( 'wpinv_display_after_total', $invoice, $cols );
+                do_action('wpinv_display_after_total', $invoice, $cols);
                 
-                do_action( 'wpinv_display_line_end', $invoice, $cols );
+                do_action('wpinv_display_line_end', $invoice, $cols);
             }
         ?>
         </tbody>
@@ -1146,35 +1146,35 @@ 
     echo ob_get_clean();
 }
 
-function wpinv_display_invoice_totals( $invoice_id = 0 ) {    
+function wpinv_display_invoice_totals($invoice_id = 0) {    
     $use_taxes = wpinv_use_taxes();
     
-    do_action( 'wpinv_before_display_totals_table', $invoice_id ); 
+    do_action('wpinv_before_display_totals_table', $invoice_id); 
     ?>
     <table class="table table-sm table-bordered table-responsive">
         <tbody>
-            <?php do_action( 'wpinv_before_display_totals' ); ?>
+            <?php do_action('wpinv_before_display_totals'); ?>
             <tr class="row-sub-total">
-                <td class="rate"><strong><?php _e( 'Sub Total', 'invoicing' ); ?></strong></td>
-                <td class="total"><strong><?php _e( wpinv_subtotal( $invoice_id, true ) ) ?></strong></td>
+                <td class="rate"><strong><?php _e('Sub Total', 'invoicing'); ?></strong></td>
+                <td class="total"><strong><?php _e(wpinv_subtotal($invoice_id, true)) ?></strong></td>
             </tr>
-            <?php do_action( 'wpinv_after_display_totals' ); ?>
-            <?php if ( wpinv_discount( $invoice_id, false ) > 0 ) { ?>
+            <?php do_action('wpinv_after_display_totals'); ?>
+            <?php if (wpinv_discount($invoice_id, false) > 0) { ?>
                 <tr class="row-discount">
-                    <td class="rate"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?></td>
-                    <td class="total"><?php echo wpinv_discount( $invoice_id, true, true ); ?></td>
+                    <td class="rate"><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?></td>
+                    <td class="total"><?php echo wpinv_discount($invoice_id, true, true); ?></td>
                 </tr>
-            <?php do_action( 'wpinv_after_display_discount' ); ?>
+            <?php do_action('wpinv_after_display_discount'); ?>
             <?php } ?>
-            <?php if ( $use_taxes ) { ?>
+            <?php if ($use_taxes) { ?>
             <tr class="row-tax">
-                <td class="rate"><?php _e( 'Tax', 'invoicing' ); ?></td>
-                <td class="total"><?php _e( wpinv_tax( $invoice_id, true ) ) ?></td>
+                <td class="rate"><?php _e('Tax', 'invoicing'); ?></td>
+                <td class="total"><?php _e(wpinv_tax($invoice_id, true)) ?></td>
             </tr>
-            <?php do_action( 'wpinv_after_display_tax' ); ?>
+            <?php do_action('wpinv_after_display_tax'); ?>
             <?php } ?>
-            <?php if ( $fees = wpinv_get_fees( $invoice_id ) ) { ?>
-                <?php foreach ( $fees as $fee ) { ?>
+            <?php if ($fees = wpinv_get_fees($invoice_id)) { ?>
+                <?php foreach ($fees as $fee) { ?>
                     <tr class="row-fee">
                         <td class="rate"><?php echo $fee['label']; ?></td>
                         <td class="total"><?php echo $fee['amount_display']; ?></td>
@@ -1182,73 +1182,73 @@ 
                 <?php } ?>
             <?php } ?>
             <tr class="table-active row-total">
-                <td class="rate"><strong><?php _e( 'Total', 'invoicing' ) ?></strong></td>
-                <td class="total"><strong><?php _e( wpinv_payment_total( $invoice_id, true ) ) ?></strong></td>
+                <td class="rate"><strong><?php _e('Total', 'invoicing') ?></strong></td>
+                <td class="total"><strong><?php _e(wpinv_payment_total($invoice_id, true)) ?></strong></td>
             </tr>
-            <?php do_action( 'wpinv_after_totals' ); ?>
+            <?php do_action('wpinv_after_totals'); ?>
         </tbody>
 
     </table>
 
-    <?php do_action( 'wpinv_after_totals_table' );
+    <?php do_action('wpinv_after_totals_table');
 }
 
-function wpinv_display_payments_info( $invoice_id = 0, $echo = true ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_display_payments_info($invoice_id = 0, $echo = true) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
     ob_start();
-    do_action( 'wpinv_before_display_payments_info', $invoice_id );
-    if ( ( $gateway_title = $invoice->get_gateway_title() ) || $invoice->is_paid() || $invoice->is_refunded() ) {
+    do_action('wpinv_before_display_payments_info', $invoice_id);
+    if (($gateway_title = $invoice->get_gateway_title()) || $invoice->is_paid() || $invoice->is_refunded()) {
         ?>
         <div class="wpi-payment-info">
-            <p class="wpi-payment-gateway"><?php echo wp_sprintf( __( 'Payment via %s', 'invoicing' ), $gateway_title ? $gateway_title : __( 'Manually', 'invoicing' ) ); ?></p>
-            <?php if ( $gateway_title ) { ?>
-            <p class="wpi-payment-transid"><?php echo wp_sprintf( __( 'Transaction ID: %s', 'invoicing' ), $invoice->get_transaction_id() ); ?></p>
+            <p class="wpi-payment-gateway"><?php echo wp_sprintf(__('Payment via %s', 'invoicing'), $gateway_title ? $gateway_title : __('Manually', 'invoicing')); ?></p>
+            <?php if ($gateway_title) { ?>
+            <p class="wpi-payment-transid"><?php echo wp_sprintf(__('Transaction ID: %s', 'invoicing'), $invoice->get_transaction_id()); ?></p>
             <?php } ?>
         </div>
         <?php
     }
-    do_action( 'wpinv_after_display_payments_info', $invoice_id );
+    do_action('wpinv_after_display_payments_info', $invoice_id);
     $outout = ob_get_clean();
     
-    if ( $echo ) {
+    if ($echo) {
         echo $outout;
     } else {
         return $outout;
     }
 }
 
-function wpinv_display_style( $invoice ) {
-    wp_register_style( 'wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), WPINV_VERSION );
+function wpinv_display_style($invoice) {
+    wp_register_style('wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), WPINV_VERSION);
     
-    wp_print_styles( 'open-sans' );
-    wp_print_styles( 'wpinv-single-style' );
+    wp_print_styles('open-sans');
+    wp_print_styles('wpinv-single-style');
 }
-add_action( 'wpinv_invoice_print_head', 'wpinv_display_style' );
-add_action( 'wpinv_invalid_invoice_head', 'wpinv_display_style' );
+add_action('wpinv_invoice_print_head', 'wpinv_display_style');
+add_action('wpinv_invalid_invoice_head', 'wpinv_display_style');
 
 function wpinv_checkout_billing_details() {  
     $invoice_id = (int)wpinv_get_invoice_cart_id();
     if (empty($invoice_id)) {
-        wpinv_error_log( 'Invoice id not found', 'ERROR', __FILE__, __LINE__ );
+        wpinv_error_log('Invoice id not found', 'ERROR', __FILE__, __LINE__);
         return null;
     }
     
-    $invoice = wpinv_get_invoice_cart( $invoice_id );
+    $invoice = wpinv_get_invoice_cart($invoice_id);
     if (empty($invoice)) {
-        wpinv_error_log( 'Invoice not found', 'ERROR', __FILE__, __LINE__ );
+        wpinv_error_log('Invoice not found', 'ERROR', __FILE__, __LINE__);
         return null;
     }
     $user_id        = $invoice->get_user_id();
     $user_info      = $invoice->get_user_info();
-    $address_info   = wpinv_get_user_address( $user_id );
+    $address_info   = wpinv_get_user_address($user_id);
     
-    if ( empty( $user_info['first_name'] ) && !empty( $user_info['first_name'] ) ) {
+    if (empty($user_info['first_name']) && !empty($user_info['first_name'])) {
         $user_info['first_name'] = $user_info['first_name'];
         $user_info['last_name'] = $user_info['last_name'];
     }
     
-    if ( ( ( empty( $user_info['country'] ) && !empty( $address_info['country'] ) ) || ( empty( $user_info['state'] ) && !empty( $address_info['state'] ) && $user_info['country'] == $address_info['country'] ) ) ) {
+    if (((empty($user_info['country']) && !empty($address_info['country'])) || (empty($user_info['state']) && !empty($address_info['state']) && $user_info['country'] == $address_info['country']))) {
         $user_info['country']   = $address_info['country'];
         $user_info['state']     = $address_info['state'];
         $user_info['city']      = $address_info['city'];
@@ -1264,103 +1264,103 @@ 
         'address'
     );
     
-    foreach ( $address_fields as $field ) {
-        if ( empty( $user_info[$field] ) ) {
+    foreach ($address_fields as $field) {
+        if (empty($user_info[$field])) {
             $user_info[$field] = $address_info[$field];
         }
     }
     
-    return apply_filters( 'wpinv_checkout_billing_details', $user_info, $invoice );
+    return apply_filters('wpinv_checkout_billing_details', $user_info, $invoice);
 }
 
 function wpinv_admin_get_line_items($invoice = array()) {
     $item_quantities    = wpinv_item_quantities_enabled();
     $use_taxes          = wpinv_use_taxes();
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $cart_items = $invoice->get_cart_details();
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return NULL;
     }
     ob_start();
     
-    do_action( 'wpinv_admin_before_line_items', $cart_items, $invoice );
+    do_action('wpinv_admin_before_line_items', $cart_items, $invoice);
     
     $count = 0;
-    foreach ( $cart_items as $key => $cart_item ) {
+    foreach ($cart_items as $key => $cart_item) {
         $item_id    = $cart_item['id'];
-        $wpi_item   = $item_id > 0 ? new WPInv_Item( $item_id ) : NULL;
+        $wpi_item   = $item_id > 0 ? new WPInv_Item($item_id) : NULL;
         
         if (empty($wpi_item)) {
             continue;
         }
         
-        $item_price     = wpinv_price( wpinv_format_amount( $cart_item['item_price'] ) );
-        $quantity       = !empty( $cart_item['quantity'] ) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
-        $item_subtotal  = wpinv_price( wpinv_format_amount( $cart_item['subtotal'] ) );
+        $item_price     = wpinv_price(wpinv_format_amount($cart_item['item_price']));
+        $quantity       = !empty($cart_item['quantity']) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
+        $item_subtotal  = wpinv_price(wpinv_format_amount($cart_item['subtotal']));
         $can_remove     = true;
         
         $summary = '';
         if ($wpi_item->is_package() && !empty($cart_item['meta']['post_id'])) {
-            $post_link = '<a href="' . get_edit_post_link( $cart_item['meta']['post_id'] ) .'" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title( $cart_item['meta']['post_id']) ) . '</a>';
-            $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $wpi_item->get_custom_singular_name(), $post_link );
+            $post_link = '<a href="' . get_edit_post_link($cart_item['meta']['post_id']) . '" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title($cart_item['meta']['post_id'])) . '</a>';
+            $summary = wp_sprintf(__('%s: %s', 'invoicing'), $wpi_item->get_custom_singular_name(), $post_link);
         }
-        $summary = apply_filters( 'wpinv_admin_invoice_line_item_summary', $summary, $cart_item, $wpi_item, $invoice );
+        $summary = apply_filters('wpinv_admin_invoice_line_item_summary', $summary, $cart_item, $wpi_item, $invoice);
         
         $item_tax       = '';
         $tax_rate       = '';
-        if ( $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0 ) {
-            $item_tax = wpinv_price( wpinv_format_amount( $cart_item['tax'] ) );
-            $tax_rate = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : ( $cart_item['tax'] / $cart_item['subtotal'] ) * 100;
-            $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+        if ($cart_item['tax'] > 0 && $cart_item['subtotal'] > 0) {
+            $item_tax = wpinv_price(wpinv_format_amount($cart_item['tax']));
+            $tax_rate = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : ($cart_item['tax'] / $cart_item['subtotal']) * 100;
+            $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount($tax_rate, 4) : '';
             $tax_rate = $tax_rate != '' ? ' <span class="tax-rate">(' . $tax_rate . '%)</span>' : '';
         }
         $line_item_tax = $item_tax . $tax_rate;
         
-        if ( $line_item_tax === '' ) {
+        if ($line_item_tax === '') {
             $line_item_tax = 0; // Zero tax
         }
 
-        $line_item = '<tr class="item item-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . '" data-item-id="' . $item_id . '">';
+        $line_item = '<tr class="item item-' . (($count % 2 == 0) ? 'even' : 'odd') . '" data-item-id="' . $item_id . '">';
             $line_item .= '<td class="id">' . $item_id . '</td>';
-            $line_item .= '<td class="title"><a href="' . get_edit_post_link( $item_id ) . '" target="_blank">' . $cart_item['name'] . '</a>' . wpinv_get_item_suffix( $wpi_item );
-            if ( $summary !== '' ) {
-                $line_item .= '<span class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</span>';
+            $line_item .= '<td class="title"><a href="' . get_edit_post_link($item_id) . '" target="_blank">' . $cart_item['name'] . '</a>' . wpinv_get_item_suffix($wpi_item);
+            if ($summary !== '') {
+                $line_item .= '<span class="meta">' . wpautop(wp_kses_post($summary)) . '</span>';
             }
             $line_item .= '</td>';
             $line_item .= '<td class="price">' . $item_price . '</td>';
             
-            if ( $item_quantities ) {
-                if ( count( $cart_items ) == 1 && $quantity <= 1 ) {
+            if ($item_quantities) {
+                if (count($cart_items) == 1 && $quantity <= 1) {
                     $can_remove = false;
                 }
                 $line_item .= '<td class="qty" data-quantity="' . $quantity . '">&nbsp;&times;&nbsp;' . $quantity . '</td>';
             } else {
-                if ( count( $cart_items ) == 1 ) {
+                if (count($cart_items) == 1) {
                     $can_remove = false;
                 }
             }
             $line_item .= '<td class="total">' . $item_subtotal . '</td>';
             
-            if ( $use_taxes ) {
+            if ($use_taxes) {
                 $line_item .= '<td class="tax">' . $line_item_tax . '</td>';
             }
             $line_item .= '<td class="action">';
-            if ( !$invoice->is_paid() && !$invoice->is_refunded() && $can_remove ) {
+            if (!$invoice->is_paid() && !$invoice->is_refunded() && $can_remove) {
                 $line_item .= '<i class="fa fa-remove wpinv-item-remove"></i>';
             }
             $line_item .= '</td>';
         $line_item .= '</tr>';
         
-        echo apply_filters( 'wpinv_admin_line_item', $line_item, $cart_item, $invoice );
+        echo apply_filters('wpinv_admin_line_item', $line_item, $cart_item, $invoice);
         
         $count++;
     } 
     
-    do_action( 'wpinv_admin_after_line_items', $cart_items, $invoice );
+    do_action('wpinv_admin_after_line_items', $cart_items, $invoice);
     
     return ob_get_clean();
 }
@@ -1371,35 +1371,35 @@ 
     // Set current invoice id.
     $wpi_checkout_id = wpinv_get_invoice_cart_id();
     
-    $form_action  = esc_url( wpinv_get_checkout_uri() );
+    $form_action = esc_url(wpinv_get_checkout_uri());
 
     ob_start();
         echo '<div id="wpinv_checkout_wrap">';
         
-        if ( wpinv_get_cart_contents() || wpinv_cart_has_fees() ) {
+        if (wpinv_get_cart_contents() || wpinv_cart_has_fees()) {
             ?>
             <div id="wpinv_checkout_form_wrap" class="wpinv_clearfix table-responsive">
-                <?php do_action( 'wpinv_before_checkout_form' ); ?>
+                <?php do_action('wpinv_before_checkout_form'); ?>
                 <form id="wpinv_checkout_form" class="wpi-form" action="<?php echo $form_action; ?>" method="POST">
                     <?php
-                    do_action( 'wpinv_checkout_form_top' );
-                    do_action( 'wpinv_checkout_billing_info' );
-                    do_action( 'wpinv_checkout_cart' );
-                    do_action( 'wpinv_payment_mode_select'  );
-                    do_action( 'wpinv_checkout_form_bottom' )
+                    do_action('wpinv_checkout_form_top');
+                    do_action('wpinv_checkout_billing_info');
+                    do_action('wpinv_checkout_cart');
+                    do_action('wpinv_payment_mode_select');
+                    do_action('wpinv_checkout_form_bottom')
                     ?>
                 </form>
-                <?php do_action( 'wpinv_after_purchase_form' ); ?>
+                <?php do_action('wpinv_after_purchase_form'); ?>
             </div><!--end #wpinv_checkout_form_wrap-->
         <?php
         } else {
-            do_action( 'wpinv_cart_empty' );
+            do_action('wpinv_cart_empty');
         }
         echo '</div><!--end #wpinv_checkout_wrap-->';
     return ob_get_clean();
 }
 
-function wpinv_checkout_cart( $cart_details = array(), $echo = true ) {
+function wpinv_checkout_cart($cart_details = array(), $echo = true) {
     global $ajax_cart_details;
     $ajax_cart_details = $cart_details;
     /*
@@ -1414,25 +1414,25 @@ 
     }
     */
     ob_start();
-    do_action( 'wpinv_before_checkout_cart' );
+    do_action('wpinv_before_checkout_cart');
     echo '<div id="wpinv_checkout_cart_form" method="post">';
         echo '<div id="wpinv_checkout_cart_wrap">';
-            wpinv_get_template_part( 'wpinv-checkout-cart' );
+            wpinv_get_template_part('wpinv-checkout-cart');
         echo '</div>';
     echo '</div>';
-    do_action( 'wpinv_after_checkout_cart' );
+    do_action('wpinv_after_checkout_cart');
     $content = ob_get_clean();
     
-    if ( $echo ) {
+    if ($echo) {
         echo $content;
     } else {
         return $content;
     }
 }
-add_action( 'wpinv_checkout_cart', 'wpinv_checkout_cart', 10 );
+add_action('wpinv_checkout_cart', 'wpinv_checkout_cart', 10);
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+	return apply_filters('wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __('Your cart is empty.', 'invoicing') . '</span>');
 }
 
 /**
@@ -1444,91 +1444,91 @@ 
 function wpinv_empty_checkout_cart() {
 	echo wpinv_empty_cart_message();
 }
-add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
+add_action('wpinv_cart_empty', 'wpinv_empty_checkout_cart');
 
 function wpinv_save_cart_button() {
-    if ( wpinv_is_cart_saving_disabled() )
+    if (wpinv_is_cart_saving_disabled())
         return;
 ?>
-    <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url( add_query_arg( 'wpi_action', 'save_cart' ) ); ?>"><?php _e( 'Save Cart', 'invoicing' ); ?></a>
+    <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url(add_query_arg('wpi_action', 'save_cart')); ?>"><?php _e('Save Cart', 'invoicing'); ?></a>
 <?php
 }
 
 function wpinv_update_cart_button() {
-    if ( !wpinv_item_quantities_enabled() )
+    if (!wpinv_item_quantities_enabled())
         return;
 ?>
-    <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e( 'Update Cart', 'invoicing' ); ?>"/>
+    <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e('Update Cart', 'invoicing'); ?>"/>
     <input type="hidden" name="wpi_action" value="update_cart"/>
 <?php
 }
 
 function wpinv_checkout_cart_columns() {
     $default = 3;
-    if ( wpinv_item_quantities_enabled() ) {
+    if (wpinv_item_quantities_enabled()) {
         $default++;
     }
     
-    if ( wpinv_use_taxes() ) {
+    if (wpinv_use_taxes()) {
         $default++;
     }
 
-    return apply_filters( 'wpinv_checkout_cart_columns', $default );
+    return apply_filters('wpinv_checkout_cart_columns', $default);
 }
 
 function wpinv_display_cart_messages() {
     global $wpi_session;
 
-    $messages = $wpi_session->get( 'wpinv_cart_messages' );
+    $messages = $wpi_session->get('wpinv_cart_messages');
 
-    if ( $messages ) {
-        foreach ( $messages as $message_id => $message ) {
+    if ($messages) {
+        foreach ($messages as $message_id => $message) {
             // Try and detect what type of message this is
-            if ( strpos( strtolower( $message ), 'error' ) ) {
+            if (strpos(strtolower($message), 'error')) {
                 $type = 'error';
-            } elseif ( strpos( strtolower( $message ), 'success' ) ) {
+            } elseif (strpos(strtolower($message), 'success')) {
                 $type = 'success';
             } else {
                 $type = 'info';
             }
 
-            $classes = apply_filters( 'wpinv_' . $type . '_class', array( 'wpinv_errors', 'wpinv-alert', 'wpinv-alert-' . $type ) );
+            $classes = apply_filters('wpinv_' . $type . '_class', array('wpinv_errors', 'wpinv-alert', 'wpinv-alert-' . $type));
 
-            echo '<div class="' . implode( ' ', $classes ) . '">';
+            echo '<div class="' . implode(' ', $classes) . '">';
                 // Loop message codes and display messages
                     echo '<p class="wpinv_error" id="wpinv_msg_' . $message_id . '">' . $message . '</p>';
             echo '</div>';
         }
 
         // Remove all of the cart saving messages
-        $wpi_session->set( 'wpinv_cart_messages', null );
+        $wpi_session->set('wpinv_cart_messages', null);
     }
 }
-add_action( 'wpinv_before_checkout_cart', 'wpinv_display_cart_messages' );
+add_action('wpinv_before_checkout_cart', 'wpinv_display_cart_messages');
 
 function wpinv_discount_field() {
-    if ( isset( $_GET['wpi-gateway'] ) && wpinv_is_ajax_disabled() ) {
+    if (isset($_GET['wpi-gateway']) && wpinv_is_ajax_disabled()) {
         return; // Only show before a payment method has been selected if ajax is disabled
     }
 
-    if ( !wpinv_is_checkout() ) {
+    if (!wpinv_is_checkout()) {
         return;
     }
 
-    if ( wpinv_has_active_discounts() && wpinv_get_cart_total() ) {
+    if (wpinv_has_active_discounts() && wpinv_get_cart_total()) {
     ?>
     <div id="wpinv-discount-field" class="panel panel-default">
         <div class="panel-body">
             <p>
-                <label class="wpinv-label" for="wpinv_discount_code"><strong><?php _e( 'Discount', 'invoicing' ); ?></strong></label>
-                <span class="wpinv-description"><?php _e( 'Enter a discount code if you have one.', 'invoicing' ); ?></span>
+                <label class="wpinv-label" for="wpinv_discount_code"><strong><?php _e('Discount', 'invoicing'); ?></strong></label>
+                <span class="wpinv-description"><?php _e('Enter a discount code if you have one.', 'invoicing'); ?></span>
             </p>
             <div class="form-group row">
                 <div class="col-sm-4">
-                    <input class="wpinv-input form-control" type="text" id="wpinv_discount_code" name="wpinv_discount_code" placeholder="<?php _e( 'Enter discount code', 'invoicing' ); ?>"/>
+                    <input class="wpinv-input form-control" type="text" id="wpinv_discount_code" name="wpinv_discount_code" placeholder="<?php _e('Enter discount code', 'invoicing'); ?>"/>
                 </div>
                 <div class="col-sm-3">
-                    <button id="wpi-apply-discount" type="button" class="btn btn-success btn-sm"><?php _e( 'Apply Discount', 'invoicing' ); ?></button>
+                    <button id="wpi-apply-discount" type="button" class="btn btn-success btn-sm"><?php _e('Apply Discount', 'invoicing'); ?></button>
                 </div>
                 <div style="clear:both"></div>
                 <div class="col-sm-12 wpinv-discount-msg">
@@ -1541,10 +1541,10 @@ 
 <?php
     }
 }
-add_action( 'wpinv_after_checkout_cart', 'wpinv_discount_field', -10 );
+add_action('wpinv_after_checkout_cart', 'wpinv_discount_field', -10);
 
 function wpinv_agree_to_terms_js() {
-    if ( wpinv_get_option( 'show_agree_to_terms', false ) ) {
+    if (wpinv_get_option('show_agree_to_terms', false)) {
 ?>
 <script type="text/javascript">
     jQuery(document).ready(function($){
@@ -1559,126 +1559,126 @@ 
 <?php
     }
 }
-add_action( 'wpinv_checkout_form_top', 'wpinv_agree_to_terms_js' );
+add_action('wpinv_checkout_form_top', 'wpinv_agree_to_terms_js');
 
 function wpinv_payment_mode_select() {
-    $gateways = wpinv_get_enabled_payment_gateways( true );
-    $gateways = apply_filters( 'wpinv_payment_gateways_on_cart', $gateways );
+    $gateways = wpinv_get_enabled_payment_gateways(true);
+    $gateways = apply_filters('wpinv_payment_gateways_on_cart', $gateways);
     $page_URL = wpinv_get_current_page_url();
-    $invoice = wpinv_get_invoice( 0, true );
+    $invoice = wpinv_get_invoice(0, true);
     
     do_action('wpinv_payment_mode_top');
     $invoice_id = (int)$invoice->ID;
-    $chosen_gateway = wpinv_get_chosen_gateway( $invoice_id );
+    $chosen_gateway = wpinv_get_chosen_gateway($invoice_id);
     ?>
-    <div id="wpinv_payment_mode_select" data-gateway="<?php echo $chosen_gateway; ?>" <?php echo ( $invoice->is_free() ? 'style="display:none;"' : '' ); ?>>
-            <?php do_action( 'wpinv_payment_mode_before_gateways_wrap' ); ?>
+    <div id="wpinv_payment_mode_select" data-gateway="<?php echo $chosen_gateway; ?>" <?php echo ($invoice->is_free() ? 'style="display:none;"' : ''); ?>>
+            <?php do_action('wpinv_payment_mode_before_gateways_wrap'); ?>
             <div id="wpinv-payment-mode-wrap" class="panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Select Payment Method', 'invoicing' ); ?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php _e('Select Payment Method', 'invoicing'); ?></h3></div>
                 <div class="panel-body list-group wpi-payment_methods">
                     <?php
-                    do_action( 'wpinv_payment_mode_before_gateways' );
+                    do_action('wpinv_payment_mode_before_gateways');
                     
-                    if(!empty($gateways)){
-	                    foreach ( $gateways as $gateway_id => $gateway ) {
-		                    $checked = checked( $gateway_id, $chosen_gateway, false );
-		                    $button_label = wpinv_get_gateway_button_label( $gateway_id );
-		                    $description = wpinv_get_gateway_description( $gateway_id );
+                    if (!empty($gateways)) {
+	                    foreach ($gateways as $gateway_id => $gateway) {
+		                    $checked = checked($gateway_id, $chosen_gateway, false);
+		                    $button_label = wpinv_get_gateway_button_label($gateway_id);
+		                    $description = wpinv_get_gateway_description($gateway_id);
 		                    ?>
 		                    <div class="list-group-item">
 			                    <div class="radio">
-				                    <label><input type="radio" data-button-text="<?php echo esc_attr( $button_label );?>" value="<?php echo esc_attr( $gateway_id ) ;?>" <?php echo $checked ;?> id="wpi_gateway_<?php echo esc_attr( $gateway_id );?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html( $gateway['checkout_label'] ); ?></label>
+				                    <label><input type="radio" data-button-text="<?php echo esc_attr($button_label); ?>" value="<?php echo esc_attr($gateway_id); ?>" <?php echo $checked; ?> id="wpi_gateway_<?php echo esc_attr($gateway_id); ?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html($gateway['checkout_label']); ?></label>
 			                    </div>
-			                    <div style="display:none;" class="payment_box wpi_gateway_<?php echo esc_attr( $gateway_id );?>" role="alert">
-				                    <?php if ( !empty( $description ) ) { ?>
-					                    <div class="wpi-gateway-desc alert alert-info"><?php echo $description;?></div>
+			                    <div style="display:none;" class="payment_box wpi_gateway_<?php echo esc_attr($gateway_id); ?>" role="alert">
+				                    <?php if (!empty($description)) { ?>
+					                    <div class="wpi-gateway-desc alert alert-info"><?php echo $description; ?></div>
 				                    <?php } ?>
-				                    <?php do_action( 'wpinv_' . $gateway_id . '_cc_form', $invoice_id ) ;?>
+				                    <?php do_action('wpinv_' . $gateway_id . '_cc_form', $invoice_id); ?>
 			                    </div>
 		                    </div>
 		                    <?php
 	                    }
-                    }else{
-	                    echo '<div class="alert alert-warning">'. __('No payment gateway active','invoicing') .'</div>';
+                    } else {
+	                    echo '<div class="alert alert-warning">' . __('No payment gateway active', 'invoicing') . '</div>';
                     }
 
-                    do_action( 'wpinv_payment_mode_after_gateways' );
+                    do_action('wpinv_payment_mode_after_gateways');
                     ?>
                 </div>
             </div>
-            <?php do_action( 'wpinv_payment_mode_after_gateways_wrap' ); ?>
+            <?php do_action('wpinv_payment_mode_after_gateways_wrap'); ?>
     </div>
     <?php
     do_action('wpinv_payment_mode_bottom');
 }
-add_action( 'wpinv_payment_mode_select', 'wpinv_payment_mode_select' );
+add_action('wpinv_payment_mode_select', 'wpinv_payment_mode_select');
 
 function wpinv_checkout_billing_info() {    
-    if ( wpinv_is_checkout() ) {
+    if (wpinv_is_checkout()) {
         $logged_in          = is_user_logged_in();
         $billing_details    = wpinv_checkout_billing_details();
-        $selected_country   = !empty( $billing_details['country'] ) ? $billing_details['country'] : wpinv_default_billing_country();
+        $selected_country   = !empty($billing_details['country']) ? $billing_details['country'] : wpinv_default_billing_country();
         ?>
         <div id="wpinv-fields" class="clearfix">
             <div id="wpi-billing" class="wpi-billing clearfix panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Billing Details', 'invoicing' );?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php _e('Billing Details', 'invoicing'); ?></h3></div>
                 <div id="wpinv-fields-box" class="panel-body">
-                    <?php do_action( 'wpinv_checkout_billing_fields_first', $billing_details ); ?>
+                    <?php do_action('wpinv_checkout_billing_fields_first', $billing_details); ?>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_first_name" class="wpi-label"><?php _e( 'First Name', 'invoicing' );?><?php if ( wpinv_get_option( 'fname_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_first_name" class="wpi-label"><?php _e('First Name', 'invoicing'); ?><?php if (wpinv_get_option('fname_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_first_name',
                                 'name'          => 'wpinv_first_name',
                                 'value'         => $billing_details['first_name'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'First name', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'fname_mandatory' ),
-                            ) );
+                                'placeholder'   => __('First name', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('fname_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_last_name" class="wpi-label"><?php _e( 'Last Name', 'invoicing' );?><?php if ( wpinv_get_option( 'lname_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_last_name" class="wpi-label"><?php _e('Last Name', 'invoicing'); ?><?php if (wpinv_get_option('lname_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_last_name',
                                 'name'          => 'wpinv_last_name',
                                 'value'         => $billing_details['last_name'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Last name', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'lname_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Last name', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('lname_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_address" class="wpi-label"><?php _e( 'Address', 'invoicing' );?><?php if ( wpinv_get_option( 'address_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_address" class="wpi-label"><?php _e('Address', 'invoicing'); ?><?php if (wpinv_get_option('address_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_address',
                                 'name'          => 'wpinv_address',
                                 'value'         => $billing_details['address'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Address', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'address_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Address', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('address_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_city" class="wpi-label"><?php _e( 'City', 'invoicing' );?><?php if ( wpinv_get_option( 'city_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_city" class="wpi-label"><?php _e('City', 'invoicing'); ?><?php if (wpinv_get_option('city_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_city',
                                 'name'          => 'wpinv_city',
                                 'value'         => $billing_details['city'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'City', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'city_mandatory' ),
-                            ) );
+                                'placeholder'   => __('City', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('city_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p id="wpinv_country_box" class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_country" class="wpi-label"><?php _e( 'Country', 'invoicing' );?><?php if ( wpinv_get_option( 'country_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
-                        <?php echo wpinv_html_select( array(
+                        <label for="wpinv_country" class="wpi-label"><?php _e('Country', 'invoicing'); ?><?php if (wpinv_get_option('country_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <?php echo wpinv_html_select(array(
                             'options'          => wpinv_get_country_list(),
                             'name'             => 'wpinv_country',
                             'id'               => 'wpinv_country',
@@ -1686,16 +1686,16 @@ 
                             'show_option_all'  => false,
                             'show_option_none' => false,
                             'class'            => 'wpi-input form-control',
-                            'placeholder'      => __( 'Choose a country', 'invoicing' ),
-                            'required'         => (bool)wpinv_get_option( 'country_mandatory' ),
-                        ) ); ?>
+                            'placeholder'      => __('Choose a country', 'invoicing'),
+                            'required'         => (bool)wpinv_get_option('country_mandatory'),
+                        )); ?>
                     </p>
                     <p id="wpinv_state_box" class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_state" class="wpi-label"><?php _e( 'State / Province', 'invoicing' );?><?php if ( wpinv_get_option( 'state_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_state" class="wpi-label"><?php _e('State / Province', 'invoicing'); ?><?php if (wpinv_get_option('state_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        $states = wpinv_get_country_states( $selected_country );
-                        if( !empty( $states ) ) {
-                            echo wpinv_html_select( array(
+                        $states = wpinv_get_country_states($selected_country);
+                        if (!empty($states)) {
+                            echo wpinv_html_select(array(
                                 'options'          => $states,
                                 'name'             => 'wpinv_state',
                                 'id'               => 'wpinv_state',
@@ -1703,61 +1703,61 @@ 
                                 'show_option_all'  => false,
                                 'show_option_none' => false,
                                 'class'            => 'wpi-input form-control',
-                                'placeholder'      => __( 'Choose a state', 'invoicing' ),
-                                'required'         => (bool)wpinv_get_option( 'state_mandatory' ),
-                            ) );
+                                'placeholder'      => __('Choose a state', 'invoicing'),
+                                'required'         => (bool)wpinv_get_option('state_mandatory'),
+                            ));
                         } else {
-                            echo wpinv_html_text( array(
+                            echo wpinv_html_text(array(
                                 'name'          => 'wpinv_state',
                                 'value'         => $billing_details['state'],
                                 'id'            => 'wpinv_state',
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'State / Province', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'state_mandatory' ),
-                            ) );
+                                'placeholder'   => __('State / Province', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('state_mandatory'),
+                            ));
                         }
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_zip" class="wpi-label"><?php _e( 'ZIP / Postcode', 'invoicing' );?><?php if ( wpinv_get_option( 'zip_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_zip" class="wpi-label"><?php _e('ZIP / Postcode', 'invoicing'); ?><?php if (wpinv_get_option('zip_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'name'          => 'wpinv_zip',
                                 'value'         => $billing_details['zip'],
                                 'id'            => 'wpinv_zip',
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'ZIP / Postcode', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'zip_mandatory' ),
-                            ) );
+                                'placeholder'   => __('ZIP / Postcode', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('zip_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_phone" class="wpi-label"><?php _e( 'Phone', 'invoicing' );?><?php if ( wpinv_get_option( 'phone_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_phone" class="wpi-label"><?php _e('Phone', 'invoicing'); ?><?php if (wpinv_get_option('phone_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_phone',
                                 'name'          => 'wpinv_phone',
                                 'value'         => $billing_details['phone'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Phone', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'phone_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Phone', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('phone_mandatory'),
+                            ));
                         ?>
                     </p>
-                    <?php do_action( 'wpinv_checkout_billing_fields_last', $billing_details ); ?>
+                    <?php do_action('wpinv_checkout_billing_fields_last', $billing_details); ?>
                     <div class="clearfix"></div>
                 </div>
             </div>
-            <?php do_action( 'wpinv_after_billing_fields', $billing_details ); ?>
+            <?php do_action('wpinv_after_billing_fields', $billing_details); ?>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_checkout_billing_info', 'wpinv_checkout_billing_info' );
+add_action('wpinv_checkout_billing_info', 'wpinv_checkout_billing_info');
 
 function wpinv_checkout_hidden_fields() {
 ?>
-    <?php if ( is_user_logged_in() ) { ?>
+    <?php if (is_user_logged_in()) { ?>
     <input type="hidden" name="wpinv_user_id" value="<?php echo get_current_user_id(); ?>"/>
     <?php } ?>
     <input type="hidden" name="wpi_action" value="payment" />
@@ -1767,9 +1767,9 @@ 
 function wpinv_checkout_button_purchase() {
     ob_start();
 ?>
-    <input type="submit" class="btn btn-success wpinv-submit" id="wpinv-payment-button" data-value="<?php esc_attr_e( 'Proceed to Pay', 'invoicing' ) ?>" name="wpinv_payment" value="<?php esc_attr_e( 'Proceed to Pay', 'invoicing' ) ?>"/>
+    <input type="submit" class="btn btn-success wpinv-submit" id="wpinv-payment-button" data-value="<?php esc_attr_e('Proceed to Pay', 'invoicing') ?>" name="wpinv_payment" value="<?php esc_attr_e('Proceed to Pay', 'invoicing') ?>"/>
 <?php
-    return apply_filters( 'wpinv_checkout_button_purchase', ob_get_clean() );
+    return apply_filters('wpinv_checkout_button_purchase', ob_get_clean());
 }
 
 function wpinv_checkout_total() {
@@ -1778,96 +1778,96 @@ 
 <div id="wpinv_checkout_total" class="panel panel-info">
     <div class="panel-body">
     <?php
-    do_action( 'wpinv_purchase_form_before_checkout_total' );
+    do_action('wpinv_purchase_form_before_checkout_total');
     ?>
-    <strong><?php _e( 'Invoice Total:', 'invoicing' ) ?></strong> <span class="wpinv-chdeckout-total"><?php echo $cart_total;?></span>
+    <strong><?php _e('Invoice Total:', 'invoicing') ?></strong> <span class="wpinv-chdeckout-total"><?php echo $cart_total; ?></span>
     <?php
-    do_action( 'wpinv_purchase_form_after_checkout_total' );
+    do_action('wpinv_purchase_form_after_checkout_total');
     ?>
     </div>
 </div>
 <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_total', 9998 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_total', 9998);
 
 function wpinv_checkout_submit() {
 ?>
 <div id="wpinv_purchase_submit" class="panel panel-success">
     <div class="panel-body text-center">
     <?php
-    do_action( 'wpinv_purchase_form_before_submit' );
+    do_action('wpinv_purchase_form_before_submit');
     wpinv_checkout_hidden_fields();
     echo wpinv_checkout_button_purchase();
-    do_action( 'wpinv_purchase_form_after_submit' );
+    do_action('wpinv_purchase_form_after_submit');
     ?>
     </div>
 </div>
 <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_submit', 9999 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_submit', 9999);
 
-function wpinv_receipt_billing_address( $invoice_id = 0 ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_receipt_billing_address($invoice_id = 0) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $billing_details = $invoice->get_user_info();
     $address_row = '';
-    if ( $address = $billing_details['address'] ) {
-        $address_row .= wpautop( wp_kses_post( $address ) );
+    if ($address = $billing_details['address']) {
+        $address_row .= wpautop(wp_kses_post($address));
     }
     
     $address_fields = array();
-    if ( !empty( $billing_details['city'] ) ) {
+    if (!empty($billing_details['city'])) {
         $address_fields[] = $billing_details['city'];
     }
     
-    $billing_country = !empty( $billing_details['country'] ) ? $billing_details['country'] : '';
-    if ( !empty( $billing_details['state'] ) ) {
-        $address_fields[] = wpinv_state_name( $billing_details['state'], $billing_country );
+    $billing_country = !empty($billing_details['country']) ? $billing_details['country'] : '';
+    if (!empty($billing_details['state'])) {
+        $address_fields[] = wpinv_state_name($billing_details['state'], $billing_country);
     }
     
-    if ( !empty( $billing_country ) ) {
-        $address_fields[] = wpinv_country_name( $billing_country );
+    if (!empty($billing_country)) {
+        $address_fields[] = wpinv_country_name($billing_country);
     }
     
-    if ( !empty( $address_fields ) ) {
-        $address_fields = implode( ", ", $address_fields );
+    if (!empty($address_fields)) {
+        $address_fields = implode(", ", $address_fields);
         
-        if ( !empty( $billing_details['zip'] ) ) {
+        if (!empty($billing_details['zip'])) {
             $address_fields .= ' ' . $billing_details['zip'];
         }
         
-        $address_row .= wpautop( wp_kses_post( $address_fields ) );
+        $address_row .= wpautop(wp_kses_post($address_fields));
     }
     ob_start();
     ?>
     <table class="table table-bordered table-sm wpi-billing-details">
         <tbody>
             <tr class="wpi-receipt-name">
-                <th class="text-left"><?php _e( 'Name', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( trim( $billing_details['first_name'] . ' ' . $billing_details['last_name'] ) ) ;?></td>
+                <th class="text-left"><?php _e('Name', 'invoicing'); ?></th>
+                <td><?php echo esc_html(trim($billing_details['first_name'] . ' ' . $billing_details['last_name'])); ?></td>
             </tr>
             <tr class="wpi-receipt-email">
-                <th class="text-left"><?php _e( 'Email', 'invoicing' ); ?></th>
-                <td><?php echo $billing_details['email'] ;?></td>
+                <th class="text-left"><?php _e('Email', 'invoicing'); ?></th>
+                <td><?php echo $billing_details['email']; ?></td>
             </tr>
-            <?php if ( $billing_details['company'] ) { ?>
+            <?php if ($billing_details['company']) { ?>
             <tr class="wpi-receipt-company">
-                <th class="text-left"><?php _e( 'Company', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $billing_details['company'] ) ;?></td>
+                <th class="text-left"><?php _e('Company', 'invoicing'); ?></th>
+                <td><?php echo esc_html($billing_details['company']); ?></td>
             </tr>
             <?php } ?>
             <tr class="wpi-receipt-address">
-                <th class="text-left"><?php _e( 'Address', 'invoicing' ); ?></th>
-                <td><?php echo $address_row ;?></td>
+                <th class="text-left"><?php _e('Address', 'invoicing'); ?></th>
+                <td><?php echo $address_row; ?></td>
             </tr>
-            <?php if ( $billing_details['phone'] ) { ?>
+            <?php if ($billing_details['phone']) { ?>
             <tr class="wpi-receipt-phone">
-                <th class="text-left"><?php _e( 'Phone', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $billing_details['phone'] ) ;?></td>
+                <th class="text-left"><?php _e('Phone', 'invoicing'); ?></th>
+                <td><?php echo esc_html($billing_details['phone']); ?></td>
             </tr>
             <?php } ?>
         </tbody>
@@ -1875,103 +1875,103 @@ 
     <?php
     $output = ob_get_clean();
     
-    $output = apply_filters( 'wpinv_receipt_billing_address', $output, $invoice_id );
+    $output = apply_filters('wpinv_receipt_billing_address', $output, $invoice_id);
 
     echo $output;
 }
 
-function wpinv_filter_success_page_content( $content ) {
-    if ( isset( $_GET['payment-confirm'] ) && wpinv_is_success_page() ) {
-        if ( has_filter( 'wpinv_payment_confirm_' . sanitize_text_field( $_GET['payment-confirm'] ) ) ) {
-            $content = apply_filters( 'wpinv_payment_confirm_' . sanitize_text_field( $_GET['payment-confirm'] ), $content );
+function wpinv_filter_success_page_content($content) {
+    if (isset($_GET['payment-confirm']) && wpinv_is_success_page()) {
+        if (has_filter('wpinv_payment_confirm_' . sanitize_text_field($_GET['payment-confirm']))) {
+            $content = apply_filters('wpinv_payment_confirm_' . sanitize_text_field($_GET['payment-confirm']), $content);
         }
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_filter_success_page_content', 99999 );
+add_filter('the_content', 'wpinv_filter_success_page_content', 99999);
 
-function wpinv_receipt_actions( $invoice ) {
-    if ( !empty( $invoice ) ) {
+function wpinv_receipt_actions($invoice) {
+    if (!empty($invoice)) {
         $actions = array();
 
-        if ( wpinv_user_can_view_invoice( $invoice->ID ) ) {
-            $actions['print']   = array(
-                'url'  => $invoice->get_view_url( true ),
-                'name' => __( 'Print Invoice', 'invoicing' ),
+        if (wpinv_user_can_view_invoice($invoice->ID)) {
+            $actions['print'] = array(
+                'url'  => $invoice->get_view_url(true),
+                'name' => __('Print Invoice', 'invoicing'),
                 'class' => 'btn-primary',
             );
         }
 
-        if ( is_user_logged_in() ) {
+        if (is_user_logged_in()) {
             $actions['history'] = array(
                 'url'  => wpinv_get_history_page_uri(),
-                'name' => __( 'Invoice History', 'invoicing' ),
+                'name' => __('Invoice History', 'invoicing'),
                 'class' => 'btn-warning',
             );
         }
 
-        $actions = apply_filters( 'wpinv_invoice_receipt_actions', $actions, $invoice );
+        $actions = apply_filters('wpinv_invoice_receipt_actions', $actions, $invoice);
         
-        if ( !empty( $actions ) ) {
+        if (!empty($actions)) {
         ?>
         <div class="wpinv-receipt-actions text-right">
-            <?php foreach ( $actions as $key => $action ) { $class = !empty($action['class']) ? sanitize_html_class( $action['class'] ) : ''; ?>
-            <a href="<?php echo esc_url( $action['url'] );?>" class="btn btn-sm <?php echo $class . ' ' . sanitize_html_class( $key );?>" <?php echo ( !empty($action['attrs']) ? $action['attrs'] : '' ) ;?>><?php echo esc_html( $action['name'] );?></a>
+            <?php foreach ($actions as $key => $action) { $class = !empty($action['class']) ? sanitize_html_class($action['class']) : ''; ?>
+            <a href="<?php echo esc_url($action['url']); ?>" class="btn btn-sm <?php echo $class . ' ' . sanitize_html_class($key); ?>" <?php echo (!empty($action['attrs']) ? $action['attrs'] : ''); ?>><?php echo esc_html($action['name']); ?></a>
             <?php } ?>
         </div>
         <?php
         }
     }
 }
-add_action( 'wpinv_receipt_start', 'wpinv_receipt_actions', -10, 1 );
+add_action('wpinv_receipt_start', 'wpinv_receipt_actions', -10, 1);
 
-function wpinv_invoice_link( $invoice_id ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_invoice_link($invoice_id) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
-    $invoice_link = '<a href="' . esc_url( $invoice->get_view_url() ) . '">' . $invoice->get_number() . '</a>';
+    $invoice_link = '<a href="' . esc_url($invoice->get_view_url()) . '">' . $invoice->get_number() . '</a>';
     
-    return apply_filters( 'wpinv_get_invoice_link', $invoice_link, $invoice );
+    return apply_filters('wpinv_get_invoice_link', $invoice_link, $invoice);
 }
 
-function wpinv_invoice_subscription_details( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->is_recurring() && !wpinv_is_subscription_payment( $invoice ) ) {
+function wpinv_invoice_subscription_details($invoice) {
+    if (!empty($invoice) && $invoice->is_recurring() && !wpinv_is_subscription_payment($invoice)) {
         $total_payments = (int)$invoice->get_total_payments();
         $payments       = $invoice->get_child_payments();
         
         $subscription   = $invoice->get_subscription_data();
         
-        if ( !( !empty( $subscription ) && !empty( $subscription['item_id'] ) ) ) {
+        if (!(!empty($subscription) && !empty($subscription['item_id']))) {
             return;
         }
         
-        $billing_cycle  = wpinv_get_billing_cycle( $subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency() );
-        $times_billed   = $total_payments . ' / ' . ( ( (int)$subscription['bill_times'] == 0 ) ? __( 'Until cancelled', 'invoicing' ) : $subscription['bill_times'] );
+        $billing_cycle  = wpinv_get_billing_cycle($subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency());
+        $times_billed   = $total_payments . ' / ' . (((int)$subscription['bill_times'] == 0) ? __('Until cancelled', 'invoicing') : $subscription['bill_times']);
         
         $subscription_status = $invoice->get_subscription_status();
         
         $status_desc = '';
-        if ( $subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date() ) {
-            $status_desc = wp_sprintf( __( 'Until: %s', 'invoicing' ), $trial_end_date );
-        } else if ( $subscription_status == 'cancelled' && $cancelled_date = $invoice->get_cancelled_date() ) {
-            $status_desc = wp_sprintf( __( 'On: %s', 'invoicing' ), $cancelled_date );
+        if ($subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date()) {
+            $status_desc = wp_sprintf(__('Until: %s', 'invoicing'), $trial_end_date);
+        } else if ($subscription_status == 'cancelled' && $cancelled_date = $invoice->get_cancelled_date()) {
+            $status_desc = wp_sprintf(__('On: %s', 'invoicing'), $cancelled_date);
         }
         $status_desc = $status_desc != '' ? '<span class="meta">' . $status_desc . '</span>' : '';
         ?>
         <div class="wpinv-subscriptions-details">
-            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters( 'wpinv_subscription_details_title', __( 'Subscription Details', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters('wpinv_subscription_details_title', __('Subscription Details', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
-                        <th><?php _e( 'Billing Cycle', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Start Date', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Expiration Date', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Times Billed', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Status', 'invoicing' ) ;?></th>
+                        <th><?php _e('Billing Cycle', 'invoicing'); ?></th>
+                        <th><?php _e('Start Date', 'invoicing'); ?></th>
+                        <th><?php _e('Expiration Date', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Times Billed', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Status', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -1980,32 +1980,32 @@ 
                         <td><?php echo $invoice->get_subscription_start(); ?></td>
                         <td><?php echo $invoice->get_subscription_end(); ?></td>
                         <td class="text-center"><?php echo $times_billed; ?></td>
-                        <td class="text-center wpi-sub-status"><?php echo $invoice->get_subscription_status_label() ;?>
+                        <td class="text-center wpi-sub-status"><?php echo $invoice->get_subscription_status_label(); ?>
                         <?php echo $status_desc; ?>
                         </td>
                     </tr>
                 </tbody>
             </table>
         </div>
-        <?php if ( !empty( $payments ) ) { ?>
+        <?php if (!empty($payments)) { ?>
         <div class="wpinv-renewal-payments">
-            <h3 class="wpinv-renewals-t"><?php echo apply_filters( 'wpinv_renewal_payments_title', __( 'Renewal Payments', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-renewals-t"><?php echo apply_filters('wpinv_renewal_payments_title', __('Renewal Payments', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
                         <th>#</th>
-                        <th><?php _e( 'Invoice', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Date', 'invoicing' ) ;?></th>
-                        <th class="text-right"><?php _e( 'Amount', 'invoicing' ) ;?></th>
+                        <th><?php _e('Invoice', 'invoicing'); ?></th>
+                        <th><?php _e('Date', 'invoicing'); ?></th>
+                        <th class="text-right"><?php _e('Amount', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ( $payments as $key => $invoice_id ) { ?>
+                    <?php foreach ($payments as $key => $invoice_id) { ?>
                     <tr>
-                        <th scope="row"><?php echo ( $key + 1 );?></th>
-                        <td><?php echo wpinv_invoice_link( $invoice_id ) ;?></td>
-                        <td><?php echo wpinv_get_invoice_date( $invoice_id ); ?></td>
-                        <td class="text-right"><?php echo wpinv_payment_total( $invoice_id, true ); ?></td>
+                        <th scope="row"><?php echo ($key + 1); ?></th>
+                        <td><?php echo wpinv_invoice_link($invoice_id); ?></td>
+                        <td><?php echo wpinv_get_invoice_date($invoice_id); ?></td>
+                        <td class="text-right"><?php echo wpinv_payment_total($invoice_id, true); ?></td>
                     </tr>
                     <?php } ?>
                     <tr><td colspan="4" style="padding:0"></td></tr>
@@ -2017,52 +2017,52 @@ 
     }
 }
 
-function wpinv_cart_total_label( $label, $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_cart_total_label($label, $invoice) {
+    if (empty($invoice)) {
         return $label;
     }
     
     $prefix_label = '';
-    if ( $invoice->is_parent() && $item_id = $invoice->get_recurring() ) {        
-        $prefix_label   = '<span class="label label-primary label-recurring">' . __( 'Recurring Payment', 'invoicing' ) . '</span> ' . wpinv_subscription_payment_desc( $invoice );
-    } else if ( $invoice->is_renewal() ) {
-        $prefix_label   = '<span class="label label-primary label-renewal">' . __( 'Renewal Payment', 'invoicing' ) . '</span> ';        
+    if ($invoice->is_parent() && $item_id = $invoice->get_recurring()) {        
+        $prefix_label   = '<span class="label label-primary label-recurring">' . __('Recurring Payment', 'invoicing') . '</span> ' . wpinv_subscription_payment_desc($invoice);
+    } else if ($invoice->is_renewal()) {
+        $prefix_label   = '<span class="label label-primary label-renewal">' . __('Renewal Payment', 'invoicing') . '</span> ';        
     }
     
-    if ( $prefix_label != '' ) {
-        $label  = '<span class="wpinv-cart-sub-desc">' . $prefix_label . '</span> ' . $label;
+    if ($prefix_label != '') {
+        $label = '<span class="wpinv-cart-sub-desc">' . $prefix_label . '</span> ' . $label;
     }
     
     return $label;
 }
-add_filter( 'wpinv_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
-add_filter( 'wpinv_email_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
-add_filter( 'wpinv_print_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
+add_filter('wpinv_cart_total_label', 'wpinv_cart_total_label', 10, 2);
+add_filter('wpinv_email_cart_total_label', 'wpinv_cart_total_label', 10, 2);
+add_filter('wpinv_print_cart_total_label', 'wpinv_cart_total_label', 10, 2);
 
-add_action( 'wpinv_invoice_print_middle', 'wpinv_invoice_subscription_details', 10, 1 );
+add_action('wpinv_invoice_print_middle', 'wpinv_invoice_subscription_details', 10, 1);
 
-function wpinv_invoice_print_description( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_print_description($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
-    if ( $description = wpinv_get_invoice_description( $invoice->ID ) ) {
+    if ($description = wpinv_get_invoice_description($invoice->ID)) {
         ?>
         <div class="row wpinv-lower">
             <div class="col-sm-12 wpinv-description">
-                <?php echo wpautop( $description ); ?>
+                <?php echo wpautop($description); ?>
             </div>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_invoice_print_middle', 'wpinv_invoice_print_description', 10.1, 1 );
+add_action('wpinv_invoice_print_middle', 'wpinv_invoice_print_description', 10.1, 1);
 
-function wpinv_invoice_print_payment_info( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_print_payment_info($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
     
-    if ( $payments_info = wpinv_display_payments_info( $invoice->ID, false ) ) {
+    if ($payments_info = wpinv_display_payments_info($invoice->ID, false)) {
         ?>
         <div class="row wpinv-payments">
             <div class="col-sm-12">
@@ -2074,43 +2074,43 @@ 
 }
 // add_action( 'wpinv_invoice_print_after_line_items', 'wpinv_invoice_print_payment_info', 10, 1 );
 
-function wpinv_get_invoice_note_line_item( $note, $echo = true ) {
-    if ( empty( $note ) ) {
+function wpinv_get_invoice_note_line_item($note, $echo = true) {
+    if (empty($note)) {
         return NULL;
     }
     
-    if ( is_int( $note ) ) {
-        $note = get_comment( $note );
+    if (is_int($note)) {
+        $note = get_comment($note);
     }
     
-    if ( !( is_object( $note ) && is_a( $note, 'WP_Comment' ) ) ) {
+    if (!(is_object($note) && is_a($note, 'WP_Comment'))) {
         return NULL;
     }
     
-    $note_classes   = array( 'note' );
-    $note_classes[] = get_comment_meta( $note->comment_ID, '_wpi_customer_note', true ) ? 'customer-note' : '';
-    $note_classes[] = $note->comment_author === __( 'System', 'invoicing' ) ? 'system-note' : '';
-    $note_classes   = apply_filters( 'wpinv_invoice_note_class', array_filter( $note_classes ), $note );
-    $note_classes   = !empty( $note_classes ) ? implode( ' ', $note_classes ) : '';
+    $note_classes   = array('note');
+    $note_classes[] = get_comment_meta($note->comment_ID, '_wpi_customer_note', true) ? 'customer-note' : '';
+    $note_classes[] = $note->comment_author === __('System', 'invoicing') ? 'system-note' : '';
+    $note_classes   = apply_filters('wpinv_invoice_note_class', array_filter($note_classes), $note);
+    $note_classes   = !empty($note_classes) ? implode(' ', $note_classes) : '';
     
     ob_start();
     ?>
-    <li rel="<?php echo absint( $note->comment_ID ) ; ?>" class="<?php echo esc_attr( $note_classes ); ?>">
+    <li rel="<?php echo absint($note->comment_ID); ?>" class="<?php echo esc_attr($note_classes); ?>">
         <div class="note_content">
-            <?php echo wpautop( wptexturize( wp_kses_post( $note->comment_content ) ) ); ?>
+            <?php echo wpautop(wptexturize(wp_kses_post($note->comment_content))); ?>
         </div>
         <p class="meta">
-            <abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf( __( '%1$s - %2$s at %3$s', 'invoicing' ), $note->comment_author, date_i18n( get_option( 'date_format' ), strtotime( $note->comment_date ) ), date_i18n( get_option( 'time_format' ), strtotime( $note->comment_date ) ) ); ?></abbr>&nbsp;&nbsp;
-            <?php if($note->comment_author !== 'System') {?>
-                <a href="#" class="delete_note"><?php _e( 'Delete note', 'invoicing' ); ?></a>
+            <abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf(__('%1$s - %2$s at %3$s', 'invoicing'), $note->comment_author, date_i18n(get_option('date_format'), strtotime($note->comment_date)), date_i18n(get_option('time_format'), strtotime($note->comment_date))); ?></abbr>&nbsp;&nbsp;
+            <?php if ($note->comment_author !== 'System') {?>
+                <a href="#" class="delete_note"><?php _e('Delete note', 'invoicing'); ?></a>
             <?php } ?>
         </p>
     </li>
     <?php
     $note_content = ob_get_clean();
-    $note_content = apply_filters( 'wpinv_get_invoice_note_line_item', $note_content, $note, $echo );
+    $note_content = apply_filters('wpinv_get_invoice_note_line_item', $note_content, $note, $echo);
     
-    if ( $echo ) {
+    if ($echo) {
         echo $note_content;
     } else {
         return $note_content;
@@ -2120,33 +2120,33 @@ 
 function wpinv_invalid_invoice_content() {
     global $post;
 
-    $invoice = wpinv_get_invoice( $post->ID );
+    $invoice = wpinv_get_invoice($post->ID);
 
-    $error = __( 'This invoice is only viewable by clicking on the invoice link that sent to you via email.', 'invoicing' );
-    if ( !empty( $invoice->ID ) && $invoice->has_status( array_keys( wpinv_get_invoice_statuses() ) ) ) {
-        if ( is_user_logged_in() ) {
-            if ( wpinv_require_login_to_checkout() ) {
-                if ( isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-                    $error = __( 'You are not allowed to view this invoice.', 'invoicing' );
+    $error = __('This invoice is only viewable by clicking on the invoice link that sent to you via email.', 'invoicing');
+    if (!empty($invoice->ID) && $invoice->has_status(array_keys(wpinv_get_invoice_statuses()))) {
+        if (is_user_logged_in()) {
+            if (wpinv_require_login_to_checkout()) {
+                if (isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+                    $error = __('You are not allowed to view this invoice.', 'invoicing');
                 }
             }
         } else {
-            if ( wpinv_require_login_to_checkout() ) {
-                if ( isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-                    $error = __( 'You must be logged in to view this invoice.', 'invoicing' );
+            if (wpinv_require_login_to_checkout()) {
+                if (isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+                    $error = __('You must be logged in to view this invoice.', 'invoicing');
                 }
             }
         }
     } else {
-        $error = __( 'This invoice is deleted or does not exist.', 'invoicing' );
+        $error = __('This invoice is deleted or does not exist.', 'invoicing');
     }
     ?>
     <div class="row wpinv-row-invalid">
         <div class="col-md-6 col-md-offset-3 wpinv-message error">
-            <h3><?php _e( 'Access Denied', 'invoicing' ); ?></h3>
+            <h3><?php _e('Access Denied', 'invoicing'); ?></h3>
             <p class="wpinv-msg-text"><?php echo $error; ?></p>
         </div>
     </div>
     <?php
 }
-add_action( 'wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content' );
\ No newline at end of file
+add_action('wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content');
\ No newline at end of file

templates/emails/wpinv-email-invoice-details.php

Spacing +28 added lines, -28 removed lines

@@ -1,67 +1,67 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
 global $wpinv_euvat;
 
-$sent_to_admin  = !empty( $sent_to_admin ) ? true : false;
-$invoice_url = $invoice->get_view_url( true );
+$sent_to_admin = !empty($sent_to_admin) ? true : false;
+$invoice_url = $invoice->get_view_url(true);
 $use_taxes = wpinv_use_taxes();
 $vat_name = $wpinv_euvat->get_vat_name();
 
-do_action( 'wpinv_email_before_invoice_details', $invoice, $sent_to_admin ); ?>
+do_action('wpinv_email_before_invoice_details', $invoice, $sent_to_admin); ?>
 <div id="wpinv-email-details">
-    <h3 class="wpinv-details-t"><?php echo apply_filters( 'wpinv_email_details_title', __( 'Invoice Details', 'invoicing' ), $invoice ); ?></h3>
+    <h3 class="wpinv-details-t"><?php echo apply_filters('wpinv_email_details_title', __('Invoice Details', 'invoicing'), $invoice); ?></h3>
     <table class="table table-bordered table-sm">
-        <?php if ( $invoice_number = $invoice->get_number() ) { ?>
+        <?php if ($invoice_number = $invoice->get_number()) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_number_label', __( 'Invoice Number', 'invoicing' ), $invoice ); ?></td>
-                <td><a href="<?php echo esc_url( $invoice_url ) ;?>"><?php echo $invoice_number; ?></a></td>
+                <td><?php echo apply_filters('wpinv_invoice_number_label', __('Invoice Number', 'invoicing'), $invoice); ?></td>
+                <td><a href="<?php echo esc_url($invoice_url); ?>"><?php echo $invoice_number; ?></a></td>
             </tr>
         <?php } ?>
         <tr>
-            <td><?php echo apply_filters( 'wpinv_invoice_status_label', __( 'Invoice Status', 'invoicing' ), $invoice ); ?></td>
-            <td><?php echo $invoice->get_status( true ); ?></td>
+            <td><?php echo apply_filters('wpinv_invoice_status_label', __('Invoice Status', 'invoicing'), $invoice); ?></td>
+            <td><?php echo $invoice->get_status(true); ?></td>
         </tr>
-        <?php if ( $invoice->is_renewal() ) { ?>
+        <?php if ($invoice->is_renewal()) { ?>
         <tr>
-            <td><?php echo apply_filters( 'wpinv_invoice_parent_invoice_label', __( 'Parent Invoice', 'invoicing' ), $invoice ); ?></td>
-            <td><?php echo wpinv_invoice_link( $invoice->parent_invoice ); ?></td>
+            <td><?php echo apply_filters('wpinv_invoice_parent_invoice_label', __('Parent Invoice', 'invoicing'), $invoice); ?></td>
+            <td><?php echo wpinv_invoice_link($invoice->parent_invoice); ?></td>
         </tr>
         <?php } ?>
-        <?php if ( $gateway_title = $invoice->get_gateway_title() ) { ?>
-            <td><?php echo apply_filters( 'wpinv_invoice_payment_method_label', __( 'Payment Method', 'invoicing' ), $invoice ); ?></td>
+        <?php if ($gateway_title = $invoice->get_gateway_title()) { ?>
+            <td><?php echo apply_filters('wpinv_invoice_payment_method_label', __('Payment Method', 'invoicing'), $invoice); ?></td>
             <td><?php echo $gateway_title; ?></td>
         <?php } ?>
-        <?php if ( $invoice_date = $invoice->get_invoice_date( false ) ) { ?>
+        <?php if ($invoice_date = $invoice->get_invoice_date(false)) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_date_label', __( 'Invoice Date', 'invoicing' ), $invoice ); ?></td>
-                <td><?php echo wp_sprintf( '<time datetime="%s">%s</time>', date_i18n( 'c', strtotime( $invoice_date ) ), $invoice->get_invoice_date() ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_date_label', __('Invoice Date', 'invoicing'), $invoice); ?></td>
+                <td><?php echo wp_sprintf('<time datetime="%s">%s</time>', date_i18n('c', strtotime($invoice_date)), $invoice->get_invoice_date()); ?></td>
             </tr>
         <?php } ?>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && $invoice->needs_payment() && ( $due_date = $invoice->get_due_date() ) ) { ?>
+        <?php if (wpinv_get_option('overdue_active') && $invoice->needs_payment() && ($due_date = $invoice->get_due_date())) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_due_date_label', __( 'Due Date', 'invoicing' ), $invoice ); ?></td>
-                <td><?php echo wp_sprintf( '<time datetime="%s">%s</time>', date_i18n( 'c', strtotime( $due_date ) ), $invoice->get_due_date( true ) ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_due_date_label', __('Due Date', 'invoicing'), $invoice); ?></td>
+                <td><?php echo wp_sprintf('<time datetime="%s">%s</time>', date_i18n('c', strtotime($due_date)), $invoice->get_due_date(true)); ?></td>
             </tr>
         <?php } ?>
-        <?php if ( empty( $sent_to_admin ) && $owner_vat_number = $wpinv_euvat->get_vat_number() ) { ?>
+        <?php if (empty($sent_to_admin) && $owner_vat_number = $wpinv_euvat->get_vat_number()) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_owner_vat_number_label', wp_sprintf( __( 'Owner %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_owner_vat_number_label', wp_sprintf(__('Owner %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></td>
                 <td><?php echo $owner_vat_number; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $use_taxes && $user_vat_number = $invoice->vat_number ) { ?>
+        <?php if ($use_taxes && $user_vat_number = $invoice->vat_number) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_user_vat_number_label', wp_sprintf( __( 'Invoice %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_user_vat_number_label', wp_sprintf(__('Invoice %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></td>
                 <td><?php echo $user_vat_number; ?></td>
             </tr>
         <?php } ?>
         <tr class="table-active">
-            <td><strong><?php _e( 'Total Amount', 'invoicing' ) ?></strong></td>
-            <td><strong><?php echo $invoice->get_total( true ); ?></strong></td>
+            <td><strong><?php _e('Total Amount', 'invoicing') ?></strong></td>
+            <td><strong><?php echo $invoice->get_total(true); ?></strong></td>
         </tr>
     </table>
 </div>
-<?php do_action( 'wpinv_email_after_invoice_details', $invoice, $sent_to_admin ); ?>
\ No newline at end of file
+<?php do_action('wpinv_email_after_invoice_details', $invoice, $sent_to_admin); ?>
\ No newline at end of file

includes/admin/wpinv-admin-functions.php

Spacing +188 added lines, -188 removed lines

@@ -7,239 +7,239 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_columns( $columns ) {
+function wpinv_columns($columns) {
     $columns = array(
         'cb'                => $columns['cb'],
-        'number'            => __( 'Number', 'invoicing' ),
-        'customer'          => __( 'Customer', 'invoicing' ),
-        'amount'            => __( 'Amount', 'invoicing' ),
-        'invoice_date'      => __( 'Date', 'invoicing' ),
-        'status'            => __( 'Status', 'invoicing' ),
-        'ID'                => __( 'ID', 'invoicing' ),
-        'wpi_actions'       => __( 'Actions', 'invoicing' ),
+        'number'            => __('Number', 'invoicing'),
+        'customer'          => __('Customer', 'invoicing'),
+        'amount'            => __('Amount', 'invoicing'),
+        'invoice_date'      => __('Date', 'invoicing'),
+        'status'            => __('Status', 'invoicing'),
+        'ID'                => __('ID', 'invoicing'),
+        'wpi_actions'       => __('Actions', 'invoicing'),
     );
 
-    return apply_filters( 'wpi_invoice_table_columns', $columns );
+    return apply_filters('wpi_invoice_table_columns', $columns);
 }
-add_filter( 'manage_wpi_invoice_posts_columns', 'wpinv_columns' );
+add_filter('manage_wpi_invoice_posts_columns', 'wpinv_columns');
 
-function wpinv_bulk_actions( $actions ) {
-    if ( isset( $actions['edit'] ) ) {
-        unset( $actions['edit'] );
+function wpinv_bulk_actions($actions) {
+    if (isset($actions['edit'])) {
+        unset($actions['edit']);
     }
 
     return $actions;
 }
-add_filter( 'bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions' );
-add_filter( 'bulk_actions-edit-wpi_item', 'wpinv_bulk_actions' );
+add_filter('bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions');
+add_filter('bulk_actions-edit-wpi_item', 'wpinv_bulk_actions');
 
-function wpinv_sortable_columns( $columns ) {
+function wpinv_sortable_columns($columns) {
     $columns = array(
-        'ID'            => array( 'ID', true ),
-        'number'        => array( 'number', false ),
-        'amount'        => array( 'amount', false ),
-        'invoice_date'  => array( 'date', false ),
-        'customer'      => array( 'customer', false ),
-        'status'        => array( 'status', false ),
+        'ID'            => array('ID', true),
+        'number'        => array('number', false),
+        'amount'        => array('amount', false),
+        'invoice_date'  => array('date', false),
+        'customer'      => array('customer', false),
+        'status'        => array('status', false),
     );
     
-    return apply_filters( 'wpi_invoice_table_sortable_columns', $columns );
+    return apply_filters('wpi_invoice_table_sortable_columns', $columns);
 }
-add_filter( 'manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns' );
+add_filter('manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns');
 
-add_action( 'manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
-function wpinv_posts_custom_column( $column_name, $post_id = 0 ) {
+add_action('manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
+function wpinv_posts_custom_column($column_name, $post_id = 0) {
     global $post, $wpi_invoice;
     
-    if ( empty( $wpi_invoice ) || ( !empty( $wpi_invoice ) && $post->ID != $wpi_invoice->ID ) ) {
-        $wpi_invoice = new WPInv_Invoice( $post->ID );
+    if (empty($wpi_invoice) || (!empty($wpi_invoice) && $post->ID != $wpi_invoice->ID)) {
+        $wpi_invoice = new WPInv_Invoice($post->ID);
     }
 
     $value = NULL;
     
-    switch ( $column_name ) {
+    switch ($column_name) {
         case 'email' :
-            $value   = $wpi_invoice->get_email();
+            $value = $wpi_invoice->get_email();
             break;
         case 'customer' :
             $customer_name = $wpi_invoice->get_user_full_name();
-            $customer_name = $customer_name != '' ? $customer_name : __( 'Customer', 'invoicing' );
-            $value = '<a href="' . esc_url( get_edit_user_link( $wpi_invoice->get_user_id() ) ) . '">' . $customer_name . '</a>';
-            if ( $email = $wpi_invoice->get_email() ) {
+            $customer_name = $customer_name != '' ? $customer_name : __('Customer', 'invoicing');
+            $value = '<a href="' . esc_url(get_edit_user_link($wpi_invoice->get_user_id())) . '">' . $customer_name . '</a>';
+            if ($email = $wpi_invoice->get_email()) {
                 $value .= '<br><a class="email" href="mailto:' . $email . '">' . $email . '</a>';
             }
             break;
         case 'amount' :
-            echo $wpi_invoice->get_total( true );
+            echo $wpi_invoice->get_total(true);
             break;
         case 'invoice_date' :
-            $date_format = get_option( 'date_format' );
-            $time_format = get_option( 'time_format' );
-            $date_time_format = $date_format . ' '. $time_format;
+            $date_format = get_option('date_format');
+            $time_format = get_option('time_format');
+            $date_time_format = $date_format . ' ' . $time_format;
             
-            $t_time = get_the_time( $date_time_format );
+            $t_time = get_the_time($date_time_format);
             $m_time = $post->post_date;
-            $h_time = mysql2date( $date_format, $m_time );
+            $h_time = mysql2date($date_format, $m_time);
             
             $value   = '<abbr title="' . $t_time . '">' . $h_time . '</abbr>';
             break;
         case 'status' :
-            $value   = $wpi_invoice->get_status( true ) . ( $wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '' );
-            if ( ( $wpi_invoice->is_paid() || $wpi_invoice->is_refunded() ) && $gateway_title = $wpi_invoice->get_gateway_title() ) {
-                $value .= '<br><small class="meta gateway">' . wp_sprintf( __( 'Via %s', 'invoicing' ), $gateway_title ) . '</small>';
+            $value   = $wpi_invoice->get_status(true) . ($wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '');
+            if (($wpi_invoice->is_paid() || $wpi_invoice->is_refunded()) && $gateway_title = $wpi_invoice->get_gateway_title()) {
+                $value .= '<br><small class="meta gateway">' . wp_sprintf(__('Via %s', 'invoicing'), $gateway_title) . '</small>';
             }
             break;
         case 'number' :
-            $edit_link = get_edit_post_link( $post->ID );
-            $value = '<a title="' . esc_attr__( 'View Invoice Details', 'invoicing' ) . '" href="' . esc_url( $edit_link ) . '">' . $wpi_invoice->get_number() . '</a>';
+            $edit_link = get_edit_post_link($post->ID);
+            $value = '<a title="' . esc_attr__('View Invoice Details', 'invoicing') . '" href="' . esc_url($edit_link) . '">' . $wpi_invoice->get_number() . '</a>';
             break;
         case 'wpi_actions' :
             $value = '';
-            if ( !empty( $post->post_name ) ) {
-                $value .= '<a title="' . esc_attr__( 'Print invoice', 'invoicing' ) . '" href="' . esc_url( get_permalink( $post->ID ) ) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
+            if (!empty($post->post_name)) {
+                $value .= '<a title="' . esc_attr__('Print invoice', 'invoicing') . '" href="' . esc_url(get_permalink($post->ID)) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
             }
             
-            if ( $email = $wpi_invoice->get_email() ) {
-                $value .= '<a title="' . esc_attr__( 'Send invoice to customer', 'invoicing' ) . '" href="' . esc_url( add_query_arg( array( 'wpi_action' => 'send_invoice', 'invoice_id' => $post->ID ) ) ) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
+            if ($email = $wpi_invoice->get_email()) {
+                $value .= '<a title="' . esc_attr__('Send invoice to customer', 'invoicing') . '" href="' . esc_url(add_query_arg(array('wpi_action' => 'send_invoice', 'invoice_id' => $post->ID))) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
             }
             
             break;
         default:
-            $value = isset( $post->$column_name ) ? $post->$column_name : '';
+            $value = isset($post->$column_name) ? $post->$column_name : '';
             break;
 
     }
-    $value = apply_filters( 'wpinv_payments_table_column', $value, $post->ID, $column_name );
+    $value = apply_filters('wpinv_payments_table_column', $value, $post->ID, $column_name);
     
-    if ( $value !== NULL ) {
+    if ($value !== NULL) {
         echo $value;
     }
 }
 
-function wpinv_admin_post_id( $id = 0 ) {
+function wpinv_admin_post_id($id = 0) {
     global $post;
 
-    if ( isset( $id ) && ! empty( $id ) ) {
+    if (isset($id) && !empty($id)) {
         return (int)$id;
-    } else if ( get_the_ID() ) {
-        return (int) get_the_ID();
-    } else if ( isset( $post->ID ) && !empty( $post->ID ) ) {
-        return (int) $post->ID;
-    } else if ( isset( $_GET['post'] ) && !empty( $_GET['post'] ) ) {
-        return (int) $_GET['post'];
-    } else if ( isset( $_GET['id'] ) && !empty( $_GET['id'] ) ) {
-        return (int) $_GET['id'];
-    } else if ( isset( $_POST['id'] ) && !empty( $_POST['id'] ) ) {
-        return (int) $_POST['id'];
+    } else if (get_the_ID()) {
+        return (int)get_the_ID();
+    } else if (isset($post->ID) && !empty($post->ID)) {
+        return (int)$post->ID;
+    } else if (isset($_GET['post']) && !empty($_GET['post'])) {
+        return (int)$_GET['post'];
+    } else if (isset($_GET['id']) && !empty($_GET['id'])) {
+        return (int)$_GET['id'];
+    } else if (isset($_POST['id']) && !empty($_POST['id'])) {
+        return (int)$_POST['id'];
     } 
 
     return null;
 }
     
-function wpinv_admin_post_type( $id = 0 ) {
-    if ( !$id ) {
+function wpinv_admin_post_type($id = 0) {
+    if (!$id) {
         $id = wpinv_admin_post_id();
     }
     
-    $type = get_post_type( $id );
+    $type = get_post_type($id);
     
-    if ( !$type ) {
-        $type = isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) ? $_GET['post_type'] : null;
+    if (!$type) {
+        $type = isset($_GET['post_type']) && !empty($_GET['post_type']) ? $_GET['post_type'] : null;
     }
     
-    return apply_filters( 'wpinv_admin_post_type', $type, $id );
+    return apply_filters('wpinv_admin_post_type', $type, $id);
 }
 
 function wpinv_admin_messages() {
 	global $wpinv_options, $pagenow, $post;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_added' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-added', __('Discount code added.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		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'] && current_user_can('manage_options')) {
+		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'] && current_user_can( 'manage_options' ) ) {
-		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'] && current_user_can('manage_options')) {
+		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'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-updated', __('Discount code updated.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		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'] && current_user_can('manage_options')) {
+		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'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-deleted', __('The invoice has been deleted.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		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'] && current_user_can('manage_options')) {
+		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'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+    if (isset($_GET['wpinv-message']) && 'email_fail' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		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'] && current_user_can( 'manage_options' ) ) {
-        add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
+    if (isset($_GET['wpinv-message']) && 'invoice-note-deleted' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+        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'] && current_user_can( 'manage_options' ) ) {
-		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'] && current_user_can('manage_options')) {
+		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'] && current_user_can( 'manage_options' ) ) {
-		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'] && current_user_can('manage_options')) {
+		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'] && current_user_can( 'manage_options' ) ) {
-		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'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-updated', __('The invoice has been successfully updated.', 'invoicing'), 'updated');
 	}
     
-	if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
-		$message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
+	if ($pagenow == 'post.php' && !empty($post->post_type) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable($post)) {
+		$message = apply_filters('wpinv_item_non_editable_message', __('This item in not editable.', 'invoicing'), $post->ID);
 
-		if ( !empty( $message ) ) {
-			add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
+		if (!empty($message)) {
+			add_settings_error('wpinv-notices', 'wpinv-edit-n', $message, 'updated');
 		}
 	}
 
-	settings_errors( 'wpinv-notices' );
+	settings_errors('wpinv-notices');
 }
-add_action( 'admin_notices', 'wpinv_admin_messages' );
+add_action('admin_notices', 'wpinv_admin_messages');
 
-function wpinv_items_columns( $existing_columns ) {
+function wpinv_items_columns($existing_columns) {
     global $wpinv_euvat;
     
     $columns                = array();
     $columns['cb']          = $existing_columns['cb'];
-    $columns['title']       = __( 'Title', 'invoicing' );
-    $columns['price']       = __( 'Price', 'invoicing' );
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        $columns['vat_rule']    = __( 'VAT rule type', 'invoicing' );
+    $columns['title']       = __('Title', 'invoicing');
+    $columns['price']       = __('Price', 'invoicing');
+    if ($wpinv_euvat->allow_vat_rules()) {
+        $columns['vat_rule']    = __('VAT rule type', 'invoicing');
     }
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        $columns['vat_class']   = __( 'VAT class', 'invoicing' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        $columns['vat_class']   = __('VAT class', 'invoicing');
     }
-    $columns['type']        = __( 'Type', 'invoicing' );
-    $columns['recurring']   = __( 'Recurring', 'invoicing' );
-    $columns['date']        = __( 'Date', 'invoicing' );
-    $columns['id']          = __( 'ID', 'invoicing' );
+    $columns['type']        = __('Type', 'invoicing');
+    $columns['recurring']   = __('Recurring', 'invoicing');
+    $columns['date']        = __('Date', 'invoicing');
+    $columns['id']          = __('ID', 'invoicing');
 
-    return apply_filters( 'wpinv_items_columns', $columns );
+    return apply_filters('wpinv_items_columns', $columns);
 }
-add_filter( 'manage_wpi_item_posts_columns', 'wpinv_items_columns' );
+add_filter('manage_wpi_item_posts_columns', 'wpinv_items_columns');
 
-function wpinv_items_sortable_columns( $columns ) {
+function wpinv_items_sortable_columns($columns) {
     $columns['price']       = 'price';
     $columns['vat_rule']    = 'vat_rule';
     $columns['vat_class']   = 'vat_class';
@@ -249,151 +249,151 @@ 
 
     return $columns;
 }
-add_filter( 'manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns' );
+add_filter('manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns');
 
-function wpinv_items_table_custom_column( $column ) {
+function wpinv_items_table_custom_column($column) {
     global $wpinv_euvat, $post, $wpi_item;
     
-    if ( empty( $wpi_item ) || ( !empty( $wpi_item ) && $post->ID != $wpi_item->ID ) ) {
-        $wpi_item = new WPInv_Item( $post->ID );
+    if (empty($wpi_item) || (!empty($wpi_item) && $post->ID != $wpi_item->ID)) {
+        $wpi_item = new WPInv_Item($post->ID);
     }
 
-    switch ( $column ) {
+    switch ($column) {
         case 'price' :
-            echo wpinv_item_price( $post->ID );
+            echo wpinv_item_price($post->ID);
         break;
         case 'vat_rule' :
-            echo $wpinv_euvat->item_rule_label( $post->ID );
+            echo $wpinv_euvat->item_rule_label($post->ID);
         break;
         case 'vat_class' :
-            echo $wpinv_euvat->item_class_label( $post->ID );
+            echo $wpinv_euvat->item_class_label($post->ID);
         break;
         case 'type' :
-            echo wpinv_item_type( $post->ID ) . '<span class="meta">' . $wpi_item->get_custom_singular_name() . '</span>';
+            echo wpinv_item_type($post->ID) . '<span class="meta">' . $wpi_item->get_custom_singular_name() . '</span>';
         break;
         case 'recurring' :
-            echo ( wpinv_is_recurring_item( $post->ID ) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>' );
+            echo (wpinv_is_recurring_item($post->ID) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>');
         break;
         case 'id' :
            echo $post->ID;
            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
-                    <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
-                    if ( $wpinv_euvat->allow_vat_rules() ) {
-                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';
+                    <div class="price">' . wpinv_get_item_price($post->ID) . '</div>';
+                    if ($wpinv_euvat->allow_vat_rules()) {
+                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule($post->ID) . '</div>';
                     }
-                    if ( $wpinv_euvat->allow_vat_classes() ) {
-                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class( $post->ID ) . '</div>';
+                    if ($wpinv_euvat->allow_vat_classes()) {
+                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class($post->ID) . '</div>';
                     }
-                    echo '<div class="type">' . wpinv_get_item_type( $post->ID ) . '</div>
+                    echo '<div class="type">' . wpinv_get_item_type($post->ID) . '</div>
                 </div>';
         break;
     }
     
-    do_action( 'wpinv_items_table_column_item_' . $column, $wpi_item, $post );
+    do_action('wpinv_items_table_column_item_' . $column, $wpi_item, $post);
 }
-add_action( 'manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column' );
+add_action('manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column');
 
 function wpinv_add_items_filters() {
     global $wpinv_euvat, $typenow;
 
     // Checks if the current post type is 'item'
-    if ( $typenow == 'wpi_item') {
-        if ( $wpinv_euvat->allow_vat_rules() ) {
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT rules', 'invoicing' ) ), $wpinv_euvat->get_rules() ),
+    if ($typenow == 'wpi_item') {
+        if ($wpinv_euvat->allow_vat_rules()) {
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT rules', 'invoicing')), $wpinv_euvat->get_rules()),
                     'name'             => 'vat_rule',
                     'id'               => 'vat_rule',
-                    'selected'         => ( isset( $_GET['vat_rule'] ) ? $_GET['vat_rule'] : '' ),
+                    'selected'         => (isset($_GET['vat_rule']) ? $_GET['vat_rule'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium',
-                ) );
+                ));
         }
         
-        if ( $wpinv_euvat->allow_vat_classes() ) {
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT classes', 'invoicing' ) ), $wpinv_euvat->get_all_classes() ),
+        if ($wpinv_euvat->allow_vat_classes()) {
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT classes', 'invoicing')), $wpinv_euvat->get_all_classes()),
                     'name'             => 'vat_class',
                     'id'               => 'vat_class',
-                    'selected'         => ( isset( $_GET['vat_class'] ) ? $_GET['vat_class'] : '' ),
+                    'selected'         => (isset($_GET['vat_class']) ? $_GET['vat_class'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium',
-                ) );
+                ));
         }
             
-        echo wpinv_html_select( array(
-                'options'          => array_merge( array( '' => __( 'All item types', 'invoicing' ) ), wpinv_get_item_types() ),
+        echo wpinv_html_select(array(
+                'options'          => array_merge(array('' => __('All item types', 'invoicing')), wpinv_get_item_types()),
                 'name'             => 'type',
                 'id'               => 'type',
-                'selected'         => ( isset( $_GET['type'] ) ? $_GET['type'] : '' ),
+                'selected'         => (isset($_GET['type']) ? $_GET['type'] : ''),
                 'show_option_all'  => false,
                 'show_option_none' => false,
                 'class'            => 'gdmbx2-text-medium',
-            ) );
+            ));
 
-        if ( isset( $_REQUEST['all_posts'] ) && '1' === $_REQUEST['all_posts'] ) {
+        if (isset($_REQUEST['all_posts']) && '1' === $_REQUEST['all_posts']) {
             echo '<input type="hidden" name="all_posts" value="1" />';
         }
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_add_items_filters', 100 );
+add_action('restrict_manage_posts', 'wpinv_add_items_filters', 100);
 
-function wpinv_send_invoice_after_save( $invoice ) {
-    if ( empty( $_POST['wpi_save_send'] ) ) {
+function wpinv_send_invoice_after_save($invoice) {
+    if (empty($_POST['wpi_save_send'])) {
         return;
     }
     
-    if ( !empty( $invoice->ID ) && !empty( $invoice->post_type ) && 'wpi_invoice' == $invoice->post_type ) {
-        wpinv_user_invoice_notification( $invoice->ID );
+    if (!empty($invoice->ID) && !empty($invoice->post_type) && 'wpi_invoice' == $invoice->post_type) {
+        wpinv_user_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1 );
+add_action('wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1);
 
-function wpinv_send_register_new_user( $data, $postarr ) {
-    if ( current_user_can( 'manage_options' ) && !empty( $data['post_type'] ) && ( 'wpi_invoice' == $data['post_type'] || 'wpi_quote' == $data['post_type'] ) ) {
-        $is_new_user = !empty( $postarr['wpinv_new_user'] ) ? true : false;
-        $email = !empty( $postarr['wpinv_email'] ) && $postarr['wpinv_email'] && is_email( $postarr['wpinv_email'] ) ? $postarr['wpinv_email'] : NULL;
+function wpinv_send_register_new_user($data, $postarr) {
+    if (current_user_can('manage_options') && !empty($data['post_type']) && ('wpi_invoice' == $data['post_type'] || 'wpi_quote' == $data['post_type'])) {
+        $is_new_user = !empty($postarr['wpinv_new_user']) ? true : false;
+        $email = !empty($postarr['wpinv_email']) && $postarr['wpinv_email'] && is_email($postarr['wpinv_email']) ? $postarr['wpinv_email'] : NULL;
         
-        if ( $is_new_user && $email && !email_exists( $email ) ) {
-            $first_name = !empty( $postarr['wpinv_first_name'] ) ? sanitize_text_field( $postarr['wpinv_first_name'] ) : '';
-            $last_name = !empty( $postarr['wpinv_last_name'] ) ? sanitize_text_field( $postarr['wpinv_last_name'] ) : '';
-            $display_name = $first_name || $last_name ? trim( $first_name . ' ' . $last_name ) : '';
-            $user_nicename = $display_name ? trim( $display_name ) : $email;
-            $user_company = !empty( $postarr['wpinv_company'] ) ? sanitize_text_field( $postarr['wpinv_company'] ) : '';
+        if ($is_new_user && $email && !email_exists($email)) {
+            $first_name = !empty($postarr['wpinv_first_name']) ? sanitize_text_field($postarr['wpinv_first_name']) : '';
+            $last_name = !empty($postarr['wpinv_last_name']) ? sanitize_text_field($postarr['wpinv_last_name']) : '';
+            $display_name = $first_name || $last_name ? trim($first_name . ' ' . $last_name) : '';
+            $user_nicename = $display_name ? trim($display_name) : $email;
+            $user_company = !empty($postarr['wpinv_company']) ? sanitize_text_field($postarr['wpinv_company']) : '';
             
-            $user_login = sanitize_user( str_replace( ' ', '', $display_name ), true );
-            if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+            $user_login = sanitize_user(str_replace(' ', '', $display_name), true);
+            if (!(validate_username($user_login) && !username_exists($user_login))) {
                 $new_user_login = strstr($email, '@', true);
-                if ( validate_username( $user_login ) && username_exists( $user_login ) ) {
-                    $user_login = sanitize_user($new_user_login, true );
+                if (validate_username($user_login) && username_exists($user_login)) {
+                    $user_login = sanitize_user($new_user_login, true);
                 }
-                if ( validate_username( $user_login ) && username_exists( $user_login ) ) {
-                    $user_append_text = rand(10,1000);
-                    $user_login = sanitize_user($new_user_login.$user_append_text, true );
+                if (validate_username($user_login) && username_exists($user_login)) {
+                    $user_append_text = rand(10, 1000);
+                    $user_login = sanitize_user($new_user_login . $user_append_text, true);
                 }
                 
-                if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+                if (!(validate_username($user_login) && !username_exists($user_login))) {
                     $user_login = $email;
                 }
             }
             
             $userdata = array(
                 'user_login' => $user_login,
-                'user_pass' => wp_generate_password( 12, false ),
-                'user_email' => sanitize_text_field( $email ),
+                'user_pass' => wp_generate_password(12, false),
+                'user_email' => sanitize_text_field($email),
                 'first_name' => $first_name,
                 'last_name' => $last_name,
-                'user_nicename' => wpinv_utf8_substr( $user_nicename, 0, 50 ),
+                'user_nicename' => wpinv_utf8_substr($user_nicename, 0, 50),
                 'nickname' => $display_name,
                 'display_name' => $display_name,
             );
 
-            $userdata = apply_filters( 'wpinv_register_new_user_data', $userdata );
+            $userdata = apply_filters('wpinv_register_new_user_data', $userdata);
             
-            $new_user_id = wp_insert_user( $userdata );
+            $new_user_id = wp_insert_user($userdata);
             
-            if ( !is_wp_error( $new_user_id ) ) {
+            if (!is_wp_error($new_user_id)) {
                 $data['post_author'] = $new_user_id;
                 $_POST['post_author'] = $new_user_id;
                 $_POST['post_author_override'] = $new_user_id;
@@ -414,27 +414,27 @@ 
                 
                 $meta = array();
                 ///$meta['_wpinv_user_id'] = $new_user_id;
-                foreach ( $meta_fields as $field ) {
-                    $meta['_wpinv_' . $field] = isset( $postarr['wpinv_' . $field] ) ? sanitize_text_field( $postarr['wpinv_' . $field] ) : '';
+                foreach ($meta_fields as $field) {
+                    $meta['_wpinv_' . $field] = isset($postarr['wpinv_' . $field]) ? sanitize_text_field($postarr['wpinv_' . $field]) : '';
                 }
                 
-                $meta = apply_filters( 'wpinv_register_new_user_meta', $meta, $new_user_id );
+                $meta = apply_filters('wpinv_register_new_user_meta', $meta, $new_user_id);
 
                 // Update user meta.
-                foreach ( $meta as $key => $value ) {
-                    update_user_meta( $new_user_id, $key, $value );
+                foreach ($meta as $key => $value) {
+                    update_user_meta($new_user_id, $key, $value);
                 }
                 
-                if ( function_exists( 'wp_send_new_user_notifications' ) ) {
+                if (function_exists('wp_send_new_user_notifications')) {
                     // Send email notifications related to the creation of new user.
-                    wp_send_new_user_notifications( $new_user_id, 'user' );
+                    wp_send_new_user_notifications($new_user_id, 'user');
                 }
             } else {
-                wpinv_error_log( $new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__ );
+                wpinv_error_log($new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__);
             }
         }
     }
     
     return $data;
 }
-add_filter( 'wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2 );
\ No newline at end of file
+add_filter('wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2);
\ No newline at end of file

includes/admin/meta-boxes/class-mb-invoice-details.php

Spacing +87 added lines, -87 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Meta_Box_Details {
-    public static function output( $post ) {
+    public static function output($post) {
         $currency_symbol    = wpinv_currency_symbol();
         $statuses           = wpinv_get_invoice_statuses();
         
-        $post_id            = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice            = new WPInv_Invoice( $post_id );
+        $post_id            = !empty($post->ID) ? $post->ID : 0;
+        $invoice            = new WPInv_Invoice($post_id);
         
-        $status             = $invoice->get_status( false ); // Current status    
+        $status             = $invoice->get_status(false); // Current status    
         $discount           = $invoice->get_discount();
         $discount_code      = $discount > 0 ? $invoice->get_discount_code() : '';
         $invoice_number     = $invoice->get_number();
         
         $date_created       = $invoice->get_created_date();
-        $datetime_created   = strtotime( $date_created );
-        $date_created       = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $datetime_created ) : '';
+        $datetime_created   = strtotime($date_created);
+        $date_created       = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $datetime_created) : '';
         $date_completed     = $invoice->get_completed_date();
-        $date_completed     = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), strtotime( $date_completed ) ) : 'n/a';
-        $title['status'] = __( 'Invoice Status:', 'invoicing' );
-        $title['number'] = __( 'Invoice Number:', 'invoicing' );
-        $mail_notice = esc_attr__( 'After saving invoice, this will send a copy of the invoice to the user&#8217;s email address.', 'invoicing' );
+        $date_completed     = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n(get_option('date_format') . ' ' . get_option('time_format'), strtotime($date_completed)) : 'n/a';
+        $title['status'] = __('Invoice Status:', 'invoicing');
+        $title['number'] = __('Invoice Number:', 'invoicing');
+        $mail_notice = esc_attr__('After saving invoice, this will send a copy of the invoice to the user&#8217;s email address.', 'invoicing');
         
         $title = apply_filters('wpinv_details_metabox_titles', $title, $invoice);
         $statuses = apply_filters('wpinv_invoice_statuses', $statuses, $invoice);
@@ -34,29 +34,29 @@ 
 <div class="gdmbx2-wrap form-table">
     <div class="gdmbx2-metabox gdmbx-field-list" id="gdmbx2-metabox-wpinv_details">
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-created">
-            <div class="gdmbx-th"><label><?php _e( 'Date Created:', 'invoicing' );?></label></div>
-            <div class="gdmbx-td"><?php echo $date_created;?></div>
+            <div class="gdmbx-th"><label><?php _e('Date Created:', 'invoicing'); ?></label></div>
+            <div class="gdmbx-td"><?php echo $date_created; ?></div>
         </div>
-        <?php if ( $invoice->post_type == 'wpi_invoice' && wpinv_get_option( 'overdue_active' ) && ( $invoice->needs_payment() || $invoice->has_status( array( 'auto-draft' ) ) ) ) { ?>
+        <?php if ($invoice->post_type == 'wpi_invoice' && wpinv_get_option('overdue_active') && ($invoice->needs_payment() || $invoice->has_status(array('auto-draft')))) { ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-overdue">
-            <div class="gdmbx-th"><label for="wpinv_due_date"><?php _e( 'Due Date:', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_due_date"><?php _e('Due Date:', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" placeholder="<?php esc_attr_e( 'Y-m-d', 'invoicing' );?>" value="<?php echo esc_attr( $invoice->get_due_date() );?>" id="wpinv_due_date" name="wpinv_due_date" class="regular-text wpiDatepicker" data-minDate="<?php echo esc_attr( date_i18n( 'Y-m-d', $datetime_created ) );?>" data-dateFormat="yy-mm-dd">
+                <input type="text" placeholder="<?php esc_attr_e('Y-m-d', 'invoicing'); ?>" value="<?php echo esc_attr($invoice->get_due_date()); ?>" id="wpinv_due_date" name="wpinv_due_date" class="regular-text wpiDatepicker" data-minDate="<?php echo esc_attr(date_i18n('Y-m-d', $datetime_created)); ?>" data-dateFormat="yy-mm-dd">
             </div>
         </div>
         <?php } ?>
-        <?php if ( $date_completed && $date_completed != 'n/a' ) { ?>
+        <?php if ($date_completed && $date_completed != 'n/a') { ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-completed">
-            <div class="gdmbx-th"><label><?php _e( 'Payment Date:', 'invoicing' );?></label></div>
-            <div class="gdmbx-td"><?php echo $date_completed;?></div>
+            <div class="gdmbx-th"><label><?php _e('Payment Date:', 'invoicing'); ?></label></div>
+            <div class="gdmbx-td"><?php echo $date_completed; ?></div>
         </div>
         <?php } ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-status">
             <div class="gdmbx-th"><label for="wpinv_status"><?php echo $title['status']; ?></label></div>
             <div class="gdmbx-td">
                 <select required="required" id="wpinv_status" name="wpinv_status" class="gdmbx2_select">
-                    <?php foreach ( $statuses as $value => $label ) { ?>
-                    <option value="<?php echo $value;?>" <?php selected( $status, $value );?>><?php echo $label;?></option>
+                    <?php foreach ($statuses as $value => $label) { ?>
+                    <option value="<?php echo $value; ?>" <?php selected($status, $value); ?>><?php echo $label; ?></option>
                     <?php } ?>
                 </select>
             </div>
@@ -64,107 +64,107 @@ 
         <div class="gdmbx-row gdmbx-type-text gdmbx2-id-wpinv-number table-layout">
             <div class="gdmbx-th"><label for="wpinv_number"><?php echo $title['number']; ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" value="<?php echo esc_attr( $invoice_number );?>" id="wpinv_number" name="wpinv_number" class="regular-text" readonly>
+                <input type="text" value="<?php echo esc_attr($invoice_number); ?>" id="wpinv_number" name="wpinv_number" class="regular-text" readonly>
             </div>
         </div>
-        <?php do_action( 'wpinv_meta_box_details_inner', $post_id ); ?>
-        <?php if ( !( $is_paid = ( $invoice->is_paid() || $invoice->is_refunded() ) ) || $discount_code ) { ?>
+        <?php do_action('wpinv_meta_box_details_inner', $post_id); ?>
+        <?php if (!($is_paid = ($invoice->is_paid() || $invoice->is_refunded())) || $discount_code) { ?>
         <div class="gdmbx-row gdmbx-type-text gdmbx2-id-wpinv-discount-code table-layout">
-            <div class="gdmbx-th"><label for="wpinv_discount_code"><?php _e( 'Discount Code:', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_discount_code"><?php _e('Discount Code:', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" value="<?php echo esc_attr( $discount_code ); ?>" id="wpinv_discount" class="medium-text" <?php echo ( $discount_code ? 'readonly' : '' ); ?> /><?php if ( !$is_paid ) { ?><input value="<?php echo esc_attr_e( 'Apply', 'invoicing' ); ?>" class="button button-small button-primary <?php echo ( $discount_code ? 'wpi-hide' : 'wpi-inlineb' ); ?>" id="wpinv-apply-code" type="button" /><input value="<?php echo esc_attr_e( 'Remove', 'invoicing' ); ?>" class="button button-small button-primary <?php echo ( $discount_code ? 'wpi-inlineb' : 'wpi-hide' ); ?>" id="wpinv-remove-code" type="button" /><?php } ?>
+                <input type="text" value="<?php echo esc_attr($discount_code); ?>" id="wpinv_discount" class="medium-text" <?php echo ($discount_code ? 'readonly' : ''); ?> /><?php if (!$is_paid) { ?><input value="<?php echo esc_attr_e('Apply', 'invoicing'); ?>" class="button button-small button-primary <?php echo ($discount_code ? 'wpi-hide' : 'wpi-inlineb'); ?>" id="wpinv-apply-code" type="button" /><input value="<?php echo esc_attr_e('Remove', 'invoicing'); ?>" class="button button-small button-primary <?php echo ($discount_code ? 'wpi-inlineb' : 'wpi-hide'); ?>" id="wpinv-remove-code" type="button" /><?php } ?>
             </div>
         </div>
         <?php } ?>
     </div>
 </div>
 <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-save-send table-layout">
-    <p class="wpi-meta-row wpi-save-send"><label for="wpi_save_send"><?php echo sprintf(__( 'Send %s:', 'invoicing' ),$post_obj->labels->singular_name) ; ?></label>
+    <p class="wpi-meta-row wpi-save-send"><label for="wpi_save_send"><?php echo sprintf(__('Send %s:', 'invoicing'), $post_obj->labels->singular_name); ?></label>
         <select id="wpi_save_send" name="wpi_save_send">
-            <option value="1"><?php _e( 'Yes', 'invoicing' ); ?></option>
-            <option value="" selected="selected"><?php _e( 'No', 'invoicing' ); ?></option>
+            <option value="1"><?php _e('Yes', 'invoicing'); ?></option>
+            <option value="" selected="selected"><?php _e('No', 'invoicing'); ?></option>
         </select>
     </p>
     <p class="wpi-meta-row wpi-send-info"><?php echo $mail_notice; ?></p>
 </div>
-<?php wp_nonce_field( 'wpinv_details', 'wpinv_details_nonce' ) ;?>
+<?php wp_nonce_field('wpinv_details', 'wpinv_details_nonce'); ?>
         <?php
     }
     
-    public static function resend_invoice( $post ) {
+    public static function resend_invoice($post) {
         global $wpi_mb_invoice;
         
-        if ( empty( $wpi_mb_invoice ) ) {
+        if (empty($wpi_mb_invoice)) {
             return;
         }
         
         $text = array(
-            'message'       => esc_attr__( 'This will send a copy of the invoice to the customer&#8217;s email address.', 'invoicing' ),
-            'button_text'   =>  __( 'Resend Invoice', 'invoicing' ),
+            'message'       => esc_attr__('This will send a copy of the invoice to the customer&#8217;s email address.', 'invoicing'),
+            'button_text'   =>  __('Resend Invoice', 'invoicing'),
         );
             
         $text = apply_filters('wpinv_resend_invoice_metabox_text', $text);
-        do_action( 'wpinv_metabox_resend_invoice_before', $wpi_mb_invoice );
+        do_action('wpinv_metabox_resend_invoice_before', $wpi_mb_invoice);
         
-        if ( $email = $wpi_mb_invoice->get_email() ) {
+        if ($email = $wpi_mb_invoice->get_email()) {
             $email_actions = array();
-            $email_actions['email_url']      = add_query_arg( array( 'wpi_action' => 'send_invoice', 'invoice_id' => $post->ID ) );
-            $email_actions['reminder_url']   = add_query_arg( array( 'wpi_action' => 'send_reminder', 'invoice_id' => $post->ID ) );
+            $email_actions['email_url']      = add_query_arg(array('wpi_action' => 'send_invoice', 'invoice_id' => $post->ID));
+            $email_actions['reminder_url']   = add_query_arg(array('wpi_action' => 'send_reminder', 'invoice_id' => $post->ID));
             
-            $email_actions = apply_filters('wpinv_resend_invoice_email_actions', $email_actions );
+            $email_actions = apply_filters('wpinv_resend_invoice_email_actions', $email_actions);
         ?>
         <p class="wpi-meta-row wpi-resend-info"><?php echo $text['message']; ?></p>
-        <p class="wpi-meta-row wpi-resend-email"><a href="<?php echo esc_url( $email_actions['email_url'] ); ?>" class="button button-secondary"><?php echo $text['button_text']; ?></a></p>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && "wpi_invoice" === $wpi_mb_invoice->post_type && $wpi_mb_invoice->needs_payment() && ( $due_date = $wpi_mb_invoice->get_due_date() ) ) { ?>
-        <p class="wpi-meta-row wpi-send-reminder"><a title="<?php esc_attr_e( 'Send overdue reminder notification to customer', 'invoicing' ); ?>" href="<?php echo esc_url( $email_actions['reminder_url'] ); ?>" class="button button-secondary"><?php esc_attr_e( 'Send Reminder', 'invoicing' ); ?></a></p>
+        <p class="wpi-meta-row wpi-resend-email"><a href="<?php echo esc_url($email_actions['email_url']); ?>" class="button button-secondary"><?php echo $text['button_text']; ?></a></p>
+        <?php if (wpinv_get_option('overdue_active') && "wpi_invoice" === $wpi_mb_invoice->post_type && $wpi_mb_invoice->needs_payment() && ($due_date = $wpi_mb_invoice->get_due_date())) { ?>
+        <p class="wpi-meta-row wpi-send-reminder"><a title="<?php esc_attr_e('Send overdue reminder notification to customer', 'invoicing'); ?>" href="<?php echo esc_url($email_actions['reminder_url']); ?>" class="button button-secondary"><?php esc_attr_e('Send Reminder', 'invoicing'); ?></a></p>
         <?php } ?>
         <?php
         }
         
-        do_action( 'wpinv_metabox_resend_invoice_after', $wpi_mb_invoice );
+        do_action('wpinv_metabox_resend_invoice_after', $wpi_mb_invoice);
     }
     
-    public static function subscriptions( $post ) {
+    public static function subscriptions($post) {
         global $wpi_mb_invoice;
         
         $invoice = $wpi_mb_invoice;
         
-        if ( !empty( $invoice ) && $invoice->is_recurring() && $invoice->is_parent() ) {
+        if (!empty($invoice) && $invoice->is_recurring() && $invoice->is_parent()) {
             $payments       = $invoice->get_child_payments();
             
             $total_payments = (int)$invoice->get_total_payments();
             $subscription   = $invoice->get_subscription_data();
 
-            $billing_cycle  = wpinv_get_billing_cycle( $subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency() );
-            $times_billed   = $total_payments . ' / ' . ( ( (int)$subscription['bill_times'] == 0 ) ? __( 'Until cancelled', 'invoicing' ) : $subscription['bill_times'] );
+            $billing_cycle  = wpinv_get_billing_cycle($subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency());
+            $times_billed   = $total_payments . ' / ' . (((int)$subscription['bill_times'] == 0) ? __('Until cancelled', 'invoicing') : $subscription['bill_times']);
             $subscription_status = $invoice->get_subscription_status();
             ?>
-            <p class="wpi-meta-row wpi-sub-label"><?php _e( 'Recurring Payment', 'invoicing' );?></p>
-            <?php if ( $subscription_id = $invoice->get_subscription_id() ) { ?>
-            <p class="wpi-meta-row wpi-sub-id"><label><?php _e( 'Subscription ID:', 'invoicing' );?> </label><?php echo $subscription_id; ?></p>
+            <p class="wpi-meta-row wpi-sub-label"><?php _e('Recurring Payment', 'invoicing'); ?></p>
+            <?php if ($subscription_id = $invoice->get_subscription_id()) { ?>
+            <p class="wpi-meta-row wpi-sub-id"><label><?php _e('Subscription ID:', 'invoicing'); ?> </label><?php echo $subscription_id; ?></p>
             <?php } ?>
-            <p class="wpi-meta-row wpi-bill-cycle"><label><?php _e( 'Billing Cycle:', 'invoicing' );?> </label><?php echo $billing_cycle; ?></p>
-            <p class="wpi-meta-row wpi-billed-times"><label><?php _e( 'Times Billed:', 'invoicing' );?> </label><?php echo $times_billed; ?></p>
-            <?php if ( !empty( $payments ) || $invoice->is_paid() ) { ?>
-                <p class="wpi-meta-row wpi-start-date"><label><?php _e( 'Start Date:', 'invoicing' );?> </label><?php echo $invoice->get_subscription_start(); ?></p>
-                <p class="wpi-meta-row wpi-end-date"><label><?php _e( 'Expiration Date:', 'invoicing' );?> </label><?php echo $invoice->get_subscription_end(); ?></p>
-                <?php if ( $status_label = $invoice->get_subscription_status_label( $subscription_status ) ) { ?>
-                <p class="wpi-meta-row wpi-sub-status"><label><?php _e( 'Subscription Status:', 'invoicing' );?> </label><?php echo $status_label; ?></p>
+            <p class="wpi-meta-row wpi-bill-cycle"><label><?php _e('Billing Cycle:', 'invoicing'); ?> </label><?php echo $billing_cycle; ?></p>
+            <p class="wpi-meta-row wpi-billed-times"><label><?php _e('Times Billed:', 'invoicing'); ?> </label><?php echo $times_billed; ?></p>
+            <?php if (!empty($payments) || $invoice->is_paid()) { ?>
+                <p class="wpi-meta-row wpi-start-date"><label><?php _e('Start Date:', 'invoicing'); ?> </label><?php echo $invoice->get_subscription_start(); ?></p>
+                <p class="wpi-meta-row wpi-end-date"><label><?php _e('Expiration Date:', 'invoicing'); ?> </label><?php echo $invoice->get_subscription_end(); ?></p>
+                <?php if ($status_label = $invoice->get_subscription_status_label($subscription_status)) { ?>
+                <p class="wpi-meta-row wpi-sub-status"><label><?php _e('Subscription Status:', 'invoicing'); ?> </label><?php echo $status_label; ?></p>
                 <?php } ?>
-                <?php if ( $subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date() ) { ?>
-                <p class="wpi-meta-row wpi-trial-date"><label><?php _e( 'Trial Until:', 'invoicing' );?> </label><?php echo $trial_end_date; ?></p>
+                <?php if ($subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date()) { ?>
+                <p class="wpi-meta-row wpi-trial-date"><label><?php _e('Trial Until:', 'invoicing'); ?> </label><?php echo $trial_end_date; ?></p>
                 <?php } ?>
-                <?php if ( $cancelled_date = $invoice->get_cancelled_date() ) { ?>
-                <p class="wpi-meta-row wpi-cancel-date"><label><?php _e( 'Cancelled On:', 'invoicing' );?> </label><?php echo $cancelled_date; ?></p>
+                <?php if ($cancelled_date = $invoice->get_cancelled_date()) { ?>
+                <p class="wpi-meta-row wpi-cancel-date"><label><?php _e('Cancelled On:', 'invoicing'); ?> </label><?php echo $cancelled_date; ?></p>
                 <?php } ?>
-                <?php if ( !empty( $payments ) ) { ?>
-                <p><strong><?php _e( 'Renewal Payments:', 'invoicing' ); ?></strong></p>
+                <?php if (!empty($payments)) { ?>
+                <p><strong><?php _e('Renewal Payments:', 'invoicing'); ?></strong></p>
                 <ul id="wpi-sub-payments">
-                <?php foreach ( $payments as $invoice_id ) { ?>
+                <?php foreach ($payments as $invoice_id) { ?>
                     <li>
-                        <a href="<?php echo esc_url( get_edit_post_link( $invoice_id ) ); ?>"><?php echo wpinv_get_invoice_number( $invoice_id ); ?></a>&nbsp;&ndash;&nbsp;
-                        <span><?php echo wpinv_get_invoice_date( $invoice_id ); ?>&nbsp;&ndash;&nbsp;</span>
-                        <span><?php echo wpinv_payment_total( $invoice_id, true ); ?></span>
+                        <a href="<?php echo esc_url(get_edit_post_link($invoice_id)); ?>"><?php echo wpinv_get_invoice_number($invoice_id); ?></a>&nbsp;&ndash;&nbsp;
+                        <span><?php echo wpinv_get_invoice_date($invoice_id); ?>&nbsp;&ndash;&nbsp;</span>
+                        <span><?php echo wpinv_payment_total($invoice_id, true); ?></span>
                     </li>
                 <?php } ?>
                 </ul>
@@ -172,49 +172,49 @@ 
         }
     }
     
-    public static function renewals( $post ) {
+    public static function renewals($post) {
         global $wpi_mb_invoice;
         
-        if ( wpinv_is_subscription_payment( $wpi_mb_invoice ) ) {
-            $parent_url = get_edit_post_link( $wpi_mb_invoice->parent_invoice );
-            $parent_id  = wpinv_get_invoice_number( $wpi_mb_invoice->parent_invoice );
+        if (wpinv_is_subscription_payment($wpi_mb_invoice)) {
+            $parent_url = get_edit_post_link($wpi_mb_invoice->parent_invoice);
+            $parent_id  = wpinv_get_invoice_number($wpi_mb_invoice->parent_invoice);
         ?>
-        <p class="wpi-meta-row wpi-sub-id"><label><?php _e( 'Subscription ID:', 'invoicing' );?> </label><?php echo $wpi_mb_invoice->get_subscription_id(); ?></p>
-        <p class="wpi-meta-row wpi-parent-id"><label><?php _e( 'Parent Invoice:', 'invoicing' );?> </label><a href="<?php echo esc_url( $parent_url ); ?>"><?php echo $parent_id; ?></a></p>
+        <p class="wpi-meta-row wpi-sub-id"><label><?php _e('Subscription ID:', 'invoicing'); ?> </label><?php echo $wpi_mb_invoice->get_subscription_id(); ?></p>
+        <p class="wpi-meta-row wpi-parent-id"><label><?php _e('Parent Invoice:', 'invoicing'); ?> </label><a href="<?php echo esc_url($parent_url); ?>"><?php echo $parent_id; ?></a></p>
         <?php
         }
     }
     
-    public static function payment_meta( $post ) {
+    public static function payment_meta($post) {
         global $wpi_mb_invoice;
 
-        $set_dateway = empty( $wpi_mb_invoice->gateway ) ? true : false;
-        if ( !$set_dateway && !$wpi_mb_invoice->get_meta( '_wpinv_checkout', true ) && !$wpi_mb_invoice->is_paid() && !$wpi_mb_invoice->is_refunded() ) {
+        $set_dateway = empty($wpi_mb_invoice->gateway) ? true : false;
+        if (!$set_dateway && !$wpi_mb_invoice->get_meta('_wpinv_checkout', true) && !$wpi_mb_invoice->is_paid() && !$wpi_mb_invoice->is_refunded()) {
             $set_dateway = true;
         }
         
         ?>
         <p class="wpi-meta-row">
-        <?php if ( $set_dateway ) { $gateways = wpinv_get_enabled_payment_gateways( true ); ?>
-            <label for="wpinv_gateway"><?php _e( 'Gateway:', 'invoicing' ) ; ?></label>
+        <?php if ($set_dateway) { $gateways = wpinv_get_enabled_payment_gateways(true); ?>
+            <label for="wpinv_gateway"><?php _e('Gateway:', 'invoicing'); ?></label>
             <select required="required" id="wpinv_gateway" name="wpinv_gateway">
-                <?php foreach ( $gateways as $name => $gateway ) {
-                    if ( $wpi_mb_invoice->is_recurring() && !wpinv_gateway_support_subscription( $name ) ) {
+                <?php foreach ($gateways as $name => $gateway) {
+                    if ($wpi_mb_invoice->is_recurring() && !wpinv_gateway_support_subscription($name)) {
                         continue;
                     }
                     ?>
-                <option value="<?php echo $name;?>" <?php selected( $wpi_mb_invoice->gateway, $name );?>><?php echo !empty( $gateway['admin_label'] ) ? $gateway['admin_label'] : $gateway['checkout_label']; ?></option>
+                <option value="<?php echo $name; ?>" <?php selected($wpi_mb_invoice->gateway, $name); ?>><?php echo !empty($gateway['admin_label']) ? $gateway['admin_label'] : $gateway['checkout_label']; ?></option>
                 <?php } ?>
             </select>
         <?php } else { 
-            echo wp_sprintf( __( '<label>Gateway:</label> %s', 'invoicing' ), wpinv_get_gateway_checkout_label( $wpi_mb_invoice->gateway ) );
+            echo wp_sprintf(__('<label>Gateway:</label> %s', 'invoicing'), wpinv_get_gateway_checkout_label($wpi_mb_invoice->gateway));
         } ?>
         </p>
-        <?php if ( $key = $wpi_mb_invoice->get_key() ) { ?>
-        <p class="wpi-meta-row"><?php echo wp_sprintf( __( '<label>Key:</label> %s', 'invoicing' ), $key ); ?></p>
+        <?php if ($key = $wpi_mb_invoice->get_key()) { ?>
+        <p class="wpi-meta-row"><?php echo wp_sprintf(__('<label>Key:</label> %s', 'invoicing'), $key); ?></p>
         <?php } ?>
-        <?php if ( $wpi_mb_invoice->is_paid() || $wpi_mb_invoice->is_refunded() ) { ?>
-        <p class="wpi-meta-row"><?php echo wp_sprintf( __( '<label>Transaction ID:</label> %s', 'invoicing' ), wpinv_payment_link_transaction_id( $wpi_mb_invoice ) ); ?></p>
+        <?php if ($wpi_mb_invoice->is_paid() || $wpi_mb_invoice->is_refunded()) { ?>
+        <p class="wpi-meta-row"><?php echo wp_sprintf(__('<label>Transaction ID:</label> %s', 'invoicing'), wpinv_payment_link_transaction_id($wpi_mb_invoice)); ?></p>
         <?php } ?>
         <?php
     }

includes/wpinv-invoice-functions.php

Spacing +713 added lines, -713 removed lines

@@ -7,40 +7,40 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_get_invoice_cart_id() {
     $wpinv_checkout = wpinv_get_checkout_session();
     
-    if ( !empty( $wpinv_checkout['invoice_id'] ) ) {
+    if (!empty($wpinv_checkout['invoice_id'])) {
         return $wpinv_checkout['invoice_id'];
     }
     
     return NULL;
 }
 
-function wpinv_insert_invoice( $invoice_data = array(), $wp_error = false ) {
-    if ( empty( $invoice_data ) ) {
+function wpinv_insert_invoice($invoice_data = array(), $wp_error = false) {
+    if (empty($invoice_data)) {
         return false;
     }
     
-    if ( !( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) ) ) {
-        return $wp_error ? new WP_Error( 'wpinv_invalid_items', __( 'Invoice must have atleast on item.', 'invoicing' ) ) : 0;
+    if (!(!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details']))) {
+        return $wp_error ? new WP_Error('wpinv_invalid_items', __('Invoice must have atleast on item.', 'invoicing')) : 0;
     }
     
-    if ( empty( $invoice_data['user_id'] ) ) {
+    if (empty($invoice_data['user_id'])) {
         $invoice_data['user_id'] = get_current_user_id();
     }
     
-    $invoice_data['invoice_id'] = !empty( $invoice_data['invoice_id'] ) ? (int)$invoice_data['invoice_id'] : 0;
+    $invoice_data['invoice_id'] = !empty($invoice_data['invoice_id']) ? (int)$invoice_data['invoice_id'] : 0;
     
-    if ( empty( $invoice_data['status'] ) ) {
+    if (empty($invoice_data['status'])) {
         $invoice_data['status'] = 'pending';
     }
     
-    if ( empty( $invoice_data['ip'] ) ) {
+    if (empty($invoice_data['ip'])) {
         $invoice_data['ip'] = wpinv_get_ip();
     }
 
@@ -51,12 +51,12 @@ 
         'status'        => $invoice_data['status'],
     );
 
-    $invoice = wpinv_create_invoice( $default_args, $invoice_data, true );
-    if ( is_wp_error( $invoice ) ) {
+    $invoice = wpinv_create_invoice($default_args, $invoice_data, true);
+    if (is_wp_error($invoice)) {
         return $wp_error ? $invoice : 0;
     }
     
-    if ( empty( $invoice_data['invoice_id'] ) ) {
+    if (empty($invoice_data['invoice_id'])) {
         //$invoice->add_note( wp_sprintf( __( 'Invoice is created with status %s.', 'invoicing' ), wpinv_status_nicename( $invoice->status ) ) );
     }
     
@@ -79,24 +79,24 @@ 
         'discount'              => array(),
     );
 
-    if ( $user_id = (int)$invoice->get_user_id() ) {
-        if ( $user_address = wpinv_get_user_address( $user_id ) ) {
-            $default_user_info = wp_parse_args( $user_address, $default_user_info );
+    if ($user_id = (int)$invoice->get_user_id()) {
+        if ($user_address = wpinv_get_user_address($user_id)) {
+            $default_user_info = wp_parse_args($user_address, $default_user_info);
         }
     }
     
-    if ( empty( $invoice_data['user_info'] ) ) {
+    if (empty($invoice_data['user_info'])) {
         $invoice_data['user_info'] = array();
     }
     
-    $user_info = wp_parse_args( $invoice_data['user_info'], $default_user_info );
+    $user_info = wp_parse_args($invoice_data['user_info'], $default_user_info);
     
-    if ( empty( $user_info['first_name'] ) ) {
+    if (empty($user_info['first_name'])) {
         $user_info['first_name'] = $default_user_info['first_name'];
         $user_info['last_name'] = $default_user_info['last_name'];
     }
     
-    if ( empty( $user_info['country'] ) ) {
+    if (empty($user_info['country'])) {
         $user_info['country'] = $default_user_info['country'];
         $user_info['state'] = $default_user_info['state'];
         $user_info['city'] = $default_user_info['city'];
@@ -105,13 +105,13 @@ 
         $user_info['phone'] = $default_user_info['phone'];
     }
     
-    if ( !empty( $user_info['discount'] ) && !is_array( $user_info['discount'] ) ) {
+    if (!empty($user_info['discount']) && !is_array($user_info['discount'])) {
         $user_info['discount'] = (array)$user_info['discount'];
     }
 
     // Payment details
     $payment_details = array();
-    if ( !empty( $invoice_data['payment_details'] ) ) {
+    if (!empty($invoice_data['payment_details'])) {
         $default_payment_details = array(
             'gateway'           => 'manual',
             'gateway_title'     => '',
@@ -119,56 +119,56 @@ 
             'transaction_id'    => '',
         );
         
-        $payment_details = wp_parse_args( $invoice_data['payment_details'], $default_payment_details );
+        $payment_details = wp_parse_args($invoice_data['payment_details'], $default_payment_details);
         
-        if ( empty( $payment_details['gateway'] ) ) {
+        if (empty($payment_details['gateway'])) {
             $payment_details['gateway'] = 'manual';
         }
         
-        if ( empty( $payment_details['currency'] ) ) {
+        if (empty($payment_details['currency'])) {
             $payment_details['currency'] = geodir_get_currency_type();
         }
         
-        if ( empty( $payment_details['gateway_title'] ) ) {
-            $payment_details['gateway_title'] = wpinv_get_gateway_checkout_label( $payment_details['gateway'] );
+        if (empty($payment_details['gateway_title'])) {
+            $payment_details['gateway_title'] = wpinv_get_gateway_checkout_label($payment_details['gateway']);
         }
     }
     
-    $invoice->set( 'status', ( !empty( $invoice_data['status'] ) ? $invoice_data['status'] : 'wpi-pending' ) );
-    
-    if ( !empty( $payment_details ) ) {
-        $invoice->set( 'currency', $payment_details['currency'] );
-        $invoice->set( 'gateway', $payment_details['gateway'] );
-        $invoice->set( 'gateway_title', $payment_details['gateway_title'] );
-        $invoice->set( 'transaction_id', $payment_details['transaction_id'] );
-    }
-    
-    $invoice->set( 'user_info', $user_info );
-    $invoice->set( 'first_name', $user_info['first_name'] );
-    $invoice->set( 'last_name', $user_info['last_name'] );
-    $invoice->set( 'address', $user_info['address'] );
-    $invoice->set( 'company', $user_info['company'] );
-    $invoice->set( 'vat_number', $user_info['vat_number'] );
-    $invoice->set( 'phone', $user_info['phone'] );
-    $invoice->set( 'city', $user_info['city'] );
-    $invoice->set( 'country', $user_info['country'] );
-    $invoice->set( 'state', $user_info['state'] );
-    $invoice->set( 'zip', $user_info['zip'] );
-    $invoice->set( 'discounts', $user_info['discount'] );
-    $invoice->set( 'ip', ( !empty( $invoice_data['ip'] ) ? $invoice_data['ip'] : wpinv_get_ip() ) );
-    $invoice->set( 'mode', ( wpinv_is_test_mode() ? 'test' : 'live' ) );
-    $invoice->set( 'parent_invoice', ( !empty( $invoice_data['parent'] ) ? absint( $invoice_data['parent'] ) : '' ) );
-    
-    if ( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) ) {
-        foreach ( $invoice_data['cart_details'] as $key => $item ) {
-            $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-            $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-            $name           = !empty( $item['name'] ) ? $item['name'] : '';
-            $item_price     = isset( $item['item_price'] ) ? $item['item_price'] : '';
+    $invoice->set('status', (!empty($invoice_data['status']) ? $invoice_data['status'] : 'wpi-pending'));
+    
+    if (!empty($payment_details)) {
+        $invoice->set('currency', $payment_details['currency']);
+        $invoice->set('gateway', $payment_details['gateway']);
+        $invoice->set('gateway_title', $payment_details['gateway_title']);
+        $invoice->set('transaction_id', $payment_details['transaction_id']);
+    }
+    
+    $invoice->set('user_info', $user_info);
+    $invoice->set('first_name', $user_info['first_name']);
+    $invoice->set('last_name', $user_info['last_name']);
+    $invoice->set('address', $user_info['address']);
+    $invoice->set('company', $user_info['company']);
+    $invoice->set('vat_number', $user_info['vat_number']);
+    $invoice->set('phone', $user_info['phone']);
+    $invoice->set('city', $user_info['city']);
+    $invoice->set('country', $user_info['country']);
+    $invoice->set('state', $user_info['state']);
+    $invoice->set('zip', $user_info['zip']);
+    $invoice->set('discounts', $user_info['discount']);
+    $invoice->set('ip', (!empty($invoice_data['ip']) ? $invoice_data['ip'] : wpinv_get_ip()));
+    $invoice->set('mode', (wpinv_is_test_mode() ? 'test' : 'live'));
+    $invoice->set('parent_invoice', (!empty($invoice_data['parent']) ? absint($invoice_data['parent']) : ''));
+    
+    if (!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details'])) {
+        foreach ($invoice_data['cart_details'] as $key => $item) {
+            $item_id        = !empty($item['id']) ? $item['id'] : 0;
+            $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+            $name           = !empty($item['name']) ? $item['name'] : '';
+            $item_price     = isset($item['item_price']) ? $item['item_price'] : '';
             
-            $post_item  = new WPInv_Item( $item_id );
-            if ( !empty( $post_item ) ) {
-                $name       = !empty( $name ) ? $name : $post_item->get_name();
+            $post_item = new WPInv_Item($item_id);
+            if (!empty($post_item)) {
+                $name       = !empty($name) ? $name : $post_item->get_name();
                 $item_price = $item_price !== '' ? $item_price : $post_item->get_price();
             } else {
                 continue;
@@ -178,253 +178,253 @@ 
                 'name'          => $name,
                 'quantity'      => $quantity,
                 'item_price'    => $item_price,
-                'custom_price'  => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
-                'tax'           => !empty( $item['tax'] ) ? $item['tax'] : 0.00,
-                'discount'      => isset( $item['discount'] ) ? $item['discount'] : 0,
-                'meta'          => isset( $item['meta'] ) ? $item['meta'] : array(),
-                'fees'          => isset( $item['fees'] ) ? $item['fees'] : array(),
+                'custom_price'  => isset($item['custom_price']) ? $item['custom_price'] : '',
+                'tax'           => !empty($item['tax']) ? $item['tax'] : 0.00,
+                'discount'      => isset($item['discount']) ? $item['discount'] : 0,
+                'meta'          => isset($item['meta']) ? $item['meta'] : array(),
+                'fees'          => isset($item['fees']) ? $item['fees'] : array(),
             );
 
-            $invoice->add_item( $item_id, $args );
+            $invoice->add_item($item_id, $args);
         }
     }
 
-    $invoice->increase_tax( wpinv_get_cart_fee_tax() );
+    $invoice->increase_tax(wpinv_get_cart_fee_tax());
 
-    if ( isset( $invoice_data['post_date'] ) ) {
-        $invoice->set( 'date', $invoice_data['post_date'] );
+    if (isset($invoice_data['post_date'])) {
+        $invoice->set('date', $invoice_data['post_date']);
     }
     
     // Invoice due date
-    if ( isset( $invoice_data['due_date'] ) ) {
-        $invoice->set( 'due_date', $invoice_data['due_date'] );
+    if (isset($invoice_data['due_date'])) {
+        $invoice->set('due_date', $invoice_data['due_date']);
     }
     
     $invoice->save();
     
     // Add notes
-    if ( !empty( $invoice_data['private_note'] ) ) {
-        $invoice->add_note( $invoice_data['private_note'] );
+    if (!empty($invoice_data['private_note'])) {
+        $invoice->add_note($invoice_data['private_note']);
     }
-    if ( !empty( $invoice_data['user_note'] ) ) {
-        $invoice->add_note( $invoice_data['user_note'], true );
+    if (!empty($invoice_data['user_note'])) {
+        $invoice->add_note($invoice_data['user_note'], true);
     }
     
-    do_action( 'wpinv_insert_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_insert_invoice', $invoice->ID, $invoice_data);
 
-    if ( ! empty( $invoice->ID ) ) {
+    if (!empty($invoice->ID)) {
         global $wpi_userID, $wpinv_ip_address_country;
         
         $checkout_session = wpinv_get_checkout_session();
         
         $data_session                   = array();
         $data_session['invoice_id']     = $invoice->ID;
-        $data_session['cart_discounts'] = $invoice->get_discounts( true );
+        $data_session['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data_session );
+        wpinv_set_checkout_session($data_session);
         
         $wpi_userID         = (int)$invoice->get_user_id();
         
-        $_POST['country']   = !empty( $invoice->country ) ? $invoice->country : wpinv_get_default_country();
+        $_POST['country']   = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
         $_POST['state']     = $invoice->state;
 
-        $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-        $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->set('country', sanitize_text_field($_POST['country']));
+        $invoice->set('state', sanitize_text_field($_POST['state']));
         
         $wpinv_ip_address_country = $invoice->country;
         
-        $invoice = $invoice->recalculate_totals( true );
+        $invoice = $invoice->recalculate_totals(true);
         
-        wpinv_set_checkout_session( $checkout_session );
+        wpinv_set_checkout_session($checkout_session);
                     
         return $invoice;
     }
     
-    if ( $wp_error ) {
-        if ( is_wp_error( $invoice ) ) {
+    if ($wp_error) {
+        if (is_wp_error($invoice)) {
             return $invoice;
         } else {
-            return new WP_Error( 'wpinv_insert_invoice_error', __( 'Error in insert invoice.', 'invoicing' ) );
+            return new WP_Error('wpinv_insert_invoice_error', __('Error in insert invoice.', 'invoicing'));
         }
     } else {
         return 0;
     }
 }
 
-function wpinv_update_invoice( $invoice_data = array(), $wp_error = false ) {
-    $invoice_ID = !empty( $invoice_data['ID'] ) ? absint( $invoice_data['ID'] ) : NULL;
+function wpinv_update_invoice($invoice_data = array(), $wp_error = false) {
+    $invoice_ID = !empty($invoice_data['ID']) ? absint($invoice_data['ID']) : NULL;
 
-    if ( !$invoice_ID ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice_id', __( 'Invalid invoice ID.', 'invoicing' ) );
+    if (!$invoice_ID) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice_id', __('Invalid invoice ID.', 'invoicing'));
         }
         return 0;
     }
 
-    $invoice = wpinv_get_invoice( $invoice_ID );
+    $invoice = wpinv_get_invoice($invoice_ID);
 
-    $recurring_item = $invoice->is_recurring() ? $invoice->get_recurring( true ) : NULL;
+    $recurring_item = $invoice->is_recurring() ? $invoice->get_recurring(true) : NULL;
 
-    if ( empty( $invoice->ID ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice', __( 'Invalid invoice.', 'invoicing' ) );
+    if (empty($invoice->ID)) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice', __('Invalid invoice.', 'invoicing'));
         }
         return 0;
     }
 
-    if ( !$invoice->has_status( array( 'wpi-pending' ) ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice_status', __( 'Only invoice with pending payment is allowed to update.', 'invoicing' ) );
+    if (!$invoice->has_status(array('wpi-pending'))) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice_status', __('Only invoice with pending payment is allowed to update.', 'invoicing'));
         }
         return 0;
     }
 
     // Invoice status
-    if ( !empty( $invoice_data['status'] ) ) {
-        $invoice->set( 'status', $invoice_data['status'] );
+    if (!empty($invoice_data['status'])) {
+        $invoice->set('status', $invoice_data['status']);
     }
 
     // Invoice date
-    if ( !empty( $invoice_data['post_date'] ) ) {
-        $invoice->set( 'date', $invoice_data['post_date'] );
+    if (!empty($invoice_data['post_date'])) {
+        $invoice->set('date', $invoice_data['post_date']);
     }
 
     // Invoice due date
-    if ( isset( $invoice_data['due_date'] ) ) {
-        $invoice->set( 'due_date', $invoice_data['due_date'] );
+    if (isset($invoice_data['due_date'])) {
+        $invoice->set('due_date', $invoice_data['due_date']);
     }
 
     // Invoice IP address
-    if ( !empty( $invoice_data['ip'] ) ) {
-        $invoice->set( 'ip', $invoice_data['ip'] );
+    if (!empty($invoice_data['ip'])) {
+        $invoice->set('ip', $invoice_data['ip']);
     }
     
     // User info
-    if ( !empty( $invoice_data['user_info'] ) && is_array( $invoice_data['user_info'] ) ) {
-        $user_info = wp_parse_args( $invoice_data['user_info'], $invoice->user_info );
+    if (!empty($invoice_data['user_info']) && is_array($invoice_data['user_info'])) {
+        $user_info = wp_parse_args($invoice_data['user_info'], $invoice->user_info);
 
-        if ( $discounts = $invoice->get_discounts() ) {
+        if ($discounts = $invoice->get_discounts()) {
             $set_discount = $discounts;
         } else {
             $set_discount = '';
         }
 
         // Manage discount
-        if ( !empty( $invoice_data['user_info']['discount'] ) ) {
+        if (!empty($invoice_data['user_info']['discount'])) {
             // Remove discount
-            if ( $invoice_data['user_info']['discount'] == 'none' ) {
+            if ($invoice_data['user_info']['discount'] == 'none') {
                 $set_discount = '';
             } else {
                 $set_discount = $invoice_data['user_info']['discount'];
             }
 
-            $invoice->set( 'discounts', $set_discount );
+            $invoice->set('discounts', $set_discount);
         }
 
         $user_info['discount'] = $set_discount;
 
-        $invoice->set( 'user_info', $user_info );
+        $invoice->set('user_info', $user_info);
     }
 
-    if ( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) && $cart_details = $invoice_data['cart_details'] ) {
-        $remove_items = !empty( $cart_details['remove_items'] ) && is_array( $cart_details['remove_items'] ) ? $cart_details['remove_items'] : array();
+    if (!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details']) && $cart_details = $invoice_data['cart_details']) {
+        $remove_items = !empty($cart_details['remove_items']) && is_array($cart_details['remove_items']) ? $cart_details['remove_items'] : array();
 
-        if ( !empty( $remove_items[0]['id'] ) ) {
-            foreach ( $remove_items as $item ) {
-                $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-                $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-                if ( empty( $item_id ) ) {
+        if (!empty($remove_items[0]['id'])) {
+            foreach ($remove_items as $item) {
+                $item_id        = !empty($item['id']) ? $item['id'] : 0;
+                $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+                if (empty($item_id)) {
                     continue;
                 }
 
-                foreach ( $invoice->cart_details as $cart_index => $cart_item ) {
-                    if ( $item_id == $cart_item['id'] ) {
+                foreach ($invoice->cart_details as $cart_index => $cart_item) {
+                    if ($item_id == $cart_item['id']) {
                         $args = array(
                             'id'         => $item_id,
                             'quantity'   => $quantity,
                             'cart_index' => $cart_index
                         );
 
-                        $invoice->remove_item( $item_id, $args );
+                        $invoice->remove_item($item_id, $args);
                         break;
                     }
                 }
             }
         }
 
-        $add_items = !empty( $cart_details['add_items'] ) && is_array( $cart_details['add_items'] ) ? $cart_details['add_items'] : array();
+        $add_items = !empty($cart_details['add_items']) && is_array($cart_details['add_items']) ? $cart_details['add_items'] : array();
 
-        if ( !empty( $add_items[0]['id'] ) ) {
-            foreach ( $add_items as $item ) {
-                $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-                $post_item      = new WPInv_Item( $item_id );
-                if ( empty( $post_item ) ) {
+        if (!empty($add_items[0]['id'])) {
+            foreach ($add_items as $item) {
+                $item_id        = !empty($item['id']) ? $item['id'] : 0;
+                $post_item      = new WPInv_Item($item_id);
+                if (empty($post_item)) {
                     continue;
                 }
 
                 $valid_item = true;
-                if ( !empty( $recurring_item ) ) {
-                    if ( $recurring_item->ID != $item_id ) {
+                if (!empty($recurring_item)) {
+                    if ($recurring_item->ID != $item_id) {
                         $valid_item = false;
                     }
-                } else if ( wpinv_is_recurring_item( $item_id ) ) {
+                } else if (wpinv_is_recurring_item($item_id)) {
                     $valid_item = false;
                 }
                 
-                if ( !$valid_item ) {
-                    if ( $wp_error ) {
-                        return new WP_Error( 'invalid_invoice_item', __( 'You can not add item to invoice because recurring item must be paid individually!', 'invoicing' ) );
+                if (!$valid_item) {
+                    if ($wp_error) {
+                        return new WP_Error('invalid_invoice_item', __('You can not add item to invoice because recurring item must be paid individually!', 'invoicing'));
                     }
                     return 0;
                 }
 
-                $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-                $name           = !empty( $item['name'] ) ? $item['name'] : $post_item->get_name();
-                $item_price     = isset( $item['item_price'] ) ? $item['item_price'] : $post_item->get_price();
+                $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+                $name           = !empty($item['name']) ? $item['name'] : $post_item->get_name();
+                $item_price     = isset($item['item_price']) ? $item['item_price'] : $post_item->get_price();
 
                 $args = array(
                     'name'          => $name,
                     'quantity'      => $quantity,
                     'item_price'    => $item_price,
-                    'custom_price'  => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
-                    'tax'           => !empty( $item['tax'] ) ? $item['tax'] : 0,
-                    'discount'      => isset( $item['discount'] ) ? $item['discount'] : 0,
-                    'meta'          => isset( $item['meta'] ) ? $item['meta'] : array(),
-                    'fees'          => isset( $item['fees'] ) ? $item['fees'] : array(),
+                    'custom_price'  => isset($item['custom_price']) ? $item['custom_price'] : '',
+                    'tax'           => !empty($item['tax']) ? $item['tax'] : 0,
+                    'discount'      => isset($item['discount']) ? $item['discount'] : 0,
+                    'meta'          => isset($item['meta']) ? $item['meta'] : array(),
+                    'fees'          => isset($item['fees']) ? $item['fees'] : array(),
                 );
 
-                $invoice->add_item( $item_id, $args );
+                $invoice->add_item($item_id, $args);
             }
         }
     }
     
     // Payment details
-    if ( !empty( $invoice_data['payment_details'] ) && $payment_details = $invoice_data['payment_details'] ) {
-        if ( !empty( $payment_details['gateway'] ) ) {
-            $invoice->set( 'gateway', $payment_details['gateway'] );
+    if (!empty($invoice_data['payment_details']) && $payment_details = $invoice_data['payment_details']) {
+        if (!empty($payment_details['gateway'])) {
+            $invoice->set('gateway', $payment_details['gateway']);
         }
 
-        if ( !empty( $payment_details['transaction_id'] ) ) {
-            $invoice->set( 'transaction_id', $payment_details['transaction_id'] );
+        if (!empty($payment_details['transaction_id'])) {
+            $invoice->set('transaction_id', $payment_details['transaction_id']);
         }
     }
 
-    do_action( 'wpinv_pre_update_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_pre_update_invoice', $invoice->ID, $invoice_data);
 
     // Parent invoice
-    if ( !empty( $invoice_data['parent'] ) ) {
-        $invoice->set( 'parent_invoice', $invoice_data['parent'] );
+    if (!empty($invoice_data['parent'])) {
+        $invoice->set('parent_invoice', $invoice_data['parent']);
     }
 
     // Save invoice data.
     $invoice->save();
     
-    if ( empty( $invoice->ID ) || is_wp_error( $invoice ) ) {
-        if ( $wp_error ) {
-            if ( is_wp_error( $invoice ) ) {
+    if (empty($invoice->ID) || is_wp_error($invoice)) {
+        if ($wp_error) {
+            if (is_wp_error($invoice)) {
                 return $invoice;
             } else {
-                return new WP_Error( 'wpinv_update_invoice_error', __( 'Error in update invoice.', 'invoicing' ) );
+                return new WP_Error('wpinv_update_invoice_error', __('Error in update invoice.', 'invoicing'));
             }
         } else {
             return 0;
@@ -432,13 +432,13 @@ 
     }
 
     // Add private note
-    if ( !empty( $invoice_data['private_note'] ) ) {
-        $invoice->add_note( $invoice_data['private_note'] );
+    if (!empty($invoice_data['private_note'])) {
+        $invoice->add_note($invoice_data['private_note']);
     }
 
     // Add user note
-    if ( !empty( $invoice_data['user_note'] ) ) {
-        $invoice->add_note( $invoice_data['user_note'], true );
+    if (!empty($invoice_data['user_note'])) {
+        $invoice->add_note($invoice_data['user_note'], true);
     }
 
     global $wpi_userID, $wpinv_ip_address_country;
@@ -447,445 +447,445 @@ 
 
     $data_session                   = array();
     $data_session['invoice_id']     = $invoice->ID;
-    $data_session['cart_discounts'] = $invoice->get_discounts( true );
+    $data_session['cart_discounts'] = $invoice->get_discounts(true);
 
-    wpinv_set_checkout_session( $data_session );
+    wpinv_set_checkout_session($data_session);
 
     $wpi_userID         = (int)$invoice->get_user_id();
 
-    $_POST['country']   = !empty( $invoice->country ) ? $invoice->country : wpinv_get_default_country();
+    $_POST['country']   = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
     $_POST['state']     = $invoice->state;
 
-    $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-    $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+    $invoice->set('country', sanitize_text_field($_POST['country']));
+    $invoice->set('state', sanitize_text_field($_POST['state']));
 
     $wpinv_ip_address_country = $invoice->country;
 
-    $invoice = $invoice->recalculate_totals( true );
+    $invoice = $invoice->recalculate_totals(true);
 
-    do_action( 'wpinv_post_update_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_post_update_invoice', $invoice->ID, $invoice_data);
 
-    wpinv_set_checkout_session( $checkout_session );
+    wpinv_set_checkout_session($checkout_session);
 
     return $invoice;
 }
 
-function wpinv_get_invoice( $invoice_id = 0, $cart = false ) {
-    if ( $cart && empty( $invoice_id ) ) {
+function wpinv_get_invoice($invoice_id = 0, $cart = false) {
+    if ($cart && empty($invoice_id)) {
         $invoice_id = (int)wpinv_get_invoice_cart_id();
     }
 
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice;
 }
 
-function wpinv_get_invoice_cart( $invoice_id = 0 ) {
-    return wpinv_get_invoice( $invoice_id, true );
+function wpinv_get_invoice_cart($invoice_id = 0) {
+    return wpinv_get_invoice($invoice_id, true);
 }
 
-function wpinv_get_invoice_description( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_description($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_description();
 }
 
-function wpinv_get_invoice_currency_code( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_currency_code($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_currency();
 }
 
-function wpinv_get_payment_user_email( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_user_email($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_email();
 }
 
-function wpinv_get_user_id( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_user_id($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_user_id();
 }
 
-function wpinv_get_invoice_status( $invoice_id, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_status($invoice_id, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->get_status( $return_label );
+    return $invoice->get_status($return_label);
 }
 
-function wpinv_get_payment_gateway( $invoice_id, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_gateway($invoice_id, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->get_gateway( $return_label );
+    return $invoice->get_gateway($return_label);
 }
 
-function wpinv_get_payment_gateway_name( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_gateway_name($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->get_gateway_title();
 }
 
-function wpinv_get_payment_transaction_id( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_transaction_id($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->get_transaction_id();
 }
 
-function wpinv_get_id_by_transaction_id( $key ) {
+function wpinv_get_id_by_transaction_id($key) {
     global $wpdb;
 
-    $invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = %s LIMIT 1", $key ) );
+    $invoice_id = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = %s LIMIT 1", $key));
 
-    if ( $invoice_id != NULL )
+    if ($invoice_id != NULL)
         return $invoice_id;
 
     return 0;
 }
 
-function wpinv_get_invoice_meta( $invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_meta($invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_meta( $meta_key, $single );
+    return $invoice->get_meta($meta_key, $single);
 }
 
-function wpinv_update_invoice_meta( $invoice_id = 0, $meta_key = '', $meta_value = '', $prev_value = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_update_invoice_meta($invoice_id = 0, $meta_key = '', $meta_value = '', $prev_value = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->update_meta( $meta_key, $meta_value, $prev_value );
+    return $invoice->update_meta($meta_key, $meta_value, $prev_value);
 }
 
-function wpinv_get_items( $invoice_id = 0 ) {
-    $invoice            = wpinv_get_invoice( $invoice_id );
+function wpinv_get_items($invoice_id = 0) {
+    $invoice            = wpinv_get_invoice($invoice_id);
     
     $items              = $invoice->get_items();
     $invoice_currency   = $invoice->get_currency();
 
-    if ( !empty( $items ) && is_array( $items ) ) {
-        foreach ( $items as $key => $item ) {
+    if (!empty($items) && is_array($items)) {
+        foreach ($items as $key => $item) {
             $items[$key]['currency'] = $invoice_currency;
 
-            if ( !isset( $cart_item['subtotal'] ) ) {
+            if (!isset($cart_item['subtotal'])) {
                 $items[$key]['subtotal'] = $items[$key]['amount'] * 1;
             }
         }
     }
 
-    return apply_filters( 'wpinv_get_items', $items, $invoice_id );
+    return apply_filters('wpinv_get_items', $items, $invoice_id);
 }
 
-function wpinv_get_fees( $invoice_id = 0 ) {
-    $invoice           = wpinv_get_invoice( $invoice_id );
+function wpinv_get_fees($invoice_id = 0) {
+    $invoice           = wpinv_get_invoice($invoice_id);
     $fees              = $invoice->get_fees();
 
-    return apply_filters( 'wpinv_get_fees', $fees, $invoice_id );
+    return apply_filters('wpinv_get_fees', $fees, $invoice_id);
 }
 
-function wpinv_get_invoice_ip( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_ip($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_ip();
 }
 
-function wpinv_get_invoice_user_info( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_user_info($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_user_info();
 }
 
-function wpinv_subtotal( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_subtotal($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_subtotal( $currency );
+    return $invoice->get_subtotal($currency);
 }
 
-function wpinv_tax( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_tax($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_tax( $currency );
+    return $invoice->get_tax($currency);
 }
 
-function wpinv_discount( $invoice_id = 0, $currency = false, $dash = false ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_discount($invoice_id = 0, $currency = false, $dash = false) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    return $invoice->get_discount( $currency, $dash );
+    return $invoice->get_discount($currency, $dash);
 }
 
-function wpinv_discount_code( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_discount_code($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
     return $invoice->get_discount_code();
 }
 
-function wpinv_payment_total( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_payment_total($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_total( $currency );
+    return $invoice->get_total($currency);
 }
 
-function wpinv_get_date_created( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_date_created($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     $date_created   = $invoice->get_created_date();
-    $date_created   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n( get_option( 'date_format' ), strtotime( $date_created ) ) : '';
+    $date_created   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n(get_option('date_format'), strtotime($date_created)) : '';
 
     return $date_created;
 }
 
-function wpinv_get_invoice_date( $invoice_id = 0, $format = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_date($invoice_id = 0, $format = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    $format         = !empty( $format ) ? $format : get_option( 'date_format' );
+    $format         = !empty($format) ? $format : get_option('date_format');
     $date_completed = $invoice->get_completed_date();
-    $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n( $format, strtotime( $date_completed ) ) : '';
-    if ( $invoice_date == '' ) {
+    $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n($format, strtotime($date_completed)) : '';
+    if ($invoice_date == '') {
         $date_created   = $invoice->get_created_date();
-        $invoice_date   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n( $format, strtotime( $date_created ) ) : '';
+        $invoice_date   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n($format, strtotime($date_created)) : '';
     }
 
     return $invoice_date;
 }
 
-function wpinv_get_invoice_vat_number( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_vat_number($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->vat_number;
 }
 
-function wpinv_insert_payment_note( $invoice_id = 0, $note = '', $user_type = false, $added_by_user = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_insert_payment_note($invoice_id = 0, $note = '', $user_type = false, $added_by_user = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->add_note( $note, $user_type, $added_by_user );
+    return $invoice->add_note($note, $user_type, $added_by_user);
 }
 
-function wpinv_get_invoice_notes( $invoice_id = 0, $type = '' ) {
+function wpinv_get_invoice_notes($invoice_id = 0, $type = '') {
     global $invoicing;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return NULL;
     }
     
-    $notes = $invoicing->notes->get_invoice_notes( $invoice_id, $type );
+    $notes = $invoicing->notes->get_invoice_notes($invoice_id, $type);
     
-    return apply_filters( 'wpinv_invoice_notes', $notes, $invoice_id, $type );
+    return apply_filters('wpinv_invoice_notes', $notes, $invoice_id, $type);
 }
 
-function wpinv_get_payment_key( $invoice_id = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_key($invoice_id = 0) {
+	$invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_key();
 }
 
-function wpinv_get_invoice_number( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_number($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_number();
 }
 
-function wpinv_get_cart_discountable_subtotal( $code_id ) {
+function wpinv_get_cart_discountable_subtotal($code_id) {
     $cart_items = wpinv_get_cart_content_details();
     $items      = array();
 
-    $excluded_items = wpinv_get_discount_excluded_items( $code_id );
+    $excluded_items = wpinv_get_discount_excluded_items($code_id);
 
-    if( $cart_items ) {
+    if ($cart_items) {
 
-        foreach( $cart_items as $item ) {
+        foreach ($cart_items as $item) {
 
-            if( ! in_array( $item['id'], $excluded_items ) ) {
-                $items[] =  $item;
+            if (!in_array($item['id'], $excluded_items)) {
+                $items[] = $item;
             }
         }
     }
 
-    $subtotal = wpinv_get_cart_items_subtotal( $items );
+    $subtotal = wpinv_get_cart_items_subtotal($items);
 
-    return apply_filters( 'wpinv_get_cart_discountable_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_discountable_subtotal', $subtotal);
 }
 
-function wpinv_get_cart_items_subtotal( $items ) {
+function wpinv_get_cart_items_subtotal($items) {
     $subtotal = 0.00;
 
-    if ( is_array( $items ) && ! empty( $items ) ) {
-        $prices = wp_list_pluck( $items, 'subtotal' );
+    if (is_array($items) && !empty($items)) {
+        $prices = wp_list_pluck($items, 'subtotal');
 
-        if( is_array( $prices ) ) {
-            $subtotal = array_sum( $prices );
+        if (is_array($prices)) {
+            $subtotal = array_sum($prices);
         } else {
             $subtotal = 0.00;
         }
 
-        if( $subtotal < 0 ) {
+        if ($subtotal < 0) {
             $subtotal = 0.00;
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_items_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_items_subtotal', $subtotal);
 }
 
-function wpinv_get_cart_subtotal( $items = array() ) {
-    $items    = !empty( $items ) ? $items : wpinv_get_cart_content_details();
-    $subtotal = wpinv_get_cart_items_subtotal( $items );
+function wpinv_get_cart_subtotal($items = array()) {
+    $items    = !empty($items) ? $items : wpinv_get_cart_content_details();
+    $subtotal = wpinv_get_cart_items_subtotal($items);
 
-    return apply_filters( 'wpinv_get_cart_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_subtotal', $subtotal);
 }
 
-function wpinv_cart_subtotal( $items = array() ) {
-    $price = wpinv_price( wpinv_format_amount( wpinv_get_cart_subtotal( $items ) ) );
+function wpinv_cart_subtotal($items = array()) {
+    $price = wpinv_price(wpinv_format_amount(wpinv_get_cart_subtotal($items)));
 
     return $price;
 }
 
-function wpinv_get_cart_total( $items = array(), $discounts = false, $invoice = array() ) {
-    $subtotal  = (float)wpinv_get_cart_subtotal( $items );
-    $discounts = (float)wpinv_get_cart_discounted_amount( $items );
-    $cart_tax  = (float)wpinv_get_cart_tax( $items );
+function wpinv_get_cart_total($items = array(), $discounts = false, $invoice = array()) {
+    $subtotal  = (float)wpinv_get_cart_subtotal($items);
+    $discounts = (float)wpinv_get_cart_discounted_amount($items);
+    $cart_tax  = (float)wpinv_get_cart_tax($items);
     $fees      = (float)wpinv_get_cart_fee_total();
-    if ( !empty( $invoice ) && $invoice->is_free_trial() ) {
+    if (!empty($invoice) && $invoice->is_free_trial()) {
         $total = 0;
     } else {
-        $total     = $subtotal - $discounts + $cart_tax + $fees;
+        $total = $subtotal - $discounts + $cart_tax + $fees;
     }
 
-    if ( $total < 0 ) {
+    if ($total < 0) {
         $total = 0.00;
     }
     
-    $total = (float)apply_filters( 'wpinv_get_cart_total', $total, $items );
+    $total = (float)apply_filters('wpinv_get_cart_total', $total, $items);
 
-    return wpinv_sanitize_amount( $total );
+    return wpinv_sanitize_amount($total);
 }
 
-function wpinv_cart_total( $cart_items = array(), $echo = true, $invoice = array() ) {
+function wpinv_cart_total($cart_items = array(), $echo = true, $invoice = array()) {
     global $cart_total;
-    $total = wpinv_price( wpinv_format_amount( wpinv_get_cart_total( $cart_items, NULL, $invoice ) ) );
-    $total = apply_filters( 'wpinv_cart_total', $total, $cart_items, $invoice );
+    $total = wpinv_price(wpinv_format_amount(wpinv_get_cart_total($cart_items, NULL, $invoice)));
+    $total = apply_filters('wpinv_cart_total', $total, $cart_items, $invoice);
     
     $cart_total = $total;
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $total;
     }
 
     echo $total;
 }
 
-function wpinv_get_cart_tax( $items = array() ) {
+function wpinv_get_cart_tax($items = array()) {
     $cart_tax = 0;
-    $items    = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items    = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( $items ) {
-        $taxes = wp_list_pluck( $items, 'tax' );
+    if ($items) {
+        $taxes = wp_list_pluck($items, 'tax');
 
-        if( is_array( $taxes ) ) {
-            $cart_tax = array_sum( $taxes );
+        if (is_array($taxes)) {
+            $cart_tax = array_sum($taxes);
         }
     }
 
     $cart_tax += wpinv_get_cart_fee_tax();
 
-    return apply_filters( 'wpinv_get_cart_tax', wpinv_sanitize_amount( $cart_tax ) );
+    return apply_filters('wpinv_get_cart_tax', wpinv_sanitize_amount($cart_tax));
 }
 
-function wpinv_cart_tax( $items = array(), $echo = false ) {
-    $cart_tax = wpinv_get_cart_tax( $items );
-    $cart_tax = wpinv_price( wpinv_format_amount( $cart_tax ) );
+function wpinv_cart_tax($items = array(), $echo = false) {
+    $cart_tax = wpinv_get_cart_tax($items);
+    $cart_tax = wpinv_price(wpinv_format_amount($cart_tax));
 
-    $tax = apply_filters( 'wpinv_cart_tax', $cart_tax, $items );
+    $tax = apply_filters('wpinv_cart_tax', $cart_tax, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $tax;
     }
 
     echo $tax;
 }
 
-function wpinv_get_cart_discount_code( $items = array() ) {
+function wpinv_get_cart_discount_code($items = array()) {
     $invoice = wpinv_get_invoice_cart();
-    $cart_discount_code = !empty( $invoice ) ? $invoice->get_discount_code() : '';
+    $cart_discount_code = !empty($invoice) ? $invoice->get_discount_code() : '';
     
-    return apply_filters( 'wpinv_get_cart_discount_code', $cart_discount_code );
+    return apply_filters('wpinv_get_cart_discount_code', $cart_discount_code);
 }
 
-function wpinv_cart_discount_code( $items = array(), $echo = false ) {
-    $cart_discount_code = wpinv_get_cart_discount_code( $items );
+function wpinv_cart_discount_code($items = array(), $echo = false) {
+    $cart_discount_code = wpinv_get_cart_discount_code($items);
 
-    if ( $cart_discount_code != '' ) {
+    if ($cart_discount_code != '') {
         $cart_discount_code = ' (' . $cart_discount_code . ')';
     }
     
-    $discount_code = apply_filters( 'wpinv_cart_discount_code', $cart_discount_code, $items );
+    $discount_code = apply_filters('wpinv_cart_discount_code', $cart_discount_code, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $discount_code;
     }
 
     echo $discount_code;
 }
 
-function wpinv_get_cart_discount( $items = array() ) {
+function wpinv_get_cart_discount($items = array()) {
     $invoice = wpinv_get_invoice_cart();
-    $cart_discount = !empty( $invoice ) ? $invoice->get_discount() : 0;
+    $cart_discount = !empty($invoice) ? $invoice->get_discount() : 0;
     
-    return apply_filters( 'wpinv_get_cart_discount', wpinv_sanitize_amount( $cart_discount ), $items );
+    return apply_filters('wpinv_get_cart_discount', wpinv_sanitize_amount($cart_discount), $items);
 }
 
-function wpinv_cart_discount( $items = array(), $echo = false ) {
-    $cart_discount = wpinv_get_cart_discount( $items );
-    $cart_discount = wpinv_price( wpinv_format_amount( $cart_discount ) );
+function wpinv_cart_discount($items = array(), $echo = false) {
+    $cart_discount = wpinv_get_cart_discount($items);
+    $cart_discount = wpinv_price(wpinv_format_amount($cart_discount));
 
-    $discount = apply_filters( 'wpinv_cart_discount', $cart_discount, $items );
+    $discount = apply_filters('wpinv_cart_discount', $cart_discount, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $discount;
     }
 
     echo $discount;
 }
 
-function wpinv_get_cart_fees( $type = 'all', $item_id = 0 ) {
-    $item = new WPInv_Item( $item_id );
+function wpinv_get_cart_fees($type = 'all', $item_id = 0) {
+    $item = new WPInv_Item($item_id);
     
-    return $item->get_fees( $type, $item_id );
+    return $item->get_fees($type, $item_id);
 }
 
 function wpinv_get_cart_fee_total() {
-    $total  = 0;
+    $total = 0;
     $fees = wpinv_get_cart_fees();
     
-    if ( $fees ) {
-        foreach ( $fees as $fee_id => $fee ) {
+    if ($fees) {
+        foreach ($fees as $fee_id => $fee) {
             $total += $fee['amount'];
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_fee_total', $total );
+    return apply_filters('wpinv_get_cart_fee_total', $total);
 }
 
 function wpinv_get_cart_fee_tax() {
     $tax  = 0;
     $fees = wpinv_get_cart_fees();
 
-    if ( $fees ) {
-        foreach ( $fees as $fee_id => $fee ) {
-            if( ! empty( $fee['no_tax'] ) ) {
+    if ($fees) {
+        foreach ($fees as $fee_id => $fee) {
+            if (!empty($fee['no_tax'])) {
                 continue;
             }
 
-            $tax += wpinv_calculate_tax( $fee['amount'] );
+            $tax += wpinv_calculate_tax($fee['amount']);
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_fee_tax', $tax );
+    return apply_filters('wpinv_get_cart_fee_tax', $tax);
 }
 
 function wpinv_cart_has_recurring_item() {
     $cart_items = wpinv_get_cart_contents();
     
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return false;
     }
     
     $has_subscription = false;
-    foreach( $cart_items as $cart_item ) {
-        if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+    foreach ($cart_items as $cart_item) {
+        if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
             $has_subscription = true;
             break;
         }
     }
     
-    return apply_filters( 'wpinv_cart_has_recurring_item', $has_subscription, $cart_items );
+    return apply_filters('wpinv_cart_has_recurring_item', $has_subscription, $cart_items);
 }
 
 function wpinv_cart_has_free_trial() {
@@ -893,94 +893,94 @@ 
     
     $free_trial = false;
     
-    if ( !empty( $invoice ) && $invoice->is_free_trial() ) {
+    if (!empty($invoice) && $invoice->is_free_trial()) {
         $free_trial = true;
     }
     
-    return apply_filters( 'wpinv_cart_has_free_trial', $free_trial, $invoice );
+    return apply_filters('wpinv_cart_has_free_trial', $free_trial, $invoice);
 }
 
 function wpinv_get_cart_contents() {
     $cart_details = wpinv_get_cart_details();
     
-    return apply_filters( 'wpinv_get_cart_contents', $cart_details );
+    return apply_filters('wpinv_get_cart_contents', $cart_details);
 }
 
 function wpinv_get_cart_content_details() {
     global $wpinv_euvat, $wpi_current_id, $wpi_item_id, $wpinv_is_last_cart_item, $wpinv_flat_discount_total;
     $cart_items = wpinv_get_cart_contents();
     
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return false;
     }
     $invoice = wpinv_get_invoice_cart();
 
     $details = array();
-    $length  = count( $cart_items ) - 1;
+    $length  = count($cart_items) - 1;
     
-    if ( empty( $_POST['country'] ) ) {
+    if (empty($_POST['country'])) {
         $_POST['country'] = $invoice->country;
     }
-    if ( !isset( $_POST['state'] ) ) {
+    if (!isset($_POST['state'])) {
         $_POST['state'] = $invoice->state;
     }
 
-    foreach( $cart_items as $key => $item ) {
-        $item_id            = isset( $item['id'] ) ? sanitize_text_field( $item['id'] ) : '';
-        if ( empty( $item_id ) ) {
+    foreach ($cart_items as $key => $item) {
+        $item_id = isset($item['id']) ? sanitize_text_field($item['id']) : '';
+        if (empty($item_id)) {
             continue;
         }
         
         $wpi_current_id         = $invoice->ID;
         $wpi_item_id            = $item_id;
         
-        if ( isset( $item['custom_price'] ) && $item['custom_price'] !== '' ) {
+        if (isset($item['custom_price']) && $item['custom_price'] !== '') {
             $item_price = $item['custom_price'];
         } else {
-            if ( isset( $item['item_price'] ) && $item['item_price'] !== '' && $item['item_price'] !== false ) {
+            if (isset($item['item_price']) && $item['item_price'] !== '' && $item['item_price'] !== false) {
                 $item_price = $item['item_price'];
             } else {
-                $item_price = wpinv_get_item_price( $item_id );
+                $item_price = wpinv_get_item_price($item_id);
             }
         }
-        $discount           = wpinv_get_cart_item_discount_amount( $item );
-        $discount           = apply_filters( 'wpinv_get_cart_content_details_item_discount_amount', $discount, $item );
-        $quantity           = wpinv_get_cart_item_quantity( $item );
-        $fees               = wpinv_get_cart_fees( 'fee', $item_id );
+        $discount           = wpinv_get_cart_item_discount_amount($item);
+        $discount           = apply_filters('wpinv_get_cart_content_details_item_discount_amount', $discount, $item);
+        $quantity           = wpinv_get_cart_item_quantity($item);
+        $fees               = wpinv_get_cart_fees('fee', $item_id);
         
         $subtotal           = $item_price * $quantity;
-        $tax_rate           = wpinv_get_tax_rate( $_POST['country'], $_POST['state'], $wpi_item_id );
-        $tax_class          = $wpinv_euvat->get_item_class( $item_id );
-        $tax                = wpinv_get_cart_item_tax( $item_id, $subtotal - $discount );
+        $tax_rate           = wpinv_get_tax_rate($_POST['country'], $_POST['state'], $wpi_item_id);
+        $tax_class          = $wpinv_euvat->get_item_class($item_id);
+        $tax                = wpinv_get_cart_item_tax($item_id, $subtotal - $discount);
         
-        if ( wpinv_prices_include_tax() ) {
-            $subtotal -= wpinv_round_amount( $tax );
+        if (wpinv_prices_include_tax()) {
+            $subtotal -= wpinv_round_amount($tax);
         }
         
-        $total              = $subtotal - $discount + $tax;
+        $total = $subtotal - $discount + $tax;
         
         // Do not allow totals to go negatve
-        if( $total < 0 ) {
+        if ($total < 0) {
             $total = 0;
         }
         
-        $details[ $key ]  = array(
+        $details[$key] = array(
             'id'                => $item_id,
-            'name'              => !empty($item['name']) ? $item['name'] : get_the_title( $item_id ),
-            'item_price'        => wpinv_round_amount( $item_price ),
-            'custom_price'      => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
+            'name'              => !empty($item['name']) ? $item['name'] : get_the_title($item_id),
+            'item_price'        => wpinv_round_amount($item_price),
+            'custom_price'      => isset($item['custom_price']) ? $item['custom_price'] : '',
             'quantity'          => $quantity,
-            'discount'          => wpinv_round_amount( $discount ),
-            'subtotal'          => wpinv_round_amount( $subtotal ),
-            'tax'               => wpinv_round_amount( $tax ),
-            'price'             => wpinv_round_amount( $total ),
+            'discount'          => wpinv_round_amount($discount),
+            'subtotal'          => wpinv_round_amount($subtotal),
+            'tax'               => wpinv_round_amount($tax),
+            'price'             => wpinv_round_amount($total),
             'vat_rates_class'   => $tax_class,
             'vat_rate'          => $tax_rate,
-            'meta'              => isset( $item['meta'] ) ? $item['meta'] : array(),
+            'meta'              => isset($item['meta']) ? $item['meta'] : array(),
             'fees'              => $fees,
         );
         
-        if ( $wpinv_is_last_cart_item ) {
+        if ($wpinv_is_last_cart_item) {
             $wpinv_is_last_cart_item   = false;
             $wpinv_flat_discount_total = 0.00;
         }
@@ -989,60 +989,60 @@ 
     return $details;
 }
 
-function wpinv_get_cart_details( $invoice_id = 0 ) {
+function wpinv_get_cart_details($invoice_id = 0) {
     global $ajax_cart_details;
 
-    $invoice      = wpinv_get_invoice_cart( $invoice_id );
-    $cart_details = !empty( $ajax_cart_details ) ? $ajax_cart_details : $invoice->cart_details;
+    $invoice      = wpinv_get_invoice_cart($invoice_id);
+    $cart_details = !empty($ajax_cart_details) ? $ajax_cart_details : $invoice->cart_details;
 
     $invoice_currency = $invoice->currency;
 
-    if ( ! empty( $cart_details ) && is_array( $cart_details ) ) {
-        foreach ( $cart_details as $key => $cart_item ) {
-            $cart_details[ $key ]['currency'] = $invoice_currency;
+    if (!empty($cart_details) && is_array($cart_details)) {
+        foreach ($cart_details as $key => $cart_item) {
+            $cart_details[$key]['currency'] = $invoice_currency;
 
-            if ( ! isset( $cart_item['subtotal'] ) ) {
-                $cart_details[ $key ]['subtotal'] = $cart_item['price'];
+            if (!isset($cart_item['subtotal'])) {
+                $cart_details[$key]['subtotal'] = $cart_item['price'];
             }
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_details', $cart_details, $invoice_id );
+    return apply_filters('wpinv_get_cart_details', $cart_details, $invoice_id);
 }
 
-function wpinv_record_status_change( $invoice_id, $new_status, $old_status ) {
-    if ( 'wpi_invoice' != get_post_type( $invoice_id ) ) {
+function wpinv_record_status_change($invoice_id, $new_status, $old_status) {
+    if ('wpi_invoice' != get_post_type($invoice_id)) {
         return;
     }
 
-    $invoice    = wpinv_get_invoice( $invoice_id );
+    $invoice    = wpinv_get_invoice($invoice_id);
     
-    $old_status = wpinv_status_nicename( $old_status );
-    $new_status = wpinv_status_nicename( $new_status );
+    $old_status = wpinv_status_nicename($old_status);
+    $new_status = wpinv_status_nicename($new_status);
 
-    $status_change = sprintf( __( 'Invoice status changed from %s to %s', 'invoicing' ), $old_status, $new_status );
+    $status_change = sprintf(__('Invoice status changed from %s to %s', 'invoicing'), $old_status, $new_status);
     
     // Add note
-    return $invoice->add_note( $status_change, false, false, true );
+    return $invoice->add_note($status_change, false, false, true);
 }
-add_action( 'wpinv_update_status', 'wpinv_record_status_change', 100, 3 );
+add_action('wpinv_update_status', 'wpinv_record_status_change', 100, 3);
 
-function wpinv_complete_payment( $invoice_id, $new_status, $old_status ) {
+function wpinv_complete_payment($invoice_id, $new_status, $old_status) {
     global $wpi_has_free_trial;
     
     $wpi_has_free_trial = false;
     
-    if ( $old_status == 'publish' ) {
+    if ($old_status == 'publish') {
         return; // Make sure that payments are only paid once
     }
 
     // Make sure the payment completion is only processed when new status is paid
-    if ( $new_status != 'publish' ) {
+    if ($new_status != 'publish') {
         return;
     }
 
-    $invoice = new WPInv_Invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = new WPInv_Invoice($invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
@@ -1050,58 +1050,58 @@ 
     $completed_date = $invoice->completed_date;
     $cart_details   = $invoice->cart_details;
 
-    do_action( 'wpinv_pre_complete_payment', $invoice_id );
+    do_action('wpinv_pre_complete_payment', $invoice_id);
 
-    if ( is_array( $cart_details ) ) {
+    if (is_array($cart_details)) {
         // Increase purchase count and earnings
-        foreach ( $cart_details as $cart_index => $item ) {
+        foreach ($cart_details as $cart_index => $item) {
             // Ensure these actions only run once, ever
-            if ( empty( $completed_date ) ) {
-                do_action( 'wpinv_complete_item_payment', $item['id'], $invoice_id, $item, $cart_index );
+            if (empty($completed_date)) {
+                do_action('wpinv_complete_item_payment', $item['id'], $invoice_id, $item, $cart_index);
             }
         }
     }
     
     // Check for discount codes and increment their use counts
-    if ( $discounts = $invoice->get_discounts( true ) ) {
-        if( ! empty( $discounts ) ) {
-            foreach( $discounts as $code ) {
-                wpinv_increase_discount_usage( $code );
+    if ($discounts = $invoice->get_discounts(true)) {
+        if (!empty($discounts)) {
+            foreach ($discounts as $code) {
+                wpinv_increase_discount_usage($code);
             }
         }
     }
     
     // Ensure this action only runs once ever
-    if( empty( $completed_date ) ) {
+    if (empty($completed_date)) {
         // Save the completed date
-        $invoice->set( 'completed_date', current_time( 'mysql', 0 ) );
+        $invoice->set('completed_date', current_time('mysql', 0));
         $invoice->save();
 
-        do_action( 'wpinv_complete_payment', $invoice_id );
+        do_action('wpinv_complete_payment', $invoice_id);
     }
 
     // Empty the shopping cart
     wpinv_empty_cart();
 }
-add_action( 'wpinv_update_status', 'wpinv_complete_payment', 100, 3 );
+add_action('wpinv_update_status', 'wpinv_complete_payment', 100, 3);
 
-function wpinv_update_payment_status( $invoice_id, $new_status = 'publish' ) {    
-    $invoice = !empty( $invoice_id ) && is_object( $invoice_id ) ? $invoice_id : wpinv_get_invoice( (int)$invoice_id );
+function wpinv_update_payment_status($invoice_id, $new_status = 'publish') {    
+    $invoice = !empty($invoice_id) && is_object($invoice_id) ? $invoice_id : wpinv_get_invoice((int)$invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
-    return $invoice->update_status( $new_status );
+    return $invoice->update_status($new_status);
 }
 
-function wpinv_cart_has_fees( $type = 'all' ) {
+function wpinv_cart_has_fees($type = 'all') {
     return false;
 }
 
 function wpinv_validate_checkout_fields() {    
     // Check if there is $_POST
-    if ( empty( $_POST ) ) {
+    if (empty($_POST)) {
         return false;
     }
     
@@ -1113,7 +1113,7 @@ 
     );
     
     // Validate agree to terms
-    if ( wpinv_get_option( 'show_agree_to_terms', false ) ) {
+    if (wpinv_get_option('show_agree_to_terms', false)) {
         wpinv_checkout_validate_agree_to_terms();
     }
     
@@ -1129,26 +1129,26 @@ 
     
     $invoice = wpinv_get_invoice_cart();
     $has_subscription = $invoice->is_recurring();
-    if ( empty( $invoice ) ) {
-        wpinv_set_error( 'invalid_invoice', __( 'Your cart is empty.', 'invoicing' ) );
+    if (empty($invoice)) {
+        wpinv_set_error('invalid_invoice', __('Your cart is empty.', 'invoicing'));
         return $gateway;
     }
 
     // Check if a gateway value is present
-    if ( !empty( $_REQUEST['wpi-gateway'] ) ) {
-        $gateway = sanitize_text_field( $_REQUEST['wpi-gateway'] );
+    if (!empty($_REQUEST['wpi-gateway'])) {
+        $gateway = sanitize_text_field($_REQUEST['wpi-gateway']);
 
-        if ( $invoice->is_free() ) {
+        if ($invoice->is_free()) {
             $gateway = 'manual';
-        } elseif ( !wpinv_is_gateway_active( $gateway ) ) {
-            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not enabled', 'invoicing' ) );
-        } elseif ( $has_subscription && !wpinv_gateway_support_subscription( $gateway ) ) {
-            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway doesnot support subscription payment', 'invoicing' ) );
+        } elseif (!wpinv_is_gateway_active($gateway)) {
+            wpinv_set_error('invalid_gateway', __('The selected payment gateway is not enabled', 'invoicing'));
+        } elseif ($has_subscription && !wpinv_gateway_support_subscription($gateway)) {
+            wpinv_set_error('invalid_gateway', __('The selected payment gateway doesnot support subscription payment', 'invoicing'));
         }
     }
 
-    if ( $has_subscription && count( wpinv_get_cart_contents() ) > 1 ) {
-        wpinv_set_error( 'subscription_invalid', __( 'Only one subscription may be purchased through payment per checkout.', 'invoicing' ) );
+    if ($has_subscription && count(wpinv_get_cart_contents()) > 1) {
+        wpinv_set_error('subscription_invalid', __('Only one subscription may be purchased through payment per checkout.', 'invoicing'));
     }
 
     return $gateway;
@@ -1162,10 +1162,10 @@ 
     
     $error = false;
     // If we have discounts, loop through them
-    if ( ! empty( $discounts ) ) {
-        foreach ( $discounts as $discount ) {
+    if (!empty($discounts)) {
+        foreach ($discounts as $discount) {
             // Check if valid
-            if (  !wpinv_is_discount_valid( $discount, (int)$wpi_cart->get_user_id() ) ) {
+            if (!wpinv_is_discount_valid($discount, (int)$wpi_cart->get_user_id())) {
                 // Discount is not valid
                 $error = true;
             }
@@ -1175,20 +1175,20 @@ 
         return NULL;
     }
 
-    if ( $error && !wpinv_get_errors() ) {
-        wpinv_set_error( 'invalid_discount', __( 'Discount code you entered is invalid', 'invoicing' ) );
+    if ($error && !wpinv_get_errors()) {
+        wpinv_set_error('invalid_discount', __('Discount code you entered is invalid', 'invoicing'));
     }
 
-    return implode( ',', $discounts );
+    return implode(',', $discounts);
 }
 
 function wpinv_checkout_validate_cc() {
     $card_data = wpinv_checkout_get_cc_info();
 
     // Validate the card zip
-    if ( !empty( $card_data['wpinv_zip'] ) ) {
-        if ( !wpinv_checkout_validate_cc_zip( $card_data['wpinv_zip'], $card_data['wpinv_country'] ) ) {
-            wpinv_set_error( 'invalid_cc_zip', __( 'The zip / postcode you entered for your billing address is invalid', 'invoicing' ) );
+    if (!empty($card_data['wpinv_zip'])) {
+        if (!wpinv_checkout_validate_cc_zip($card_data['wpinv_zip'], $card_data['wpinv_country'])) {
+            wpinv_set_error('invalid_cc_zip', __('The zip / postcode you entered for your billing address is invalid', 'invoicing'));
         }
     }
 
@@ -1198,28 +1198,28 @@ 
 
 function wpinv_checkout_get_cc_info() {
 	$cc_info = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
-	$cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
-	$cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
-	$cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
+	$cc_info['card_name']      = isset($_POST['card_name']) ? sanitize_text_field($_POST['card_name']) : '';
+	$cc_info['card_number']    = isset($_POST['card_number']) ? sanitize_text_field($_POST['card_number']) : '';
+	$cc_info['card_cvc']       = isset($_POST['card_cvc']) ? sanitize_text_field($_POST['card_cvc']) : '';
+	$cc_info['card_exp_month'] = isset($_POST['card_exp_month']) ? sanitize_text_field($_POST['card_exp_month']) : '';
+	$cc_info['card_exp_year']  = isset($_POST['card_exp_year']) ? sanitize_text_field($_POST['card_exp_year']) : '';
+	$cc_info['card_address']   = isset($_POST['wpinv_address']) ? sanitize_text_field($_POST['wpinv_address']) : '';
+	$cc_info['card_city']      = isset($_POST['wpinv_city']) ? sanitize_text_field($_POST['wpinv_city']) : '';
+	$cc_info['card_state']     = isset($_POST['wpinv_state']) ? sanitize_text_field($_POST['wpinv_state']) : '';
+	$cc_info['card_country']   = isset($_POST['wpinv_country']) ? sanitize_text_field($_POST['wpinv_country']) : '';
+	$cc_info['card_zip']       = isset($_POST['wpinv_zip']) ? sanitize_text_field($_POST['wpinv_zip']) : '';
 
 	// Return cc info
 	return $cc_info;
 }
 
-function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
+function wpinv_checkout_validate_cc_zip($zip = 0, $country_code = '') {
     $ret = false;
 
-    if ( empty( $zip ) || empty( $country_code ) )
+    if (empty($zip) || empty($country_code))
         return $ret;
 
-    $country_code = strtoupper( $country_code );
+    $country_code = strtoupper($country_code);
 
     $zip_regex = array(
         "AD" => "AD\d{3}",
@@ -1379,17 +1379,17 @@ 
         "ZM" => "\d{5}"
     );
 
-    if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) )
+    if (!isset ($zip_regex[$country_code]) || preg_match("/" . $zip_regex[$country_code] . "/i", $zip))
         $ret = true;
 
-    return apply_filters( 'wpinv_is_zip_valid', $ret, $zip, $country_code );
+    return apply_filters('wpinv_is_zip_valid', $ret, $zip, $country_code);
 }
 
 function wpinv_checkout_validate_agree_to_terms() {
     // Validate agree to terms
-    if ( ! isset( $_POST['wpi_agree_to_terms'] ) || $_POST['wpi_agree_to_terms'] != 1 ) {
+    if (!isset($_POST['wpi_agree_to_terms']) || $_POST['wpi_agree_to_terms'] != 1) {
         // User did not agree
-        wpinv_set_error( 'agree_to_terms', apply_filters( 'wpinv_agree_to_terms_text', __( 'You must agree to the terms of use', 'invoicing' ) ) );
+        wpinv_set_error('agree_to_terms', apply_filters('wpinv_agree_to_terms_text', __('You must agree to the terms of use', 'invoicing')));
     }
 }
 
@@ -1401,40 +1401,40 @@ 
     );
     
     // Verify there is a user_ID
-    if ( $user_ID = (int)$wpi_cart->get_user_id() ) {
+    if ($user_ID = (int)$wpi_cart->get_user_id()) {
         // Get the logged in user data
-        $user_data = get_userdata( $user_ID );
-        $required_fields  = wpinv_checkout_required_fields();
+        $user_data = get_userdata($user_ID);
+        $required_fields = wpinv_checkout_required_fields();
 
         // Loop through required fields and show error messages
-         if ( !empty( $required_fields ) ) {
-            foreach ( $required_fields as $field_name => $value ) {
-                if ( in_array( $value, $required_fields ) && empty( $_POST[ 'wpinv_' . $field_name ] ) ) {
-                    wpinv_set_error( $value['error_id'], $value['error_message'] );
+         if (!empty($required_fields)) {
+            foreach ($required_fields as $field_name => $value) {
+                if (in_array($value, $required_fields) && empty($_POST['wpinv_' . $field_name])) {
+                    wpinv_set_error($value['error_id'], $value['error_message']);
                 }
             }
         }
 
         // Verify data
-        if ( $user_data ) {
+        if ($user_data) {
             // Collected logged in user data
             $valid_user_data = array(
                 'user_id'     => $user_ID,
-                'email'       => isset( $_POST['wpinv_email'] ) ? sanitize_email( $_POST['wpinv_email'] ) : $user_data->user_email,
-                'first_name'  => isset( $_POST['wpinv_first_name'] ) && ! empty( $_POST['wpinv_first_name'] ) ? sanitize_text_field( $_POST['wpinv_first_name'] ) : $user_data->first_name,
-                'last_name'   => isset( $_POST['wpinv_last_name'] ) && ! empty( $_POST['wpinv_last_name']  ) ? sanitize_text_field( $_POST['wpinv_last_name']  ) : $user_data->last_name,
+                'email'       => isset($_POST['wpinv_email']) ? sanitize_email($_POST['wpinv_email']) : $user_data->user_email,
+                'first_name'  => isset($_POST['wpinv_first_name']) && !empty($_POST['wpinv_first_name']) ? sanitize_text_field($_POST['wpinv_first_name']) : $user_data->first_name,
+                'last_name'   => isset($_POST['wpinv_last_name']) && !empty($_POST['wpinv_last_name']) ? sanitize_text_field($_POST['wpinv_last_name']) : $user_data->last_name,
             );
 
-            if ( !empty( $_POST[ 'wpinv_email' ] ) && !is_email( $_POST[ 'wpinv_email' ] ) ) {
-                wpinv_set_error( 'invalid_email', __( 'Please enter a valid email address', 'invoicing' ) );
+            if (!empty($_POST['wpinv_email']) && !is_email($_POST['wpinv_email'])) {
+                wpinv_set_error('invalid_email', __('Please enter a valid email address', 'invoicing'));
             }
         } else {
             // Set invalid user error
-            wpinv_set_error( 'invalid_user', __( 'The user billing information is invalid', 'invoicing' ) );
+            wpinv_set_error('invalid_user', __('The user billing information is invalid', 'invoicing'));
         }
     } else {
         // Set invalid user error
-        wpinv_set_error( 'invalid_user_id', __( 'The invalid invoice user id', 'invoicing' ) );
+        wpinv_set_error('invalid_user_id', __('The invalid invoice user id', 'invoicing'));
     }
 
     // Return user data
@@ -1446,30 +1446,30 @@ 
 
     $data = array();
     
-    if ( is_user_logged_in() ) {
-        if ( !wpinv_require_login_to_checkout() || ( wpinv_require_login_to_checkout() && (int)$wpi_cart->get_user_id() === (int)get_current_user_id() ) ) {
+    if (is_user_logged_in()) {
+        if (!wpinv_require_login_to_checkout() || (wpinv_require_login_to_checkout() && (int)$wpi_cart->get_user_id() === (int)get_current_user_id())) {
             $data['user_id'] = (int)get_current_user_id();
         } else {
-            wpinv_set_error( 'logged_in_only', __( 'You are not allowed to pay for this invoice', 'invoicing' ) );
+            wpinv_set_error('logged_in_only', __('You are not allowed to pay for this invoice', 'invoicing'));
         }
     } else {
         // If guest checkout allowed
-        if ( !wpinv_require_login_to_checkout() ) {
+        if (!wpinv_require_login_to_checkout()) {
             $data['user_id'] = 0;
         } else {
-            wpinv_set_error( 'logged_in_only', __( 'You must be logged in to pay for this invoice', 'invoicing' ) );
+            wpinv_set_error('logged_in_only', __('You must be logged in to pay for this invoice', 'invoicing'));
         }
     }
 
     return $data;
 }
 
-function wpinv_checkout_form_get_user( $valid_data = array() ) {
+function wpinv_checkout_form_get_user($valid_data = array()) {
     // Initialize user
     $user    = false;
-    $is_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+    $is_ajax = defined('DOING_AJAX') && DOING_AJAX;
 
-    if ( empty( $valid_data['current_user'] ) ) {
+    if (empty($valid_data['current_user'])) {
         $user = false;
     } else {
         // Set the valid invoice user
@@ -1477,7 +1477,7 @@ 
     }
 
     // Verify invoice have an user
-    if ( false === $user || empty( $user ) ) {
+    if (false === $user || empty($user)) {
         return false;
     }
 
@@ -1494,11 +1494,11 @@ 
         'zip',
     );
     
-    foreach ( $address_fields as $field ) {
-        $user[$field]  = !empty( $_POST['wpinv_' . $field] ) ? sanitize_text_field( $_POST['wpinv_' . $field] ) : false;
+    foreach ($address_fields as $field) {
+        $user[$field] = !empty($_POST['wpinv_' . $field]) ? sanitize_text_field($_POST['wpinv_' . $field]) : false;
         
-        if ( !empty( $user['user_id'] ) && $valid_data['current_user'] == $user['user_id'] ) {
-            update_user_meta( $user['user_id'], '_wpinv_' . $field, $user[$field] );
+        if (!empty($user['user_id']) && $valid_data['current_user'] == $user['user_id']) {
+            update_user_meta($user['user_id'], '_wpinv_' . $field, $user[$field]);
         }
     }
 
@@ -1506,28 +1506,28 @@ 
     return $user;
 }
 
-function wpinv_set_checkout_session( $invoice_data = array() ) {
+function wpinv_set_checkout_session($invoice_data = array()) {
     global $wpi_session;
     
-    return $wpi_session->set( 'wpinv_checkout', $invoice_data );
+    return $wpi_session->set('wpinv_checkout', $invoice_data);
 }
 
 function wpinv_get_checkout_session() {
 	global $wpi_session;
     
-    return $wpi_session->get( 'wpinv_checkout' );
+    return $wpi_session->get('wpinv_checkout');
 }
 
 function wpinv_empty_cart() {
     global $wpi_session;
 
     // Remove cart contents
-    $wpi_session->set( 'wpinv_checkout', NULL );
+    $wpi_session->set('wpinv_checkout', NULL);
 
     // Remove all cart fees
-    $wpi_session->set( 'wpi_cart_fees', NULL );
+    $wpi_session->set('wpi_cart_fees', NULL);
 
-    do_action( 'wpinv_empty_cart' );
+    do_action('wpinv_empty_cart');
 }
 
 function wpinv_process_checkout() {
@@ -1540,42 +1540,42 @@ 
     
     $wpi_checkout_id = $invoice->ID;
     
-    do_action( 'wpinv_pre_process_checkout' );
+    do_action('wpinv_pre_process_checkout');
     
-    if ( !wpinv_get_cart_contents() ) { // Make sure the cart isn't empty
+    if (!wpinv_get_cart_contents()) { // Make sure the cart isn't empty
         $valid_data = false;
-        wpinv_set_error( 'empty_cart', __( 'Your cart is empty', 'invoicing' ) );
+        wpinv_set_error('empty_cart', __('Your cart is empty', 'invoicing'));
     } else {
         // Validate the form $_POST data
         $valid_data = wpinv_validate_checkout_fields();
         
         // Allow themes and plugins to hook to errors
-        do_action( 'wpinv_checkout_error_checks', $valid_data, $_POST );
+        do_action('wpinv_checkout_error_checks', $valid_data, $_POST);
     }
     
-    $is_ajax    = defined( 'DOING_AJAX' ) && DOING_AJAX;
+    $is_ajax = defined('DOING_AJAX') && DOING_AJAX;
     
     // Validate the user
-    $user = wpinv_checkout_form_get_user( $valid_data );
+    $user = wpinv_checkout_form_get_user($valid_data);
 
     // Let extensions validate fields after user is logged in if user has used login/registration form
-    do_action( 'wpinv_checkout_user_error_checks', $user, $valid_data, $_POST );
+    do_action('wpinv_checkout_user_error_checks', $user, $valid_data, $_POST);
     
-    if ( false === $valid_data || wpinv_get_errors() || ! $user ) {
-        if ( $is_ajax ) {
-            do_action( 'wpinv_ajax_checkout_errors' );
+    if (false === $valid_data || wpinv_get_errors() || !$user) {
+        if ($is_ajax) {
+            do_action('wpinv_ajax_checkout_errors');
             die();
         } else {
             return false;
         }
     }
 
-    if ( $is_ajax ) {
+    if ($is_ajax) {
         // Save address fields.
-        $address_fields = array( 'first_name', 'last_name', 'phone', 'address', 'city', 'country', 'state', 'zip', 'company' );
-        foreach ( $address_fields as $field ) {
-            if ( isset( $user[$field] ) ) {
-                $invoice->set( $field, $user[$field] );
+        $address_fields = array('first_name', 'last_name', 'phone', 'address', 'city', 'country', 'state', 'zip', 'company');
+        foreach ($address_fields as $field) {
+            if (isset($user[$field])) {
+                $invoice->set($field, $user[$field]);
             }
             
             $invoice->save();
@@ -1583,15 +1583,15 @@ 
 
         $response['success']            = true;
         $response['data']['subtotal']   = $invoice->get_subtotal();
-        $response['data']['subtotalf']  = $invoice->get_subtotal( true );
+        $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['discount']   = $invoice->get_discount();
-        $response['data']['discountf']  = $invoice->get_discount( true );
+        $response['data']['discountf']  = $invoice->get_discount(true);
         $response['data']['tax']        = $invoice->get_tax();
-        $response['data']['taxf']       = $invoice->get_tax( true );
+        $response['data']['taxf']       = $invoice->get_tax(true);
         $response['data']['total']      = $invoice->get_total();
-        $response['data']['totalf']     = $invoice->get_total( true );
+        $response['data']['totalf']     = $invoice->get_total(true);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     $user_info = array(
@@ -1613,42 +1613,42 @@ 
     
     // Setup invoice information
     $invoice_data = array(
-        'invoice_id'        => !empty( $invoice ) ? $invoice->ID : 0,
+        'invoice_id'        => !empty($invoice) ? $invoice->ID : 0,
         'items'             => $cart_items,
         'cart_discounts'    => $discounts,
-        'fees'              => wpinv_get_cart_fees(),        // Any arbitrary fees that have been added to the cart
-        'subtotal'          => wpinv_get_cart_subtotal( $cart_items ),    // Amount before taxes and discounts
-        'discount'          => wpinv_get_cart_items_discount_amount( $cart_items, $discounts ), // Discounted amount
-        'tax'               => wpinv_get_cart_tax( $cart_items ),               // Taxed amount
-        'price'             => wpinv_get_cart_total( $cart_items, $discounts ),    // Amount after taxes
+        'fees'              => wpinv_get_cart_fees(), // Any arbitrary fees that have been added to the cart
+        'subtotal'          => wpinv_get_cart_subtotal($cart_items), // Amount before taxes and discounts
+        'discount'          => wpinv_get_cart_items_discount_amount($cart_items, $discounts), // Discounted amount
+        'tax'               => wpinv_get_cart_tax($cart_items), // Taxed amount
+        'price'             => wpinv_get_cart_total($cart_items, $discounts), // Amount after taxes
         'invoice_key'       => $invoice->get_key() ? $invoice->get_key() : $invoice->generate_key(),
         'user_email'        => $user['email'],
-        'date'              => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
-        'user_info'         => stripslashes_deep( $user_info ),
+        'date'              => date('Y-m-d H:i:s', current_time('timestamp')),
+        'user_info'         => stripslashes_deep($user_info),
         'post_data'         => $_POST,
         'cart_details'      => $cart_items,
         'gateway'           => $valid_data['gateway'],
         'card_info'         => $valid_data['cc_info']
     );
     
-    $vat_info   = $wpinv_euvat->current_vat_data();
-    if ( is_array( $vat_info ) ) {
+    $vat_info = $wpinv_euvat->current_vat_data();
+    if (is_array($vat_info)) {
         $invoice_data['user_info']['vat_number']        = $vat_info['number'];
         $invoice_data['user_info']['vat_rate']          = wpinv_get_tax_rate($invoice_data['user_info']['country'], $invoice_data['user_info']['state']);
-        $invoice_data['user_info']['adddress_confirmed']    = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+        $invoice_data['user_info']['adddress_confirmed'] = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
 
         // Add the VAT rate to each item in the cart
-        foreach( $invoice_data['cart_details'] as $key => $item_data) {
+        foreach ($invoice_data['cart_details'] as $key => $item_data) {
             $rate = wpinv_get_tax_rate($invoice_data['user_info']['country'], $invoice_data['user_info']['state'], $item_data['id']);
-            $invoice_data['cart_details'][$key]['vat_rate'] = wpinv_round_amount( $rate, 4 );
+            $invoice_data['cart_details'][$key]['vat_rate'] = wpinv_round_amount($rate, 4);
         }
     }
     
     // Save vat fields.
-    $address_fields = array( 'vat_number', 'vat_rate', 'adddress_confirmed' );
-    foreach ( $address_fields as $field ) {
-        if ( isset( $invoice_data['user_info'][$field] ) ) {
-            $invoice->set( $field, $invoice_data['user_info'][$field] );
+    $address_fields = array('vat_number', 'vat_rate', 'adddress_confirmed');
+    foreach ($address_fields as $field) {
+        if (isset($invoice_data['user_info'][$field])) {
+            $invoice->set($field, $invoice_data['user_info'][$field]);
         }
         
         $invoice->save();
@@ -1658,49 +1658,49 @@ 
     $valid_data['user'] = $user;
     
     // Allow themes and plugins to hook before the gateway
-    do_action( 'wpinv_checkout_before_gateway', $_POST, $user_info, $valid_data );
+    do_action('wpinv_checkout_before_gateway', $_POST, $user_info, $valid_data);
     
     // If the total amount in the cart is 0, send to the manual gateway. This emulates a free invoice
-    if ( !$invoice_data['price'] ) {
+    if (!$invoice_data['price']) {
         // Revert to manual
         $invoice_data['gateway'] = 'manual';
         $_POST['wpi-gateway'] = 'manual';
     }
     
     // Allow the invoice data to be modified before it is sent to the gateway
-    $invoice_data = apply_filters( 'wpinv_data_before_gateway', $invoice_data, $valid_data );
+    $invoice_data = apply_filters('wpinv_data_before_gateway', $invoice_data, $valid_data);
     
     // Setup the data we're storing in the purchase session
     $session_data = $invoice_data;
     // Make sure credit card numbers are never stored in sessions
-    if ( !empty( $session_data['card_info']['card_number'] ) ) {
-        unset( $session_data['card_info']['card_number'] );
+    if (!empty($session_data['card_info']['card_number'])) {
+        unset($session_data['card_info']['card_number']);
     }
     
     // Used for showing item links to non logged-in users after purchase, and for other plugins needing purchase data.
-    wpinv_set_checkout_session( $invoice_data );
+    wpinv_set_checkout_session($invoice_data);
     
     // Set gateway
-    $invoice->update_meta( '_wpinv_gateway', $invoice_data['gateway'] );
-    $invoice->update_meta( '_wpinv_mode', ( wpinv_is_test_mode( $invoice_data['gateway'] ) ? 'test' : 'live' ) );
-    $invoice->update_meta( '_wpinv_checkout', true );
+    $invoice->update_meta('_wpinv_gateway', $invoice_data['gateway']);
+    $invoice->update_meta('_wpinv_mode', (wpinv_is_test_mode($invoice_data['gateway']) ? 'test' : 'live'));
+    $invoice->update_meta('_wpinv_checkout', true);
     
-    do_action( 'wpinv_checkout_before_send_to_gateway', $invoice, $invoice_data );
+    do_action('wpinv_checkout_before_send_to_gateway', $invoice, $invoice_data);
 
     // Send info to the gateway for payment processing
-    wpinv_send_to_gateway( $invoice_data['gateway'], $invoice_data );
+    wpinv_send_to_gateway($invoice_data['gateway'], $invoice_data);
     die();
 }
-add_action( 'wpinv_payment', 'wpinv_process_checkout' );
+add_action('wpinv_payment', 'wpinv_process_checkout');
 
-function wpinv_get_invoices( $args ) {
-    $args = wp_parse_args( $args, array(
-        'status'   => array_keys( wpinv_get_invoice_statuses() ),
+function wpinv_get_invoices($args) {
+    $args = wp_parse_args($args, array(
+        'status'   => array_keys(wpinv_get_invoice_statuses()),
         'type'     => 'wpi_invoice',
         'parent'   => null,
         'user'     => null,
         'email'    => '',
-        'limit'    => get_option( 'posts_per_page' ),
+        'limit'    => get_option('posts_per_page'),
         'offset'   => null,
         'page'     => 1,
         'exclude'  => array(),
@@ -1708,7 +1708,7 @@ 
         'order'    => 'DESC',
         'return'   => 'objects',
         'paginate' => false,
-    ) );
+    ));
     
     // Handle some BW compatibility arg names where wp_query args differ in naming.
     $map_legacy = array(
@@ -1721,18 +1721,18 @@ 
         'paged'          => 'page',
     );
 
-    foreach ( $map_legacy as $from => $to ) {
-        if ( isset( $args[ $from ] ) ) {
-            $args[ $to ] = $args[ $from ];
+    foreach ($map_legacy as $from => $to) {
+        if (isset($args[$from])) {
+            $args[$to] = $args[$from];
         }
     }
 
-    if ( get_query_var( 'paged' ) )
+    if (get_query_var('paged'))
         $args['page'] = get_query_var('paged');
-    else if ( get_query_var( 'page' ) )
-        $args['page'] = get_query_var( 'page' );
-    else if ( !empty( $args[ 'page' ] ) )
-        $args['page'] = $args[ 'page' ];
+    else if (get_query_var('page'))
+        $args['page'] = get_query_var('page');
+    else if (!empty($args['page']))
+        $args['page'] = $args['page'];
     else
         $args['page'] = 1;
 
@@ -1745,47 +1745,47 @@ 
         'post_status'    => $args['status'],
         'posts_per_page' => $args['limit'],
         'meta_query'     => array(),
-        'date_query'     => !empty( $args['date_query'] ) ? $args['date_query'] : array(),
+        'date_query'     => !empty($args['date_query']) ? $args['date_query'] : array(),
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
     );
     
-    if ( !empty( $args['user'] ) ) {
-        $wp_query_args['author'] = absint( $args['user'] );
+    if (!empty($args['user'])) {
+        $wp_query_args['author'] = absint($args['user']);
     }
 
-    if ( ! is_null( $args['parent'] ) ) {
-        $wp_query_args['post_parent'] = absint( $args['parent'] );
+    if (!is_null($args['parent'])) {
+        $wp_query_args['post_parent'] = absint($args['parent']);
     }
 
-    if ( ! is_null( $args['offset'] ) ) {
-        $wp_query_args['offset'] = absint( $args['offset'] );
+    if (!is_null($args['offset'])) {
+        $wp_query_args['offset'] = absint($args['offset']);
     } else {
-        $wp_query_args['paged'] = absint( $args['page'] );
+        $wp_query_args['paged'] = absint($args['page']);
     }
 
-    if ( ! empty( $args['exclude'] ) ) {
-        $wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+    if (!empty($args['exclude'])) {
+        $wp_query_args['post__not_in'] = array_map('absint', $args['exclude']);
     }
 
-    if ( ! $args['paginate' ] ) {
+    if (!$args['paginate']) {
         $wp_query_args['no_found_rows'] = true;
     }
 
     // Get results.
-    $invoices = new WP_Query( $wp_query_args );
+    $invoices = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'wpinv_get_invoice', $invoices->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('wpinv_get_invoice', $invoices->posts);
+    } elseif ('self' === $args['return']) {
         return $invoices;
     } else {
         $return = $invoices->posts;
     }
 
-    if ( $args['paginate' ] ) {
-        return (object) array(
+    if ($args['paginate']) {
+        return (object)array(
             'invoices'      => $return,
             'total'         => $invoices->found_posts,
             'max_num_pages' => $invoices->max_num_pages,
@@ -1797,21 +1797,21 @@ 
 
 function wpinv_get_user_invoices_columns() {
     $columns = array(
-            'invoice-number'  => array( 'title' => __( 'ID', 'invoicing' ), 'class' => 'text-left' ),
-            'invoice-date'    => array( 'title' => __( 'Date', 'invoicing' ), 'class' => 'text-left' ),
-            'invoice-status'  => array( 'title' => __( 'Status', 'invoicing' ), 'class' => 'text-center' ),
-            'invoice-total'   => array( 'title' => __( 'Total', 'invoicing' ), 'class' => 'text-right' ),
-            'invoice-actions' => array( 'title' => '&nbsp;', 'class' => 'text-center' ),
+            'invoice-number'  => array('title' => __('ID', 'invoicing'), 'class' => 'text-left'),
+            'invoice-date'    => array('title' => __('Date', 'invoicing'), 'class' => 'text-left'),
+            'invoice-status'  => array('title' => __('Status', 'invoicing'), 'class' => 'text-center'),
+            'invoice-total'   => array('title' => __('Total', 'invoicing'), 'class' => 'text-right'),
+            'invoice-actions' => array('title' => '&nbsp;', 'class' => 'text-center'),
         );
 
-    return apply_filters( 'wpinv_user_invoices_columns', $columns );
+    return apply_filters('wpinv_user_invoices_columns', $columns);
 }
 
-function wpinv_payment_receipt( $atts, $content = null ) {
+function wpinv_payment_receipt($atts, $content = null) {
     global $wpinv_receipt_args;
 
-    $wpinv_receipt_args = shortcode_atts( array(
-        'error'           => __( 'Sorry, trouble retrieving payment receipt.', 'invoicing' ),
+    $wpinv_receipt_args = shortcode_atts(array(
+        'error'           => __('Sorry, trouble retrieving payment receipt.', 'invoicing'),
         'price'           => true,
         'discount'        => true,
         'items'           => true,
@@ -1820,195 +1820,195 @@ 
         'invoice_key'     => false,
         'payment_method'  => true,
         'invoice_id'      => true
-    ), $atts, 'wpinv_receipt' );
+    ), $atts, 'wpinv_receipt');
 
     $session = wpinv_get_checkout_session();
-    if ( isset( $_GET['invoice_key'] ) ) {
-        $invoice_key = urldecode( $_GET['invoice_key'] );
-    } else if ( $session && isset( $session['invoice_key'] ) ) {
+    if (isset($_GET['invoice_key'])) {
+        $invoice_key = urldecode($_GET['invoice_key']);
+    } else if ($session && isset($session['invoice_key'])) {
         $invoice_key = $session['invoice_key'];
-    } elseif ( isset( $wpinv_receipt_args['invoice_key'] ) && $wpinv_receipt_args['invoice_key'] ) {
+    } elseif (isset($wpinv_receipt_args['invoice_key']) && $wpinv_receipt_args['invoice_key']) {
         $invoice_key = $wpinv_receipt_args['invoice_key'];
-    } else if ( isset( $_GET['invoice-id'] ) ) {
-        $invoice_key = wpinv_get_payment_key( (int)$_GET['invoice-id'] );
+    } else if (isset($_GET['invoice-id'])) {
+        $invoice_key = wpinv_get_payment_key((int)$_GET['invoice-id']);
     }
 
     // No key found
-    if ( ! isset( $invoice_key ) ) {
+    if (!isset($invoice_key)) {
         return '<p class="alert alert-error">' . $wpinv_receipt_args['error'] . '</p>';
     }
 
-    $invoice_id    = wpinv_get_invoice_id_by_key( $invoice_key );
-    $user_can_view = wpinv_can_view_receipt( $invoice_key );
-    if ( $user_can_view && isset( $_GET['invoice-id'] ) ) {
+    $invoice_id    = wpinv_get_invoice_id_by_key($invoice_key);
+    $user_can_view = wpinv_can_view_receipt($invoice_key);
+    if ($user_can_view && isset($_GET['invoice-id'])) {
         $invoice_id     = (int)$_GET['invoice-id'];
-        $user_can_view  = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? true : false;
+        $user_can_view  = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? true : false;
     }
 
     // Key was provided, but user is logged out. Offer them the ability to login and view the receipt
-    if ( ! $user_can_view && ! empty( $invoice_key ) && ! is_user_logged_in() ) {
+    if (!$user_can_view && !empty($invoice_key) && !is_user_logged_in()) {
         // login redirect
-        return '<p class="alert alert-error">' . __( 'You are not allowed to access this section', 'invoicing' ) . '</p>';
+        return '<p class="alert alert-error">' . __('You are not allowed to access this section', 'invoicing') . '</p>';
     }
 
-    if ( ! apply_filters( 'wpinv_user_can_view_receipt', $user_can_view, $wpinv_receipt_args ) ) {
+    if (!apply_filters('wpinv_user_can_view_receipt', $user_can_view, $wpinv_receipt_args)) {
         return '<p class="alert alert-error">' . $wpinv_receipt_args['error'] . '</p>';
     }
 
     ob_start();
 
-    wpinv_get_template_part( 'wpinv-invoice-receipt' );
+    wpinv_get_template_part('wpinv-invoice-receipt');
 
     $display = ob_get_clean();
 
     return $display;
 }
 
-function wpinv_get_invoice_id_by_key( $key ) {
+function wpinv_get_invoice_id_by_key($key) {
 	global $wpdb;
 
-	$invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
+	$invoice_id = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key));
 
-	if ( $invoice_id != NULL )
+	if ($invoice_id != NULL)
 		return $invoice_id;
 
 	return 0;
 }
 
-function wpinv_can_view_receipt( $invoice_key = '' ) {
+function wpinv_can_view_receipt($invoice_key = '') {
 	$return = false;
 
-	if ( empty( $invoice_key ) ) {
+	if (empty($invoice_key)) {
 		return $return;
 	}
 
 	global $wpinv_receipt_args;
 
-	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
-	if ( isset( $_GET['invoice-id'] ) ) {
-		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
+	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key($invoice_key);
+	if (isset($_GET['invoice-id'])) {
+		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? (int)$_GET['invoice-id'] : 0;
 	}
 
-	if ( empty( $wpinv_receipt_args['id'] ) ) {
+	if (empty($wpinv_receipt_args['id'])) {
 		return $return;
 	}
 
-	$invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
-	if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
+	$invoice = wpinv_get_invoice($wpinv_receipt_args['id']);
+	if (!(!empty($invoice->ID) && $invoice->get_key() === $invoice_key)) {
 		return $return;
 	}
 
-	if ( is_user_logged_in() ) {
-		if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
+	if (is_user_logged_in()) {
+		if ((int)$invoice->get_user_id() === (int)get_current_user_id()) {
 			$return = true;
 		}
 	}
 
 	$session = wpinv_get_checkout_session();
-	if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
-		$check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
+	if (isset($_GET['invoice_key']) || ($session && isset($session['invoice_key']))) {
+		$check_key = isset($_GET['invoice_key']) ? $_GET['invoice_key'] : $session['invoice_key'];
 
-		if ( wpinv_require_login_to_checkout() ) {
+		if (wpinv_require_login_to_checkout()) {
 			$return = $return && $check_key === $invoice_key;
 		} else {
 			$return = $check_key === $invoice_key;
 		}
 	}
 
-	return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
+	return (bool)apply_filters('wpinv_can_view_receipt', $return, $invoice_key);
 }
 
 function wpinv_pay_for_invoice() {
     global $wpinv_euvat;
     
-    if ( isset( $_GET['invoice_key'] ) ) {
+    if (isset($_GET['invoice_key'])) {
         $checkout_uri   = wpinv_get_checkout_uri();
-        $invoice_key    = sanitize_text_field( $_GET['invoice_key'] );
+        $invoice_key    = sanitize_text_field($_GET['invoice_key']);
         
-        if ( empty( $invoice_key ) ) {
-            wpinv_set_error( 'invalid_invoice', __( 'Invoice not found', 'invoicing' ) );
-            wp_redirect( $checkout_uri );
+        if (empty($invoice_key)) {
+            wpinv_set_error('invalid_invoice', __('Invoice not found', 'invoicing'));
+            wp_redirect($checkout_uri);
             wpinv_die();
         }
         
-        do_action( 'wpinv_check_pay_for_invoice', $invoice_key );
+        do_action('wpinv_check_pay_for_invoice', $invoice_key);
 
-        $invoice_id    = wpinv_get_invoice_id_by_key( $invoice_key );
-        $user_can_view = wpinv_can_view_receipt( $invoice_key );
-        if ( $user_can_view && isset( $_GET['invoice-id'] ) ) {
+        $invoice_id    = wpinv_get_invoice_id_by_key($invoice_key);
+        $user_can_view = wpinv_can_view_receipt($invoice_key);
+        if ($user_can_view && isset($_GET['invoice-id'])) {
             $invoice_id     = (int)$_GET['invoice-id'];
-            $user_can_view  = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? true : false;
+            $user_can_view  = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? true : false;
         }
         
-        if ( $invoice_id && $user_can_view && ( $invoice = wpinv_get_invoice( $invoice_id ) ) ) {
-            if ( $invoice->needs_payment() ) {
+        if ($invoice_id && $user_can_view && ($invoice = wpinv_get_invoice($invoice_id))) {
+            if ($invoice->needs_payment()) {
                 $data                   = array();
                 $data['invoice_id']     = $invoice_id;
-                $data['cart_discounts'] = $invoice->get_discounts( true );
+                $data['cart_discounts'] = $invoice->get_discounts(true);
                 
-                wpinv_set_checkout_session( $data );
+                wpinv_set_checkout_session($data);
                 
-                if ( wpinv_get_option( 'vat_ip_country_default' ) ) {
+                if (wpinv_get_option('vat_ip_country_default')) {
                     $_POST['country']   = $wpinv_euvat->get_country_by_ip();
                     $_POST['state']     = $_POST['country'] == $invoice->country ? $invoice->state : '';
                     
-                    wpinv_recalculate_tax( true );
+                    wpinv_recalculate_tax(true);
                 }
                 
             } else {
                 $checkout_uri = $invoice->get_view_url();
             }
         } else {
-            wpinv_set_error( 'invalid_invoice', __( 'You are not allowed to view this invoice', 'invoicing' ) );
+            wpinv_set_error('invalid_invoice', __('You are not allowed to view this invoice', 'invoicing'));
             
-            $checkout_uri = is_user_logged_in() ? wpinv_get_history_page_uri() : wp_login_url( get_permalink() );
+            $checkout_uri = is_user_logged_in() ? wpinv_get_history_page_uri() : wp_login_url(get_permalink());
         }
         
-        wp_redirect( $checkout_uri );
+        wp_redirect($checkout_uri);
         wpinv_die();
     }
 }
-add_action( 'wpinv_pay_for_invoice', 'wpinv_pay_for_invoice' );
+add_action('wpinv_pay_for_invoice', 'wpinv_pay_for_invoice');
 
-function wpinv_handle_pay_via_invoice_link( $invoice_key ) {
-    if ( !empty( $invoice_key ) && !empty( $_REQUEST['_wpipay'] ) && !is_user_logged_in() && $invoice_id = wpinv_get_invoice_id_by_key( $invoice_key ) ) {
-        if ( $invoice = wpinv_get_invoice( $invoice_id ) ) {
+function wpinv_handle_pay_via_invoice_link($invoice_key) {
+    if (!empty($invoice_key) && !empty($_REQUEST['_wpipay']) && !is_user_logged_in() && $invoice_id = wpinv_get_invoice_id_by_key($invoice_key)) {
+        if ($invoice = wpinv_get_invoice($invoice_id)) {
             $user_id = $invoice->get_user_id();
-            $secret = sanitize_text_field( $_GET['_wpipay'] );
+            $secret = sanitize_text_field($_GET['_wpipay']);
             
-            if ( $secret === md5( $user_id . '::' . $invoice->get_email() . '::' . $invoice_key ) ) { // valid invoice link
-                $redirect_to = remove_query_arg( '_wpipay', get_permalink() );
+            if ($secret === md5($user_id . '::' . $invoice->get_email() . '::' . $invoice_key)) { // valid invoice link
+                $redirect_to = remove_query_arg('_wpipay', get_permalink());
                 
-                wpinv_guest_redirect( $redirect_to, $user_id );
+                wpinv_guest_redirect($redirect_to, $user_id);
                 wpinv_die();
             }
         }
     }
 }
-add_action( 'wpinv_check_pay_for_invoice', 'wpinv_handle_pay_via_invoice_link' );
+add_action('wpinv_check_pay_for_invoice', 'wpinv_handle_pay_via_invoice_link');
 
-function wpinv_set_payment_transaction_id( $invoice_id = 0, $transaction_id = '' ) {
-    $invoice_id = is_object( $invoice_id ) && !empty( $invoice_id->ID ) ? $invoice_id : $invoice_id;
+function wpinv_set_payment_transaction_id($invoice_id = 0, $transaction_id = '') {
+    $invoice_id = is_object($invoice_id) && !empty($invoice_id->ID) ? $invoice_id : $invoice_id;
     
-    if ( empty( $invoice_id ) && $invoice_id > 0 ) {
+    if (empty($invoice_id) && $invoice_id > 0) {
         return false;
     }
     
-    if ( empty( $transaction_id ) ) {
+    if (empty($transaction_id)) {
         $transaction_id = $invoice_id;
     }
 
-    $transaction_id = apply_filters( 'wpinv_set_payment_transaction_id', $transaction_id, $invoice_id );
+    $transaction_id = apply_filters('wpinv_set_payment_transaction_id', $transaction_id, $invoice_id);
     
-    return wpinv_update_invoice_meta( $invoice_id, '_wpinv_transaction_id', $transaction_id );
+    return wpinv_update_invoice_meta($invoice_id, '_wpinv_transaction_id', $transaction_id);
 }
 
-function wpinv_invoice_status_label( $status, $status_display = '' ) {
-    if ( empty( $status_display ) ) {
-        $status_display = wpinv_status_nicename( $status );
+function wpinv_invoice_status_label($status, $status_display = '') {
+    if (empty($status_display)) {
+        $status_display = wpinv_status_nicename($status);
     }
     
-    switch ( $status ) {
+    switch ($status) {
         case 'publish' :
         case 'wpi-renewal' :
             $class = 'label-success';
@@ -2033,178 +2033,178 @@ 
     
     $label = '<span class="label label-inv-' . $status . ' ' . $class . '">' . $status_display . '</span>';
     
-    return apply_filters( 'wpinv_invoice_status_label', $label, $status, $status_display );
+    return apply_filters('wpinv_invoice_status_label', $label, $status, $status_display);
 }
 
-function wpinv_format_invoice_number( $number, $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_format_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+function wpinv_format_invoice_number($number, $type = '') {
+    $check = apply_filters('wpinv_pre_format_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
 
-    if ( !empty( $number ) && !is_numeric( $number ) ) {
+    if (!empty($number) && !is_numeric($number)) {
         return $number;
     }
 
-    $padd  = wpinv_get_option( 'invoice_number_padd' );
-    $prefix  = wpinv_get_option( 'invoice_number_prefix' );
-    $postfix = wpinv_get_option( 'invoice_number_postfix' );
+    $padd = wpinv_get_option('invoice_number_padd');
+    $prefix  = wpinv_get_option('invoice_number_prefix');
+    $postfix = wpinv_get_option('invoice_number_postfix');
     
-    $padd = absint( $padd );
-    $formatted_number = absint( $number );
+    $padd = absint($padd);
+    $formatted_number = absint($number);
     
-    if ( $padd > 0 ) {
-        $formatted_number = zeroise( $formatted_number, $padd );
+    if ($padd > 0) {
+        $formatted_number = zeroise($formatted_number, $padd);
     }    
 
     $formatted_number = $prefix . $formatted_number . $postfix;
 
-    return apply_filters( 'wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd );
+    return apply_filters('wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd);
 }
 
-function wpinv_get_next_invoice_number( $type = '' ) {
-    $check = apply_filters( 'wpinv_get_pre_next_invoice_number', null, $type );
-    if ( null !== $check ) {
+function wpinv_get_next_invoice_number($type = '') {
+    $check = apply_filters('wpinv_get_pre_next_invoice_number', null, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    if ( !wpinv_sequential_number_active() ) {
+    if (!wpinv_sequential_number_active()) {
         return false;
     }
 
-    $number = $last_number = get_option( 'wpinv_last_invoice_number' );
-    $start  = wpinv_get_option( 'invoice_sequence_start' );
-    if ( !absint( $start ) > 0 ) {
+    $number = $last_number = get_option('wpinv_last_invoice_number');
+    $start  = wpinv_get_option('invoice_sequence_start');
+    if (!absint($start) > 0) {
         $start = 1;
     }
     $increment_number = true;
     $save_number = false;
 
-    if ( !empty( $number ) && !is_numeric( $number ) && $number == wpinv_format_invoice_number( $number ) ) {
-        $number = wpinv_clean_invoice_number( $number );
+    if (!empty($number) && !is_numeric($number) && $number == wpinv_format_invoice_number($number)) {
+        $number = wpinv_clean_invoice_number($number);
     }
 
-    if ( empty( $number ) ) {
-        if ( !( $last_number === 0 || $last_number === '0' ) ) {
-            $last_invoice = wpinv_get_invoices( array( 'limit' => 1, 'order' => 'DESC', 'orderby' => 'ID', 'return' => 'posts', 'fields' => 'ids', 'status' => array_keys( wpinv_get_invoice_statuses( true ) ) ) );
+    if (empty($number)) {
+        if (!($last_number === 0 || $last_number === '0')) {
+            $last_invoice = wpinv_get_invoices(array('limit' => 1, 'order' => 'DESC', 'orderby' => 'ID', 'return' => 'posts', 'fields' => 'ids', 'status' => array_keys(wpinv_get_invoice_statuses(true))));
 
-            if ( !empty( $last_invoice[0] ) && $invoice_number = wpinv_get_invoice_number( $last_invoice[0] ) ) {
-                if ( is_numeric( $invoice_number ) ) {
+            if (!empty($last_invoice[0]) && $invoice_number = wpinv_get_invoice_number($last_invoice[0])) {
+                if (is_numeric($invoice_number)) {
                     $number = $invoice_number;
                 } else {
-                    $number = wpinv_clean_invoice_number( $invoice_number );
+                    $number = wpinv_clean_invoice_number($invoice_number);
                 }
             }
 
-            if ( empty( $number ) ) {
+            if (empty($number)) {
                 $increment_number = false;
                 $number = $start;
-                $save_number = ( $number - 1 );
+                $save_number = ($number - 1);
             } else {
                 $save_number = $number;
             }
         }
     }
 
-    if ( $start > $number ) {
+    if ($start > $number) {
         $increment_number = false;
         $number = $start;
-        $save_number = ( $number - 1 );
+        $save_number = ($number - 1);
     }
 
-    if ( $save_number !== false ) {
-        update_option( 'wpinv_last_invoice_number', $save_number );
+    if ($save_number !== false) {
+        update_option('wpinv_last_invoice_number', $save_number);
     }
     
-    $increment_number = apply_filters( 'wpinv_increment_payment_number', $increment_number, $number );
+    $increment_number = apply_filters('wpinv_increment_payment_number', $increment_number, $number);
 
-    if ( $increment_number ) {
+    if ($increment_number) {
         $number++;
     }
 
-    return apply_filters( 'wpinv_get_next_invoice_number', $number );
+    return apply_filters('wpinv_get_next_invoice_number', $number);
 }
 
-function wpinv_clean_invoice_number( $number, $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_clean_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+function wpinv_clean_invoice_number($number, $type = '') {
+    $check = apply_filters('wpinv_pre_clean_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    $prefix  = wpinv_get_option( 'invoice_number_prefix' );
-    $postfix = wpinv_get_option( 'invoice_number_postfix' );
+    $prefix  = wpinv_get_option('invoice_number_prefix');
+    $postfix = wpinv_get_option('invoice_number_postfix');
 
-    $number = preg_replace( '/' . $prefix . '/', '', $number, 1 );
+    $number = preg_replace('/' . $prefix . '/', '', $number, 1);
 
-    $length      = strlen( $number );
-    $postfix_pos = strrpos( $number, $postfix );
+    $length      = strlen($number);
+    $postfix_pos = strrpos($number, $postfix);
     
-    if ( false !== $postfix_pos ) {
-        $number      = substr_replace( $number, '', $postfix_pos, $length );
+    if (false !== $postfix_pos) {
+        $number = substr_replace($number, '', $postfix_pos, $length);
     }
 
-    $number = intval( $number );
+    $number = intval($number);
 
-    return apply_filters( 'wpinv_clean_invoice_number', $number, $prefix, $postfix );
+    return apply_filters('wpinv_clean_invoice_number', $number, $prefix, $postfix);
 }
 
-function wpinv_save_number_post_saved( $post_ID, $post, $update ) {
+function wpinv_save_number_post_saved($post_ID, $post, $update) {
     global $wpdb;
 
-    if ( !$update && !get_post_meta( $post_ID, '_wpinv_number', true ) ) {
-        wpinv_update_invoice_number( $post_ID, $post->post_status != 'auto-draft', $post->post_type );
+    if (!$update && !get_post_meta($post_ID, '_wpinv_number', true)) {
+        wpinv_update_invoice_number($post_ID, $post->post_status != 'auto-draft', $post->post_type);
     }
 
-    if ( !$update ) {
-        $wpdb->update( $wpdb->posts, array( 'post_name' => wpinv_generate_post_name( $post_ID ) ), array( 'ID' => $post_ID ) );
-        clean_post_cache( $post_ID );
+    if (!$update) {
+        $wpdb->update($wpdb->posts, array('post_name' => wpinv_generate_post_name($post_ID)), array('ID' => $post_ID));
+        clean_post_cache($post_ID);
     }
 }
-add_action( 'save_post_wpi_invoice', 'wpinv_save_number_post_saved', 1, 3 );
+add_action('save_post_wpi_invoice', 'wpinv_save_number_post_saved', 1, 3);
 
-function wpinv_save_number_post_updated( $post_ID, $post_after, $post_before ) {
-    if ( !empty( $post_after->post_type ) && $post_after->post_type == 'wpi_invoice' && $post_before->post_status == 'auto-draft' && $post_after->post_status != $post_before->post_status ) {
-        wpinv_update_invoice_number( $post_ID, true, $post_after->post_type );
+function wpinv_save_number_post_updated($post_ID, $post_after, $post_before) {
+    if (!empty($post_after->post_type) && $post_after->post_type == 'wpi_invoice' && $post_before->post_status == 'auto-draft' && $post_after->post_status != $post_before->post_status) {
+        wpinv_update_invoice_number($post_ID, true, $post_after->post_type);
     }
 }
-add_action( 'post_updated', 'wpinv_save_number_post_updated', 1, 3 );
+add_action('post_updated', 'wpinv_save_number_post_updated', 1, 3);
 
-function wpinv_update_invoice_number( $post_ID, $save_sequential = false, $type = '' ) {
+function wpinv_update_invoice_number($post_ID, $save_sequential = false, $type = '') {
     global $wpdb;
     
-    $check = apply_filters( 'wpinv_pre_update_invoice_number', null, $post_ID, $save_sequential, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_pre_update_invoice_number', null, $post_ID, $save_sequential, $type);
+    if (null !== $check) {
         return $check;
     }
 
-    if ( wpinv_sequential_number_active() ) {
+    if (wpinv_sequential_number_active()) {
         $number = wpinv_get_next_invoice_number();
 
-        if ( $save_sequential ) {
-            update_option( 'wpinv_last_invoice_number', $number );
+        if ($save_sequential) {
+            update_option('wpinv_last_invoice_number', $number);
         }
     } else {
         $number = $post_ID;
     }
 
-    $number = wpinv_format_invoice_number( $number );
+    $number = wpinv_format_invoice_number($number);
 
-    update_post_meta( $post_ID, '_wpinv_number', $number );
+    update_post_meta($post_ID, '_wpinv_number', $number);
 
-    $wpdb->update( $wpdb->posts, array( 'post_title' => $number ), array( 'ID' => $post_ID ) );
+    $wpdb->update($wpdb->posts, array('post_title' => $number), array('ID' => $post_ID));
 
-    clean_post_cache( $post_ID );
+    clean_post_cache($post_ID);
 
     return $number;
 }
 
-function wpinv_post_name_prefix( $post_type = 'wpi_invoice' ) {
-    return apply_filters( 'wpinv_post_name_prefix', 'inv-', $post_type );
+function wpinv_post_name_prefix($post_type = 'wpi_invoice') {
+    return apply_filters('wpinv_post_name_prefix', 'inv-', $post_type);
 }
 
-function wpinv_generate_post_name( $post_ID ) {
-    $prefix = wpinv_post_name_prefix( get_post_type( $post_ID ) );
-    $post_name = sanitize_title( $prefix . $post_ID );
+function wpinv_generate_post_name($post_ID) {
+    $prefix = wpinv_post_name_prefix(get_post_type($post_ID));
+    $post_name = sanitize_title($prefix . $post_ID);
 
-    return apply_filters( 'wpinv_generate_post_name', $post_name, $post_ID, $prefix );
+    return apply_filters('wpinv_generate_post_name', $post_name, $post_ID, $prefix);
 }
\ No newline at end of file

includes/wpinv-general-functions.php

Spacing +159 added lines, -159 removed lines

@@ -7,195 +7,195 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_is_checkout() {
     global $wp_query;
 
-    $is_object_set    = isset( $wp_query->queried_object );
-    $is_object_id_set = isset( $wp_query->queried_object_id );
-    $is_checkout      = is_page( wpinv_get_option( 'checkout_page' ) );
+    $is_object_set    = isset($wp_query->queried_object);
+    $is_object_id_set = isset($wp_query->queried_object_id);
+    $is_checkout      = is_page(wpinv_get_option('checkout_page'));
 
-    if ( !$is_object_set ) {
-        unset( $wp_query->queried_object );
+    if (!$is_object_set) {
+        unset($wp_query->queried_object);
     }
 
-    if ( !$is_object_id_set ) {
-        unset( $wp_query->queried_object_id );
+    if (!$is_object_id_set) {
+        unset($wp_query->queried_object_id);
     }
 
-    return apply_filters( 'wpinv_is_checkout', $is_checkout );
+    return apply_filters('wpinv_is_checkout', $is_checkout);
 }
 
 function wpinv_can_checkout() {
 	$can_checkout = true; // Always true for now
 
-	return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
+	return (bool)apply_filters('wpinv_can_checkout', $can_checkout);
 }
 
 function wpinv_get_success_page_uri() {
-	$page_id = wpinv_get_option( 'success_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('success_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_success_page_uri', get_permalink($page_id));
 }
 
 function wpinv_get_history_page_uri() {
-	$page_id = wpinv_get_option( 'invoice_history_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('invoice_history_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_history_page_uri', get_permalink($page_id));
 }
 
 function wpinv_is_success_page() {
-	$is_success_page = wpinv_get_option( 'success_page', false );
-	$is_success_page = isset( $is_success_page ) ? is_page( $is_success_page ) : false;
+	$is_success_page = wpinv_get_option('success_page', false);
+	$is_success_page = isset($is_success_page) ? is_page($is_success_page) : false;
 
-	return apply_filters( 'wpinv_is_success_page', $is_success_page );
+	return apply_filters('wpinv_is_success_page', $is_success_page);
 }
 
 function wpinv_is_invoice_history_page() {
-	$ret = wpinv_get_option( 'invoice_history_page', false );
-	$ret = $ret ? is_page( $ret ) : false;
-	return apply_filters( 'wpinv_is_invoice_history_page', $ret );
+	$ret = wpinv_get_option('invoice_history_page', false);
+	$ret = $ret ? is_page($ret) : false;
+	return apply_filters('wpinv_is_invoice_history_page', $ret);
 }
 
-function wpinv_send_to_success_page( $args = null ) {
+function wpinv_send_to_success_page($args = null) {
 	$redirect = wpinv_get_success_page_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_success_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_success_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_send_to_failed_page( $args = null ) {
+function wpinv_send_to_failed_page($args = null) {
 	$redirect = wpinv_get_failed_transaction_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_failed_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_failed_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_get_checkout_uri( $args = array() ) {
-	$uri = wpinv_get_option( 'checkout_page', false );
-	$uri = isset( $uri ) ? get_permalink( $uri ) : NULL;
+function wpinv_get_checkout_uri($args = array()) {
+	$uri = wpinv_get_option('checkout_page', false);
+	$uri = isset($uri) ? get_permalink($uri) : NULL;
 
-	if ( !empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$uri = add_query_arg( $args, $uri );
+		$uri = add_query_arg($args, $uri);
 	}
 
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+	$scheme = defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
-	$ajax_url = admin_url( 'admin-ajax.php', $scheme );
+	$ajax_url = admin_url('admin-ajax.php', $scheme);
 
-	if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
-		$uri = preg_replace( '/^http:/', 'https:', $uri );
+	if ((!preg_match('/^https/', $uri) && preg_match('/^https/', $ajax_url)) || wpinv_is_ssl_enforced()) {
+		$uri = preg_replace('/^http:/', 'https:', $uri);
 	}
 
-	return apply_filters( 'wpinv_get_checkout_uri', $uri );
+	return apply_filters('wpinv_get_checkout_uri', $uri);
 }
 
-function wpinv_send_back_to_checkout( $args = array() ) {
+function wpinv_send_back_to_checkout($args = array()) {
 	$redirect = wpinv_get_checkout_uri();
 
-	if ( ! empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$redirect = add_query_arg( $args, $redirect );
+		$redirect = add_query_arg($args, $redirect);
 	}
 
-	wp_redirect( apply_filters( 'wpinv_send_back_to_checkout', $redirect, $args ) );
+	wp_redirect(apply_filters('wpinv_send_back_to_checkout', $redirect, $args));
 	exit;
 }
 
-function wpinv_get_success_page_url( $query_string = null ) {
-	$success_page = wpinv_get_option( 'success_page', 0 );
-	$success_page = get_permalink( $success_page );
+function wpinv_get_success_page_url($query_string = null) {
+	$success_page = wpinv_get_option('success_page', 0);
+	$success_page = get_permalink($success_page);
 
-	if ( $query_string )
+	if ($query_string)
 		$success_page .= $query_string;
 
-	return apply_filters( 'wpinv_success_page_url', $success_page );
+	return apply_filters('wpinv_success_page_url', $success_page);
 }
 
-function wpinv_get_failed_transaction_uri( $extras = false ) {
-	$uri = wpinv_get_option( 'failure_page', '' );
-	$uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
+function wpinv_get_failed_transaction_uri($extras = false) {
+	$uri = wpinv_get_option('failure_page', '');
+	$uri = !empty($uri) ? trailingslashit(get_permalink($uri)) : home_url();
 
-	if ( $extras )
+	if ($extras)
 		$uri .= $extras;
 
-	return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
+	return apply_filters('wpinv_get_failed_transaction_uri', $uri);
 }
 
 function wpinv_is_failed_transaction_page() {
-	$ret = wpinv_get_option( 'failure_page', false );
-	$ret = isset( $ret ) ? is_page( $ret ) : false;
+	$ret = wpinv_get_option('failure_page', false);
+	$ret = isset($ret) ? is_page($ret) : false;
 
-	return apply_filters( 'wpinv_is_failure_page', $ret );
+	return apply_filters('wpinv_is_failure_page', $ret);
 }
 
-function wpinv_transaction_query( $type = 'start' ) {
+function wpinv_transaction_query($type = 'start') {
     global $wpdb;
 
     $wpdb->hide_errors();
 
-    if ( ! defined( 'WPINV_USE_TRANSACTIONS' ) ) {
-        define( 'WPINV_USE_TRANSACTIONS', true );
+    if (!defined('WPINV_USE_TRANSACTIONS')) {
+        define('WPINV_USE_TRANSACTIONS', true);
     }
 
-    if ( WPINV_USE_TRANSACTIONS ) {
-        switch ( $type ) {
+    if (WPINV_USE_TRANSACTIONS) {
+        switch ($type) {
             case 'commit' :
-                $wpdb->query( 'COMMIT' );
+                $wpdb->query('COMMIT');
                 break;
             case 'rollback' :
-                $wpdb->query( 'ROLLBACK' );
+                $wpdb->query('ROLLBACK');
                 break;
             default :
-                $wpdb->query( 'START TRANSACTION' );
+                $wpdb->query('START TRANSACTION');
             break;
         }
     }
 }
 
-function wpinv_create_invoice( $args = array(), $data = array(), $wp_error = false ) {
+function wpinv_create_invoice($args = array(), $data = array(), $wp_error = false) {
     $default_args = array(
         'status'        => '',
         'user_id'       => null,
@@ -205,63 +205,63 @@ 
         'parent'        => 0
     );
 
-    $args           = wp_parse_args( $args, $default_args );
+    $args           = wp_parse_args($args, $default_args);
     $invoice_data   = array();
 
-    if ( $args['invoice_id'] > 0 ) {
-        $updating           = true;
+    if ($args['invoice_id'] > 0) {
+        $updating = true;
         $invoice_data['post_type']  = 'wpi_invoice';
         $invoice_data['ID']         = $args['invoice_id'];
     } else {
         $updating                       = false;
         $invoice_data['post_type']      = 'wpi_invoice';
-        $invoice_data['post_status']    = apply_filters( 'wpinv_default_invoice_status', 'wpi-pending' );
+        $invoice_data['post_status']    = apply_filters('wpinv_default_invoice_status', 'wpi-pending');
         $invoice_data['ping_status']    = 'closed';
-        $invoice_data['post_author']    = !empty( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
-        $invoice_data['post_title']     = wpinv_format_invoice_number( '0' );
-        $invoice_data['post_parent']    = absint( $args['parent'] );
-        if ( !empty( $args['created_date'] ) ) {
+        $invoice_data['post_author']    = !empty($args['user_id']) ? $args['user_id'] : get_current_user_id();
+        $invoice_data['post_title']     = wpinv_format_invoice_number('0');
+        $invoice_data['post_parent']    = absint($args['parent']);
+        if (!empty($args['created_date'])) {
             $invoice_data['post_date']      = $args['created_date'];
-            $invoice_data['post_date_gmt']  = get_gmt_from_date( $args['created_date'] );
+            $invoice_data['post_date_gmt']  = get_gmt_from_date($args['created_date']);
         }
     }
 
-    if ( $args['status'] ) {
-        if ( ! in_array( $args['status'], array_keys( wpinv_get_invoice_statuses() ) ) ) {
-            return new WP_Error( 'wpinv_invalid_invoice_status', wp_sprintf( __( 'Invalid invoice status: %s', 'invoicing' ), $args['status'] ) );
+    if ($args['status']) {
+        if (!in_array($args['status'], array_keys(wpinv_get_invoice_statuses()))) {
+            return new WP_Error('wpinv_invalid_invoice_status', wp_sprintf(__('Invalid invoice status: %s', 'invoicing'), $args['status']));
         }
-        $invoice_data['post_status']    = $args['status'];
+        $invoice_data['post_status'] = $args['status'];
     }
 
-    if ( ! is_null( $args['user_note'] ) ) {
-        $invoice_data['post_excerpt']   = $args['user_note'];
+    if (!is_null($args['user_note'])) {
+        $invoice_data['post_excerpt'] = $args['user_note'];
     }
 
-    if ( $updating ) {
-        $invoice_id = wp_update_post( $invoice_data, true );
+    if ($updating) {
+        $invoice_id = wp_update_post($invoice_data, true);
     } else {
-        $invoice_id = wp_insert_post( apply_filters( 'wpinv_new_invoice_data', $invoice_data ), true );
+        $invoice_id = wp_insert_post(apply_filters('wpinv_new_invoice_data', $invoice_data), true);
     }
 
-    if ( is_wp_error( $invoice_id ) ) {
+    if (is_wp_error($invoice_id)) {
         return $wp_error ? $invoice_id : 0;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-
-    if ( !$updating ) {
-        update_post_meta( $invoice_id, '_wpinv_key', apply_filters( 'wpinv_generate_invoice_key', uniqid( 'wpinv_' ) ) );
-        update_post_meta( $invoice_id, '_wpinv_currency', wpinv_get_currency() );
-        update_post_meta( $invoice_id, '_wpinv_include_tax', get_option( 'wpinv_prices_include_tax' ) );
-        update_post_meta( $invoice_id, '_wpinv_user_ip', wpinv_get_ip() );
-        update_post_meta( $invoice_id, '_wpinv_user_agent', wpinv_get_user_agent() );
-        update_post_meta( $invoice_id, '_wpinv_created_via', sanitize_text_field( $args['created_via'] ) );
+    $invoice = wpinv_get_invoice($invoice_id);
+
+    if (!$updating) {
+        update_post_meta($invoice_id, '_wpinv_key', apply_filters('wpinv_generate_invoice_key', uniqid('wpinv_')));
+        update_post_meta($invoice_id, '_wpinv_currency', wpinv_get_currency());
+        update_post_meta($invoice_id, '_wpinv_include_tax', get_option('wpinv_prices_include_tax'));
+        update_post_meta($invoice_id, '_wpinv_user_ip', wpinv_get_ip());
+        update_post_meta($invoice_id, '_wpinv_user_agent', wpinv_get_user_agent());
+        update_post_meta($invoice_id, '_wpinv_created_via', sanitize_text_field($args['created_via']));
         
         // Add invoice note
-        $invoice->add_note( wp_sprintf( __( 'Invoice is created with status %s.', 'invoicing' ), wpinv_status_nicename( $invoice->status ) ) );
+        $invoice->add_note(wp_sprintf(__('Invoice is created with status %s.', 'invoicing'), wpinv_status_nicename($invoice->status)));
     }
 
-    update_post_meta( $invoice_id, '_wpinv_version', WPINV_VERSION );
+    update_post_meta($invoice_id, '_wpinv_version', WPINV_VERSION);
 
     return $invoice;
 }
@@ -269,144 +269,144 @@ 
 function wpinv_get_prefix() {
     $invoice_prefix = 'INV-';
     
-    return apply_filters( 'wpinv_get_prefix', $invoice_prefix );
+    return apply_filters('wpinv_get_prefix', $invoice_prefix);
 }
 
 function wpinv_get_business_logo() {
-    $business_logo = wpinv_get_option( 'logo' );
-    return apply_filters( 'wpinv_get_business_logo', $business_logo );
+    $business_logo = wpinv_get_option('logo');
+    return apply_filters('wpinv_get_business_logo', $business_logo);
 }
 
 function wpinv_get_business_name() {
     $business_name = wpinv_get_option('store_name');
-    return apply_filters( 'wpinv_get_business_name', $business_name );
+    return apply_filters('wpinv_get_business_name', $business_name);
 }
 
 function wpinv_get_blogname() {
-    return wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    return wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 }
 
 function wpinv_get_admin_email() {
-    $admin_email = get_option( 'admin_email' );
-    return apply_filters( 'wpinv_admin_email', $admin_email );
+    $admin_email = get_option('admin_email');
+    return apply_filters('wpinv_admin_email', $admin_email);
 }
 
 function wpinv_get_business_website() {
-    $business_website = home_url( '/' );
-    return apply_filters( 'wpinv_get_business_website', $business_website );
+    $business_website = home_url('/');
+    return apply_filters('wpinv_get_business_website', $business_website);
 }
 
-function wpinv_get_terms_text( $invoice_id = 0 ) {
+function wpinv_get_terms_text($invoice_id = 0) {
     $terms_text = '';
-    return apply_filters( 'wpinv_get_terms_text', $terms_text, $invoice_id );
+    return apply_filters('wpinv_get_terms_text', $terms_text, $invoice_id);
 }
 
 function wpinv_get_business_footer() {
-    $site_link = '<a target="_blank" href="' . esc_url( wpinv_get_business_website() ) . '">' . esc_html( wpinv_get_business_name() ) . '</a>';
-    $business_footer = wp_sprintf( __( 'Thanks for using %s', 'invoicing' ), $site_link );
-    return apply_filters( 'wpinv_get_business_footer', $business_footer );
+    $site_link = '<a target="_blank" href="' . esc_url(wpinv_get_business_website()) . '">' . esc_html(wpinv_get_business_name()) . '</a>';
+    $business_footer = wp_sprintf(__('Thanks for using %s', 'invoicing'), $site_link);
+    return apply_filters('wpinv_get_business_footer', $business_footer);
 }
 
 function wpinv_checkout_required_fields() {
     $required_fields = array();
     
     // Let payment gateways and other extensions determine if address fields should be required
-    $require_billing_details = apply_filters( 'wpinv_checkout_required_billing_details', wpinv_use_taxes() );
+    $require_billing_details = apply_filters('wpinv_checkout_required_billing_details', wpinv_use_taxes());
     
-    if ( $require_billing_details ) {
+    if ($require_billing_details) {
         ///$required_fields['email'] = array(
                 ///'error_id' => 'invalid_email',
                 ///'error_message' => __( 'Please enter a valid email address', 'invoicing' )
             ///);
         $required_fields['first_name'] = array(
                 'error_id' => 'invalid_first_name',
-                'error_message' => __( 'Please enter your first name', 'invoicing' )
+                'error_message' => __('Please enter your first name', 'invoicing')
             );
         $required_fields['address'] = array(
                 'error_id' => 'invalid_address',
-                'error_message' => __( 'Please enter your address', 'invoicing' )
+                'error_message' => __('Please enter your address', 'invoicing')
             );
         $required_fields['city'] = array(
                 'error_id' => 'invalid_city',
-                'error_message' => __( 'Please enter your billing city', 'invoicing' )
+                'error_message' => __('Please enter your billing city', 'invoicing')
             );
         $required_fields['state'] = array(
                 'error_id' => 'invalid_state',
-                'error_message' => __( 'Please enter billing state / province', 'invoicing' )
+                'error_message' => __('Please enter billing state / province', 'invoicing')
             );
         $required_fields['country'] = array(
                 'error_id' => 'invalid_country',
-                'error_message' => __( 'Please select your billing country', 'invoicing' )
+                'error_message' => __('Please select your billing country', 'invoicing')
             );
     }
 
-    return apply_filters( 'wpinv_checkout_required_fields', $required_fields );
+    return apply_filters('wpinv_checkout_required_fields', $required_fields);
 }
 
 function wpinv_is_ssl_enforced() {
-    $ssl_enforced = wpinv_get_option( 'enforce_ssl', false );
-    return (bool) apply_filters( 'wpinv_is_ssl_enforced', $ssl_enforced );
+    $ssl_enforced = wpinv_get_option('enforce_ssl', false);
+    return (bool)apply_filters('wpinv_is_ssl_enforced', $ssl_enforced);
 }
 
-function wpinv_user_can_view_invoice( $post ) {
+function wpinv_user_can_view_invoice($post) {
     $allow = false;
 
-    $post = get_post( $post );
+    $post = get_post($post);
 
-    if ( empty( $post->ID ) ) {
+    if (empty($post->ID)) {
         return $allow;
     }
 
-    $invoice = wpinv_get_invoice( $post->ID );
-    if ( empty( $invoice->ID ) ) {
+    $invoice = wpinv_get_invoice($post->ID);
+    if (empty($invoice->ID)) {
         return $allow;
     }
 
     // Don't allow trash, draft status
-    if ( $invoice->has_status( array_keys( wpinv_get_invoice_statuses() ) ) ) {
-        if ( current_user_can( 'manage_options' ) ) { // Admin user
+    if ($invoice->has_status(array_keys(wpinv_get_invoice_statuses()))) {
+        if (current_user_can('manage_options')) { // Admin user
             $allow = true;
         } else {
-            if ( is_user_logged_in() ) {
-                if ( (int)$invoice->get_user_id() === (int)get_current_user_id() ) {
+            if (is_user_logged_in()) {
+                if ((int)$invoice->get_user_id() === (int)get_current_user_id()) {
                     $allow = true;
-                } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                } else if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
                     $allow = true;
                 }
             } else {
-                if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
                     $allow = true;
                 }
             }
         }
     }
     
-    return apply_filters( 'wpinv_can_print_invoice', $allow, $post, $invoice );
+    return apply_filters('wpinv_can_print_invoice', $allow, $post, $invoice);
 }
 
 function wpinv_schedule_events() {
     // hourly, daily and twicedaily
-    if ( !wp_next_scheduled( 'wpinv_register_schedule_event_twicedaily' ) ) {
-        wp_schedule_event( current_time( 'timestamp' ), 'twicedaily', 'wpinv_register_schedule_event_twicedaily' );
+    if (!wp_next_scheduled('wpinv_register_schedule_event_twicedaily')) {
+        wp_schedule_event(current_time('timestamp'), 'twicedaily', 'wpinv_register_schedule_event_twicedaily');
     }
 }
-add_action( 'wp', 'wpinv_schedule_events' );
+add_action('wp', 'wpinv_schedule_events');
 
 function wpinv_schedule_event_twicedaily() {
     wpinv_email_payment_reminders();
 }
-add_action( 'wpinv_register_schedule_event_twicedaily', 'wpinv_schedule_event_twicedaily' );
+add_action('wpinv_register_schedule_event_twicedaily', 'wpinv_schedule_event_twicedaily');
 
 function wpinv_require_login_to_checkout() {
-    $return = wpinv_get_option( 'login_to_checkout', false );
-    return (bool) apply_filters( 'wpinv_require_login_to_checkout', $return );
+    $return = wpinv_get_option('login_to_checkout', false);
+    return (bool)apply_filters('wpinv_require_login_to_checkout', $return);
 }
 
-function wpinv_sequential_number_active( $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_check_sequential_number_active', null, $type );
-    if ( null !== $check ) {
+function wpinv_sequential_number_active($type = '') {
+    $check = apply_filters('wpinv_pre_check_sequential_number_active', null, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    return wpinv_get_option( 'sequential_invoice_number' );
+    return wpinv_get_option('sequential_invoice_number');
 }
\ No newline at end of file

includes/class-wpinv-invoice.php

Spacing +796 added lines, -796 removed lines

@@ -7,12 +7,12 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 final class WPInv_Invoice {
-    public $ID  = 0;
+    public $ID = 0;
     public $title;
     public $post_type;
     
@@ -65,17 +65,17 @@ 
     public $full_name = '';
     public $parent_invoice = 0;
     
-    public function __construct( $invoice_id = false ) {
-        if( empty( $invoice_id ) ) {
+    public function __construct($invoice_id = false) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $this->setup_invoice( $invoice_id );
+        $this->setup_invoice($invoice_id);
     }
 
-    public function get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            $value = call_user_func( array( $this, 'get_' . $key ) );
+    public function get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            $value = call_user_func(array($this, 'get_' . $key));
         } else {
             $value = $this->$key;
         }
@@ -83,51 +83,51 @@ 
         return $value;
     }
 
-    public function set( $key, $value ) {
-        $ignore = array( 'items', 'cart_details', 'fees', '_ID' );
+    public function set($key, $value) {
+        $ignore = array('items', 'cart_details', 'fees', '_ID');
 
-        if ( $key === 'status' ) {
+        if ($key === 'status') {
             $this->old_status = $this->status;
         }
 
-        if ( ! in_array( $key, $ignore ) ) {
-            $this->pending[ $key ] = $value;
+        if (!in_array($key, $ignore)) {
+            $this->pending[$key] = $value;
         }
 
-        if( '_ID' !== $key ) {
+        if ('_ID' !== $key) {
             $this->$key = $value;
         }
     }
 
-    public function _isset( $name ) {
-        if ( property_exists( $this, $name) ) {
-            return false === empty( $this->$name );
+    public function _isset($name) {
+        if (property_exists($this, $name)) {
+            return false === empty($this->$name);
         } else {
             return null;
         }
     }
 
-    private function setup_invoice( $invoice_id ) {
+    private function setup_invoice($invoice_id) {
         $this->pending = array();
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $invoice = get_post( $invoice_id );
+        $invoice = get_post($invoice_id);
 
-        if( !$invoice || is_wp_error( $invoice ) ) {
+        if (!$invoice || is_wp_error($invoice)) {
             return false;
         }
 
-        if( !('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type) ) {
+        if (!('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type)) {
             return false;
         }
 
-        do_action( 'wpinv_pre_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_pre_setup_invoice', $this, $invoice_id);
         
         // Primary Identifier
-        $this->ID              = absint( $invoice_id );
+        $this->ID              = absint($invoice_id);
         $this->post_type       = $invoice->post_type;
         
         // We have a payment, get the generic payment_meta item to reduce calls to it
@@ -139,7 +139,7 @@ 
         $this->post_status     = $this->status;
         $this->mode            = $this->setup_mode();
         $this->parent_invoice  = $invoice->post_parent;
-        $this->post_name       = $this->setup_post_name( $invoice );
+        $this->post_name       = $this->setup_post_name($invoice);
         $this->status_nicename = $this->setup_status_nicename($invoice->post_status);
 
         // Items
@@ -161,8 +161,8 @@ 
         
         // User based
         $this->ip              = $this->setup_ip();
-        $this->user_id         = !empty( $invoice->post_author ) ? $invoice->post_author : get_current_user_id();///$this->setup_user_id();
-        $this->email           = get_the_author_meta( 'email', $this->user_id );
+        $this->user_id         = !empty($invoice->post_author) ? $invoice->post_author : get_current_user_id(); ///$this->setup_user_id();
+        $this->email           = get_the_author_meta('email', $this->user_id);
         
         $this->user_info       = $this->setup_user_info();
                 
@@ -171,7 +171,7 @@ 
         $this->company         = $this->user_info['company'];
         $this->vat_number      = $this->user_info['vat_number'];
         $this->vat_rate        = $this->user_info['vat_rate'];
-        $this->adddress_confirmed  = $this->user_info['adddress_confirmed'];
+        $this->adddress_confirmed = $this->user_info['adddress_confirmed'];
         $this->address         = $this->user_info['address'];
         $this->city            = $this->user_info['city'];
         $this->country         = $this->user_info['country'];
@@ -186,35 +186,35 @@ 
         // Other Identifiers
         $this->key             = $this->setup_invoice_key();
         $this->number          = $this->setup_invoice_number();
-        $this->title           = !empty( $invoice->post_title ) ? $invoice->post_title : $this->number;
+        $this->title           = !empty($invoice->post_title) ? $invoice->post_title : $this->number;
         
-        $this->full_name       = trim( $this->first_name . ' '. $this->last_name );
+        $this->full_name       = trim($this->first_name . ' ' . $this->last_name);
         
         // Allow extensions to add items to this object via hook
-        do_action( 'wpinv_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_setup_invoice', $this, $invoice_id);
 
         return true;
     }
     
     private function setup_status_nicename($status) {
-        $all_invoice_statuses  = wpinv_get_invoice_statuses();
-        $status   = isset( $all_invoice_statuses[$status] ) ? $all_invoice_statuses[$status] : __( $status, 'invoicing' );
+        $all_invoice_statuses = wpinv_get_invoice_statuses();
+        $status = isset($all_invoice_statuses[$status]) ? $all_invoice_statuses[$status] : __($status, 'invoicing');
 
-        return apply_filters( 'setup_status_nicename', $status );
+        return apply_filters('setup_status_nicename', $status);
     }
     
-    private function setup_post_name( $post = NULL ) {
+    private function setup_post_name($post = NULL) {
         global $wpdb;
         
         $post_name = '';
         
-        if ( !empty( $post ) ) {
-            if( !empty( $post->post_name ) ) {
+        if (!empty($post)) {
+            if (!empty($post->post_name)) {
                 $post_name = $post->post_name;
-            } else if ( !empty( $post->ID ) ) {
-                $post_name = wpinv_generate_post_name( $post->ID );
+            } else if (!empty($post->ID)) {
+                $post_name = wpinv_generate_post_name($post->ID);
 
-                $wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
+                $wpdb->update($wpdb->posts, array('post_name' => $post_name), array('ID' => $post->ID));
             }
         }
 
@@ -222,12 +222,12 @@ 
     }
     
     private function setup_due_date() {
-        $due_date = $this->get_meta( '_wpinv_due_date' );
+        $due_date = $this->get_meta('_wpinv_due_date');
         
-        if ( empty( $due_date ) ) {
-            $overdue_time = strtotime( $this->date ) + ( DAY_IN_SECONDS * absint( wpinv_get_option( 'overdue_days' ) ) );
-            $due_date = date_i18n( 'Y-m-d', $overdue_time );
-        } else if ( $due_date == 'none' ) {
+        if (empty($due_date)) {
+            $overdue_time = strtotime($this->date) + (DAY_IN_SECONDS * absint(wpinv_get_option('overdue_days')));
+            $due_date = date_i18n('Y-m-d', $overdue_time);
+        } else if ($due_date == 'none') {
             $due_date = '';
         }
         
@@ -235,63 +235,63 @@ 
     }
     
     private function setup_completed_date() {
-        $invoice = get_post( $this->ID );
+        $invoice = get_post($this->ID);
 
-        if ( 'wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status ) {
+        if ('wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status) {
             return false; // This invoice was never paid
         }
 
-        $date = ( $date = $this->get_meta( '_wpinv_completed_date', true ) ) ? $date : $invoice->modified_date;
+        $date = ($date = $this->get_meta('_wpinv_completed_date', true)) ? $date : $invoice->modified_date;
 
         return $date;
     }
     
     private function setup_cart_details() {
-        $cart_details = isset( $this->payment_meta['cart_details'] ) ? maybe_unserialize( $this->payment_meta['cart_details'] ) : array();
+        $cart_details = isset($this->payment_meta['cart_details']) ? maybe_unserialize($this->payment_meta['cart_details']) : array();
         return $cart_details;
     }
     
     public function array_convert() {
-        return get_object_vars( $this );
+        return get_object_vars($this);
     }
     
     private function setup_items() {
-        $items = isset( $this->payment_meta['items'] ) ? maybe_unserialize( $this->payment_meta['items'] ) : array();
+        $items = isset($this->payment_meta['items']) ? maybe_unserialize($this->payment_meta['items']) : array();
         return $items;
     }
     
     private function setup_fees() {
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
         return $payment_fees;
     }
         
     private function setup_currency() {
-        $currency = isset( $this->payment_meta['currency'] ) ? $this->payment_meta['currency'] : apply_filters( 'wpinv_currency_default', wpinv_get_currency(), $this );
+        $currency = isset($this->payment_meta['currency']) ? $this->payment_meta['currency'] : apply_filters('wpinv_currency_default', wpinv_get_currency(), $this);
         return $currency;
     }
     
     private function setup_discount() {
         //$discount = $this->get_meta( '_wpinv_discount', true );
-        $discount = (float)$this->subtotal - ( (float)$this->total - (float)$this->tax - (float)$this->fees_total );
-        if ( $discount < 0 ) {
+        $discount = (float)$this->subtotal - ((float)$this->total - (float)$this->tax - (float)$this->fees_total);
+        if ($discount < 0) {
             $discount = 0;
         }
-        $discount = wpinv_round_amount( $discount );
+        $discount = wpinv_round_amount($discount);
         
         return $discount;
     }
     
     private function setup_discount_code() {
-        $discount_code = !empty( $this->discounts ) ? $this->discounts : $this->get_meta( '_wpinv_discount_code', true );
+        $discount_code = !empty($this->discounts) ? $this->discounts : $this->get_meta('_wpinv_discount_code', true);
         return $discount_code;
     }
     
     private function setup_tax() {
-        $tax = $this->get_meta( '_wpinv_tax', true );
+        $tax = $this->get_meta('_wpinv_tax', true);
 
         // We don't have tax as it's own meta and no meta was passed
-        if ( '' === $tax ) {            
-            $tax = isset( $this->payment_meta['tax'] ) ? $this->payment_meta['tax'] : 0;
+        if ('' === $tax) {            
+            $tax = isset($this->payment_meta['tax']) ? $this->payment_meta['tax'] : 0;
         }
 
         return $tax;
@@ -301,9 +301,9 @@ 
         $subtotal     = 0;
         $cart_details = $this->cart_details;
 
-        if ( is_array( $cart_details ) ) {
-            foreach ( $cart_details as $item ) {
-                if ( isset( $item['subtotal'] ) ) {
+        if (is_array($cart_details)) {
+            foreach ($cart_details as $item) {
+                if (isset($item['subtotal'])) {
                     $subtotal += $item['subtotal'];
                 }
             }
@@ -317,23 +317,23 @@ 
     }
     
     private function setup_discounts() {
-        $discounts = ! empty( $this->payment_meta['user_info']['discount'] ) ? $this->payment_meta['user_info']['discount'] : array();
+        $discounts = !empty($this->payment_meta['user_info']['discount']) ? $this->payment_meta['user_info']['discount'] : array();
         return $discounts;
     }
     
     private function setup_total() {
-        $amount = $this->get_meta( '_wpinv_total', true );
+        $amount = $this->get_meta('_wpinv_total', true);
 
-        if ( empty( $amount ) && '0.00' != $amount ) {
-            $meta   = $this->get_meta( '_wpinv_payment_meta', true );
-            $meta   = maybe_unserialize( $meta );
+        if (empty($amount) && '0.00' != $amount) {
+            $meta   = $this->get_meta('_wpinv_payment_meta', true);
+            $meta   = maybe_unserialize($meta);
 
-            if ( isset( $meta['amount'] ) ) {
+            if (isset($meta['amount'])) {
                 $amount = $meta['amount'];
             }
         }
 
-        if($amount < 0){
+        if ($amount < 0) {
             $amount = 0;
         }
 
@@ -341,13 +341,13 @@ 
     }
     
     private function setup_mode() {
-        return $this->get_meta( '_wpinv_mode' );
+        return $this->get_meta('_wpinv_mode');
     }
 
     private function setup_gateway() {
-        $gateway = $this->get_meta( '_wpinv_gateway' );
+        $gateway = $this->get_meta('_wpinv_gateway');
         
-        if ( empty( $gateway ) && 'publish' === $this->status ) {
+        if (empty($gateway) && 'publish' === $this->status) {
             $gateway = 'manual';
         }
         
@@ -355,23 +355,23 @@ 
     }
     
     private function setup_gateway_title() {
-        $gateway_title = wpinv_get_gateway_checkout_label( $this->gateway );
+        $gateway_title = wpinv_get_gateway_checkout_label($this->gateway);
         return $gateway_title;
     }
 
     private function setup_transaction_id() {
-        $transaction_id = $this->get_meta( '_wpinv_transaction_id' );
+        $transaction_id = $this->get_meta('_wpinv_transaction_id');
 
-        if ( empty( $transaction_id ) || (int) $transaction_id === (int) $this->ID ) {
+        if (empty($transaction_id) || (int)$transaction_id === (int)$this->ID) {
             $gateway        = $this->gateway;
-            $transaction_id = apply_filters( 'wpinv_get_invoice_transaction_id-' . $gateway, $this->ID );
+            $transaction_id = apply_filters('wpinv_get_invoice_transaction_id-' . $gateway, $this->ID);
         }
 
         return $transaction_id;
     }
 
     private function setup_ip() {
-        $ip = $this->get_meta( '_wpinv_user_ip' );
+        $ip = $this->get_meta('_wpinv_user_ip');
         return $ip;
     }
 
@@ -381,62 +381,62 @@ 
     ///}
         
     private function setup_first_name() {
-        $first_name = $this->get_meta( '_wpinv_first_name' );
+        $first_name = $this->get_meta('_wpinv_first_name');
         return $first_name;
     }
     
     private function setup_last_name() {
-        $last_name = $this->get_meta( '_wpinv_last_name' );
+        $last_name = $this->get_meta('_wpinv_last_name');
         return $last_name;
     }
     
     private function setup_company() {
-        $company = $this->get_meta( '_wpinv_company' );
+        $company = $this->get_meta('_wpinv_company');
         return $company;
     }
     
     private function setup_vat_number() {
-        $vat_number = $this->get_meta( '_wpinv_vat_number' );
+        $vat_number = $this->get_meta('_wpinv_vat_number');
         return $vat_number;
     }
     
     private function setup_vat_rate() {
-        $vat_rate = $this->get_meta( '_wpinv_vat_rate' );
+        $vat_rate = $this->get_meta('_wpinv_vat_rate');
         return $vat_rate;
     }
     
     private function setup_adddress_confirmed() {
-        $adddress_confirmed = $this->get_meta( '_wpinv_adddress_confirmed' );
+        $adddress_confirmed = $this->get_meta('_wpinv_adddress_confirmed');
         return $adddress_confirmed;
     }
     
     private function setup_phone() {
-        $phone = $this->get_meta( '_wpinv_phone' );
+        $phone = $this->get_meta('_wpinv_phone');
         return $phone;
     }
     
     private function setup_address() {
-        $address = $this->get_meta( '_wpinv_address', true );
+        $address = $this->get_meta('_wpinv_address', true);
         return $address;
     }
     
     private function setup_city() {
-        $city = $this->get_meta( '_wpinv_city', true );
+        $city = $this->get_meta('_wpinv_city', true);
         return $city;
     }
     
     private function setup_country() {
-        $country = $this->get_meta( '_wpinv_country', true );
+        $country = $this->get_meta('_wpinv_country', true);
         return $country;
     }
     
     private function setup_state() {
-        $state = $this->get_meta( '_wpinv_state', true );
+        $state = $this->get_meta('_wpinv_state', true);
         return $state;
     }
     
     private function setup_zip() {
-        $zip = $this->get_meta( '_wpinv_zip', true );
+        $zip = $this->get_meta('_wpinv_zip', true);
         return $zip;
     }
 
@@ -445,7 +445,7 @@ 
             'user_id'        => $this->user_id,
             'first_name'     => $this->first_name,
             'last_name'      => $this->last_name,
-            'email'          => get_the_author_meta( 'email', $this->user_id ),
+            'email'          => get_the_author_meta('email', $this->user_id),
             'phone'          => $this->phone,
             'address'        => $this->address,
             'city'           => $this->city,
@@ -460,12 +460,12 @@ 
         );
         
         $user_info = array();
-        if ( isset( $this->payment_meta['user_info'] ) ) {
-            $user_info = maybe_unserialize( $this->payment_meta['user_info'] );
+        if (isset($this->payment_meta['user_info'])) {
+            $user_info = maybe_unserialize($this->payment_meta['user_info']);
             
-            if ( !empty( $user_info ) && isset( $user_info['user_id'] ) && $post = get_post( $this->ID ) ) {
+            if (!empty($user_info) && isset($user_info['user_id']) && $post = get_post($this->ID)) {
                 $this->user_id = $post->post_author;
-                $this->email = get_the_author_meta( 'email', $this->user_id );
+                $this->email = get_the_author_meta('email', $this->user_id);
                 
                 $user_info['user_id'] = $this->user_id;
                 $user_info['email'] = $this->email;
@@ -474,13 +474,13 @@ 
             }
         }
         
-        $user_info    = wp_parse_args( $user_info, $defaults );
+        $user_info = wp_parse_args($user_info, $defaults);
         
         // Get the user, but only if it's been created
-        $user = get_userdata( $this->user_id );
+        $user = get_userdata($this->user_id);
         
-        if ( !empty( $user ) && $user->ID > 0 ) {
-            if ( empty( $user_info ) ) {
+        if (!empty($user) && $user->ID > 0) {
+            if (empty($user_info)) {
                 $user_info = array(
                     'user_id'    => $user->ID,
                     'first_name' => $user->first_name,
@@ -489,23 +489,23 @@ 
                     'discount'   => '',
                 );
             } else {
-                foreach ( $user_info as $key => $value ) {
-                    if ( ! empty( $value ) ) {
+                foreach ($user_info as $key => $value) {
+                    if (!empty($value)) {
                         continue;
                     }
 
-                    switch( $key ) {
+                    switch ($key) {
                         case 'user_id':
-                            $user_info[ $key ] = $user->ID;
+                            $user_info[$key] = $user->ID;
                             break;
                         case 'first_name':
-                            $user_info[ $key ] = $user->first_name;
+                            $user_info[$key] = $user->first_name;
                             break;
                         case 'last_name':
-                            $user_info[ $key ] = $user->last_name;
+                            $user_info[$key] = $user->last_name;
                             break;
                         case 'email':
-                            $user_info[ $key ] = $user->user_email;
+                            $user_info[$key] = $user->user_email;
                             break;
                     }
                 }
@@ -516,25 +516,25 @@ 
     }
 
     private function setup_invoice_key() {
-        $key = $this->get_meta( '_wpinv_key', true );
+        $key = $this->get_meta('_wpinv_key', true);
         
         return $key;
     }
 
     private function setup_invoice_number() {
-        $number = $this->get_meta( '_wpinv_number', true );
+        $number = $this->get_meta('_wpinv_number', true);
 
-        if ( !$number ) {
+        if (!$number) {
             $number = $this->ID;
 
-            if ( $this->status == 'auto-draft' ) {
-                if ( wpinv_sequential_number_active( $this->post_type ) ) {
-                    $next_number = wpinv_get_next_invoice_number( $this->post_type );
+            if ($this->status == 'auto-draft') {
+                if (wpinv_sequential_number_active($this->post_type)) {
+                    $next_number = wpinv_get_next_invoice_number($this->post_type);
                     $number      = $next_number;
                 }
             }
             
-            $number = wpinv_format_invoice_number( $number, $this->post_type );
+            $number = wpinv_format_invoice_number($number, $this->post_type);
         }
 
         return $number;
@@ -544,16 +544,16 @@ 
         global $wpdb;
 
         $invoice_number = $this->ID;
-        if ( $number = $this->get_meta( '_wpinv_number', true ) ) {
+        if ($number = $this->get_meta('_wpinv_number', true)) {
             $invoice_number = $number;
         }
 
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
 
-        if ( empty( $this->ip ) ) {
+        if (empty($this->ip)) {
             $this->ip = wpinv_get_ip();
             $this->pending['ip'] = $this->ip;
         }
@@ -590,61 +590,61 @@ 
                         'post_status'   => $this->status,
                         'post_author'   => $this->user_id,
                         'post_type'     => $this->post_type,
-                        'post_date'     => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time( 'mysql' ),
-                        'post_date_gmt' => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date( $this->date ) : current_time( 'mysql', 1 ),
+                        'post_date'     => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time('mysql'),
+                        'post_date_gmt' => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date($this->date) : current_time('mysql', 1),
                         'post_parent'   => $this->parent_invoice,
                     );
-        $args = apply_filters( 'wpinv_insert_invoice_args', $post_data, $this );
+        $args = apply_filters('wpinv_insert_invoice_args', $post_data, $this);
 
         // Create a blank invoice
-        if ( !empty( $this->ID ) ) {
-            $args['ID']         = $this->ID;
+        if (!empty($this->ID)) {
+            $args['ID'] = $this->ID;
 
-            $invoice_id = wp_update_post( $args, true );
+            $invoice_id = wp_update_post($args, true);
         } else {
-            $invoice_id = wp_insert_post( $args, true );
+            $invoice_id = wp_insert_post($args, true);
         }
 
-        if ( is_wp_error( $invoice_id ) ) {
+        if (is_wp_error($invoice_id)) {
             return false;
         }
 
-        if ( !empty( $invoice_id ) ) {
+        if (!empty($invoice_id)) {
             $this->ID  = $invoice_id;
             $this->_ID = $invoice_id;
 
-            $this->payment_meta = apply_filters( 'wpinv_payment_meta', $this->payment_meta, $payment_data );
-            if ( ! empty( $this->payment_meta['fees'] ) ) {
-                $this->fees = array_merge( $this->fees, $this->payment_meta['fees'] );
-                foreach( $this->fees as $fee ) {
-                    $this->increase_fees( $fee['amount'] );
+            $this->payment_meta = apply_filters('wpinv_payment_meta', $this->payment_meta, $payment_data);
+            if (!empty($this->payment_meta['fees'])) {
+                $this->fees = array_merge($this->fees, $this->payment_meta['fees']);
+                foreach ($this->fees as $fee) {
+                    $this->increase_fees($fee['amount']);
                 }
             }
 
-            $this->update_meta( '_wpinv_payment_meta', $this->payment_meta );            
+            $this->update_meta('_wpinv_payment_meta', $this->payment_meta);            
             $this->new = true;
         }
 
         return $this->ID;
     }
 
-    public function save( $setup = false ) {
+    public function save($setup = false) {
         global $wpi_session;
         
         $saved = false;
-        if ( empty( $this->items ) ) {
+        if (empty($this->items)) {
             return $saved; // Don't save empty invoice.
         }
         
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
         
-        if ( empty( $this->ID ) ) {
+        if (empty($this->ID)) {
             $invoice_id = $this->insert_invoice();
 
-            if ( false === $invoice_id ) {
+            if (false === $invoice_id) {
                 $saved = false;
             } else {
                 $this->ID = $invoice_id;
@@ -652,27 +652,27 @@ 
         }
 
         // If we have something pending, let's save it
-        if ( !empty( $this->pending ) ) {
+        if (!empty($this->pending)) {
             $total_increase = 0;
             $total_decrease = 0;
 
-            foreach ( $this->pending as $key => $value ) {
-                switch( $key ) {
+            foreach ($this->pending as $key => $value) {
+                switch ($key) {
                     case 'items':
                         // Update totals for pending items
-                        foreach ( $this->pending[ $key ] as $item ) {
-                            switch( $item['action'] ) {
+                        foreach ($this->pending[$key] as $item) {
+                            switch ($item['action']) {
                                 case 'add':
                                     $price = $item['price'];
                                     $taxes = $item['tax'];
 
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_increase += $price;
                                     }
                                     break;
 
                                 case 'remove':
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_decrease += $item['price'];
                                     }
                                     break;
@@ -680,16 +680,16 @@ 
                         }
                         break;
                     case 'fees':
-                        if ( 'publish' !== $this->status ) {
+                        if ('publish' !== $this->status) {
                             break;
                         }
 
-                        if ( empty( $this->pending[ $key ] ) ) {
+                        if (empty($this->pending[$key])) {
                             break;
                         }
 
-                        foreach ( $this->pending[ $key ] as $fee ) {
-                            switch( $fee['action'] ) {
+                        foreach ($this->pending[$key] as $fee) {
+                            switch ($fee['action']) {
                                 case 'add':
                                     $total_increase += $fee['amount'];
                                     break;
@@ -701,83 +701,83 @@ 
                         }
                         break;
                     case 'status':
-                        $this->update_status( $this->status );
+                        $this->update_status($this->status);
                         break;
                     case 'gateway':
-                        $this->update_meta( '_wpinv_gateway', $this->gateway );
+                        $this->update_meta('_wpinv_gateway', $this->gateway);
                         break;
                     case 'mode':
-                        $this->update_meta( '_wpinv_mode', $this->mode );
+                        $this->update_meta('_wpinv_mode', $this->mode);
                         break;
                     case 'transaction_id':
-                        $this->update_meta( '_wpinv_transaction_id', $this->transaction_id );
+                        $this->update_meta('_wpinv_transaction_id', $this->transaction_id);
                         break;
                     case 'ip':
-                        $this->update_meta( '_wpinv_user_ip', $this->ip );
+                        $this->update_meta('_wpinv_user_ip', $this->ip);
                         break;
                     ///case 'user_id':
                         ///$this->update_meta( '_wpinv_user_id', $this->user_id );
                         ///$this->user_info['user_id'] = $this->user_id;
                         ///break;
                     case 'first_name':
-                        $this->update_meta( '_wpinv_first_name', $this->first_name );
+                        $this->update_meta('_wpinv_first_name', $this->first_name);
                         $this->user_info['first_name'] = $this->first_name;
                         break;
                     case 'last_name':
-                        $this->update_meta( '_wpinv_last_name', $this->last_name );
+                        $this->update_meta('_wpinv_last_name', $this->last_name);
                         $this->user_info['last_name'] = $this->last_name;
                         break;
                     case 'phone':
-                        $this->update_meta( '_wpinv_phone', $this->phone );
+                        $this->update_meta('_wpinv_phone', $this->phone);
                         $this->user_info['phone'] = $this->phone;
                         break;
                     case 'address':
-                        $this->update_meta( '_wpinv_address', $this->address );
+                        $this->update_meta('_wpinv_address', $this->address);
                         $this->user_info['address'] = $this->address;
                         break;
                     case 'city':
-                        $this->update_meta( '_wpinv_city', $this->city );
+                        $this->update_meta('_wpinv_city', $this->city);
                         $this->user_info['city'] = $this->city;
                         break;
                     case 'country':
-                        $this->update_meta( '_wpinv_country', $this->country );
+                        $this->update_meta('_wpinv_country', $this->country);
                         $this->user_info['country'] = $this->country;
                         break;
                     case 'state':
-                        $this->update_meta( '_wpinv_state', $this->state );
+                        $this->update_meta('_wpinv_state', $this->state);
                         $this->user_info['state'] = $this->state;
                         break;
                     case 'zip':
-                        $this->update_meta( '_wpinv_zip', $this->zip );
+                        $this->update_meta('_wpinv_zip', $this->zip);
                         $this->user_info['zip'] = $this->zip;
                         break;
                     case 'company':
-                        $this->update_meta( '_wpinv_company', $this->company );
+                        $this->update_meta('_wpinv_company', $this->company);
                         $this->user_info['company'] = $this->company;
                         break;
                     case 'vat_number':
-                        $this->update_meta( '_wpinv_vat_number', $this->vat_number );
+                        $this->update_meta('_wpinv_vat_number', $this->vat_number);
                         $this->user_info['vat_number'] = $this->vat_number;
                         
-                        $vat_info = $wpi_session->get( 'user_vat_data' );
-                        if ( $this->vat_number && !empty( $vat_info ) && isset( $vat_info['number'] ) && isset( $vat_info['valid'] ) && $vat_info['number'] == $this->vat_number ) {
-                            $adddress_confirmed = isset( $vat_info['adddress_confirmed'] ) ? $vat_info['adddress_confirmed'] : false;
-                            $this->update_meta( '_wpinv_adddress_confirmed', (bool)$adddress_confirmed );
+                        $vat_info = $wpi_session->get('user_vat_data');
+                        if ($this->vat_number && !empty($vat_info) && isset($vat_info['number']) && isset($vat_info['valid']) && $vat_info['number'] == $this->vat_number) {
+                            $adddress_confirmed = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+                            $this->update_meta('_wpinv_adddress_confirmed', (bool)$adddress_confirmed);
                             $this->user_info['adddress_confirmed'] = (bool)$adddress_confirmed;
                         }
     
                         break;
                     case 'vat_rate':
-                        $this->update_meta( '_wpinv_vat_rate', $this->vat_rate );
+                        $this->update_meta('_wpinv_vat_rate', $this->vat_rate);
                         $this->user_info['vat_rate'] = $this->vat_rate;
                         break;
                     case 'adddress_confirmed':
-                        $this->update_meta( '_wpinv_adddress_confirmed', $this->adddress_confirmed );
+                        $this->update_meta('_wpinv_adddress_confirmed', $this->adddress_confirmed);
                         $this->user_info['adddress_confirmed'] = $this->adddress_confirmed;
                         break;
                     
                     case 'key':
-                        $this->update_meta( '_wpinv_key', $this->key );
+                        $this->update_meta('_wpinv_key', $this->key);
                         break;
                     case 'date':
                         $args = array(
@@ -786,49 +786,49 @@ 
                             'edit_date' => true,
                         );
 
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     case 'due_date':
-                        if ( empty( $this->due_date ) ) {
+                        if (empty($this->due_date)) {
                             $this->due_date = 'none';
                         }
                         
-                        $this->update_meta( '_wpinv_due_date', $this->due_date );
+                        $this->update_meta('_wpinv_due_date', $this->due_date);
                         break;
                     case 'completed_date':
-                        $this->update_meta( '_wpinv_completed_date', $this->completed_date );
+                        $this->update_meta('_wpinv_completed_date', $this->completed_date);
                         break;
                     case 'discounts':
-                        if ( ! is_array( $this->discounts ) ) {
-                            $this->discounts = explode( ',', $this->discounts );
+                        if (!is_array($this->discounts)) {
+                            $this->discounts = explode(',', $this->discounts);
                         }
 
-                        $this->user_info['discount'] = implode( ',', $this->discounts );
+                        $this->user_info['discount'] = implode(',', $this->discounts);
                         break;
                     case 'discount':
-                        $this->update_meta( '_wpinv_discount', wpinv_round_amount( $this->discount ) );
+                        $this->update_meta('_wpinv_discount', wpinv_round_amount($this->discount));
                         break;
                     case 'discount_code':
-                        $this->update_meta( '_wpinv_discount_code', $this->discount_code );
+                        $this->update_meta('_wpinv_discount_code', $this->discount_code);
                         break;
                     case 'parent_invoice':
                         $args = array(
                             'ID'          => $this->ID,
                             'post_parent' => $this->parent_invoice,
                         );
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     default:
-                        do_action( 'wpinv_save', $this, $key );
+                        do_action('wpinv_save', $this, $key);
                         break;
                 }
             }
 
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
             
-            $this->items    = array_values( $this->items );
+            $this->items = array_values($this->items);
             
             $new_meta = array(
                 'items'         => $this->items,
@@ -839,12 +839,12 @@ 
             );
             
             $meta        = $this->get_meta();
-            $merged_meta = array_merge( $meta, $new_meta );
+            $merged_meta = array_merge($meta, $new_meta);
 
             // Only save the payment meta if it's changed
-            if ( md5( serialize( $meta ) ) !== md5( serialize( $merged_meta) ) ) {
-                $updated     = $this->update_meta( '_wpinv_payment_meta', $merged_meta );
-                if ( false !== $updated ) {
+            if (md5(serialize($meta)) !== md5(serialize($merged_meta))) {
+                $updated = $this->update_meta('_wpinv_payment_meta', $merged_meta);
+                if (false !== $updated) {
                     $saved = true;
                 }
             }
@@ -852,15 +852,15 @@ 
             $this->pending = array();
             $saved         = true;
         } else {
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
         }
         
-        do_action( 'wpinv_invoice_save', $this, $saved );
+        do_action('wpinv_invoice_save', $this, $saved);
 
-        if ( true === $saved || $setup ) {
-            $this->setup_invoice( $this->ID );
+        if (true === $saved || $setup) {
+            $this->setup_invoice($this->ID);
         }
         
         $this->refresh_item_ids();
@@ -868,7 +868,7 @@ 
         return $saved;
     }
     
-    public function add_fee( $args, $global = true ) {
+    public function add_fee($args, $global = true) {
         $default_args = array(
             'label'       => '',
             'amount'      => 0,
@@ -878,75 +878,75 @@ 
             'item_id'     => 0,
         );
 
-        $fee = wp_parse_args( $args, $default_args );
+        $fee = wp_parse_args($args, $default_args);
         
-        if ( !empty( $fee['label'] ) ) {
+        if (!empty($fee['label'])) {
             return false;
         }
         
-        $fee['id']  = sanitize_title( $fee['label'] );
+        $fee['id'] = sanitize_title($fee['label']);
         
-        $this->fees[]               = $fee;
+        $this->fees[] = $fee;
         
         $added_fee               = $fee;
         $added_fee['action']     = 'add';
         $this->pending['fees'][] = $added_fee;
-        reset( $this->fees );
+        reset($this->fees);
 
-        $this->increase_fees( $fee['amount'] );
+        $this->increase_fees($fee['amount']);
         return true;
     }
 
-    public function remove_fee( $key ) {
+    public function remove_fee($key) {
         $removed = false;
 
-        if ( is_numeric( $key ) ) {
-            $removed = $this->remove_fee_by( 'index', $key );
+        if (is_numeric($key)) {
+            $removed = $this->remove_fee_by('index', $key);
         }
 
         return $removed;
     }
 
-    public function remove_fee_by( $key, $value, $global = false ) {
-        $allowed_fee_keys = apply_filters( 'wpinv_fee_keys', array(
+    public function remove_fee_by($key, $value, $global = false) {
+        $allowed_fee_keys = apply_filters('wpinv_fee_keys', array(
             'index', 'label', 'amount', 'type',
-        ) );
+        ));
 
-        if ( ! in_array( $key, $allowed_fee_keys ) ) {
+        if (!in_array($key, $allowed_fee_keys)) {
             return false;
         }
 
         $removed = false;
-        if ( 'index' === $key && array_key_exists( $value, $this->fees ) ) {
-            $removed_fee             = $this->fees[ $value ];
+        if ('index' === $key && array_key_exists($value, $this->fees)) {
+            $removed_fee             = $this->fees[$value];
             $removed_fee['action']   = 'remove';
             $this->pending['fees'][] = $removed_fee;
 
-            $this->decrease_fees( $removed_fee['amount'] );
+            $this->decrease_fees($removed_fee['amount']);
 
-            unset( $this->fees[ $value ] );
+            unset($this->fees[$value]);
             $removed = true;
-        } else if ( 'index' !== $key ) {
-            foreach ( $this->fees as $index => $fee ) {
-                if ( isset( $fee[ $key ] ) && $fee[ $key ] == $value ) {
+        } else if ('index' !== $key) {
+            foreach ($this->fees as $index => $fee) {
+                if (isset($fee[$key]) && $fee[$key] == $value) {
                     $removed_fee             = $fee;
                     $removed_fee['action']   = 'remove';
                     $this->pending['fees'][] = $removed_fee;
 
-                    $this->decrease_fees( $removed_fee['amount'] );
+                    $this->decrease_fees($removed_fee['amount']);
 
-                    unset( $this->fees[ $index ] );
+                    unset($this->fees[$index]);
                     $removed = true;
 
-                    if ( false === $global ) {
+                    if (false === $global) {
                         break;
                     }
                 }
             }
         }
 
-        if ( true === $removed ) {
-            $this->fees = array_values( $this->fees );
+        if (true === $removed) {
+            $this->fees = array_values($this->fees);
         }
 
         return $removed;
@@ -954,35 +954,35 @@ 
 
     
 
-    public function add_note( $note = '', $customer_type = false, $added_by_user = false, $system = false ) {
+    public function add_note($note = '', $customer_type = false, $added_by_user = false, $system = false) {
         // Bail if no note specified
-        if( !$note ) {
+        if (!$note) {
             return false;
         }
 
-        if ( empty( $this->ID ) )
+        if (empty($this->ID))
             return false;
         
-        if ( ( ( is_user_logged_in() && current_user_can( 'manage_options' ) ) || $added_by_user ) && !$system ) {
-            $user                 = get_user_by( 'id', get_current_user_id() );
+        if (((is_user_logged_in() && current_user_can('manage_options')) || $added_by_user) && !$system) {
+            $user                 = get_user_by('id', get_current_user_id());
             $comment_author       = $user->display_name;
             $comment_author_email = $user->user_email;
         } else {
-            $comment_author       = __( 'System', 'invoicing' );
-            $comment_author_email = strtolower( __( 'System', 'invoicing' ) ) . '@';
-            $comment_author_email .= isset( $_SERVER['HTTP_HOST'] ) ? str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) : 'noreply.com';
-            $comment_author_email = sanitize_email( $comment_author_email );
+            $comment_author       = __('System', 'invoicing');
+            $comment_author_email = strtolower(__('System', 'invoicing')) . '@';
+            $comment_author_email .= isset($_SERVER['HTTP_HOST']) ? str_replace('www.', '', $_SERVER['HTTP_HOST']) : 'noreply.com';
+            $comment_author_email = sanitize_email($comment_author_email);
         }
 
-        do_action( 'wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type );
+        do_action('wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type);
 
-        $note_id = wp_insert_comment( wp_filter_comment( array(
+        $note_id = wp_insert_comment(wp_filter_comment(array(
             'comment_post_ID'      => $this->ID,
             'comment_content'      => $note,
             'comment_agent'        => 'GeoDirectory',
             'user_id'              => is_admin() ? get_current_user_id() : 0,
-            'comment_date'         => current_time( 'mysql' ),
-            'comment_date_gmt'     => current_time( 'mysql', 1 ),
+            'comment_date'         => current_time('mysql'),
+            'comment_date_gmt'     => current_time('mysql', 1),
             'comment_approved'     => 1,
             'comment_parent'       => 0,
             'comment_author'       => $comment_author,
@@ -990,53 +990,53 @@ 
             'comment_author_url'   => '',
             'comment_author_email' => $comment_author_email,
             'comment_type'         => 'wpinv_note'
-        ) ) );
+        )));
 
-        do_action( 'wpinv_insert_payment_note', $note_id, $this->ID, $note );
+        do_action('wpinv_insert_payment_note', $note_id, $this->ID, $note);
         
-        if ( $customer_type ) {
-            add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+        if ($customer_type) {
+            add_comment_meta($note_id, '_wpi_customer_note', 1);
 
-            do_action( 'wpinv_new_customer_note', array( 'invoice_id' => $this->ID, 'user_note' => $note ) );
+            do_action('wpinv_new_customer_note', array('invoice_id' => $this->ID, 'user_note' => $note));
         }
 
         return $note_id;
     }
 
-    private function increase_subtotal( $amount = 0.00 ) {
-        $amount          = (float) $amount;
+    private function increase_subtotal($amount = 0.00) {
+        $amount          = (float)$amount;
         $this->subtotal += $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
         $this->recalculate_total();
     }
 
-    private function decrease_subtotal( $amount = 0.00 ) {
-        $amount          = (float) $amount;
+    private function decrease_subtotal($amount = 0.00) {
+        $amount          = (float)$amount;
         $this->subtotal -= $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
-        if ( $this->subtotal < 0 ) {
+        if ($this->subtotal < 0) {
             $this->subtotal = 0;
         }
 
         $this->recalculate_total();
     }
 
-    private function increase_fees( $amount = 0.00 ) {
+    private function increase_fees($amount = 0.00) {
         $amount            = (float)$amount;
         $this->fees_total += $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
         $this->recalculate_total();
     }
 
-    private function decrease_fees( $amount = 0.00 ) {
-        $amount            = (float) $amount;
+    private function decrease_fees($amount = 0.00) {
+        $amount            = (float)$amount;
         $this->fees_total -= $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
-        if ( $this->fees_total < 0 ) {
+        if ($this->fees_total < 0) {
             $this->fees_total = 0;
         }
 
@@ -1047,54 +1047,54 @@ 
         global $wpi_nosave;
         
         $this->total = $this->subtotal + $this->tax + $this->fees_total;
-        $this->total = wpinv_round_amount( $this->total );
+        $this->total = wpinv_round_amount($this->total);
         
-        do_action( 'wpinv_invoice_recalculate_total', $this, $wpi_nosave );
+        do_action('wpinv_invoice_recalculate_total', $this, $wpi_nosave);
     }
     
-    public function increase_tax( $amount = 0.00 ) {
-        $amount       = (float) $amount;
+    public function increase_tax($amount = 0.00) {
+        $amount       = (float)$amount;
         $this->tax   += $amount;
 
         $this->recalculate_total();
     }
 
-    public function decrease_tax( $amount = 0.00 ) {
-        $amount     = (float) $amount;
+    public function decrease_tax($amount = 0.00) {
+        $amount     = (float)$amount;
         $this->tax -= $amount;
 
-        if ( $this->tax < 0 ) {
+        if ($this->tax < 0) {
             $this->tax = 0;
         }
 
         $this->recalculate_total();
     }
 
-    public function update_status( $new_status = false, $note = '', $manual = false ) {
-        $old_status = ! empty( $this->old_status ) ? $this->old_status : get_post_status( $this->ID );
+    public function update_status($new_status = false, $note = '', $manual = false) {
+        $old_status = !empty($this->old_status) ? $this->old_status : get_post_status($this->ID);
         
-        if ( $old_status === $new_status && in_array( $new_status, array_keys( wpinv_get_invoice_statuses() ) ) ) {
+        if ($old_status === $new_status && in_array($new_status, array_keys(wpinv_get_invoice_statuses()))) {
             return false; // Don't permit status changes that aren't changes
         }
 
-        $do_change = apply_filters( 'wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status );
+        $do_change = apply_filters('wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status);
         $updated = false;
 
-        if ( $do_change ) {
-            do_action( 'wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status );
+        if ($do_change) {
+            do_action('wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status);
 
             $update_post_data                   = array();
             $update_post_data['ID']             = $this->ID;
             $update_post_data['post_status']    = $new_status;
-            $update_post_data['edit_date']      = current_time( 'mysql', 0 );
-            $update_post_data['edit_date_gmt']  = current_time( 'mysql', 1 );
+            $update_post_data['edit_date']      = current_time('mysql', 0);
+            $update_post_data['edit_date_gmt']  = current_time('mysql', 1);
             
-            $update_post_data = apply_filters( 'wpinv_update_invoice_status_fields', $update_post_data, $this->ID );
+            $update_post_data = apply_filters('wpinv_update_invoice_status_fields', $update_post_data, $this->ID);
 
-            $updated = wp_update_post( $update_post_data );     
+            $updated = wp_update_post($update_post_data);     
            
             // Process any specific status functions
-            switch( $new_status ) {
+            switch ($new_status) {
                 case 'wpi-refunded':
                     $this->process_refund();
                     break;
@@ -1107,9 +1107,9 @@ 
             }
             
             // Status was changed.
-            do_action( 'wpinv_status_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_update_status', $this->ID, $new_status, $old_status );
+            do_action('wpinv_status_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_update_status', $this->ID, $new_status, $old_status);
         }
 
         return $updated;
@@ -1123,72 +1123,72 @@ 
         $this->save();
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
 
-        if ( $meta_key == 'key' || $meta_key == 'date' ) {
+        if ($meta_key == 'key' || $meta_key == 'date') {
             $current_meta = $this->get_meta();
-            $current_meta[ $meta_key ] = $meta_value;
+            $current_meta[$meta_key] = $meta_value;
 
             $meta_key     = '_wpinv_payment_meta';
             $meta_value   = $current_meta;
         }
 
-        $meta_value = apply_filters( 'wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID);
         
-        if ( $meta_key == '_wpinv_completed_date' && !empty( $meta_value ) ) {
+        if ($meta_key == '_wpinv_completed_date' && !empty($meta_value)) {
             $args = array(
                 'ID'                => $this->ID,
                 'post_date'         => $meta_value,
                 'edit_date'         => true,
-                'post_date_gmt'     => get_gmt_from_date( $meta_value ),
+                'post_date_gmt'     => get_gmt_from_date($meta_value),
                 'post_modified'     => $meta_value,
-                'post_modified_gmt' => get_gmt_from_date( $meta_value )
+                'post_modified_gmt' => get_gmt_from_date($meta_value)
             );
-            wp_update_post( $args );
+            wp_update_post($args);
         }
         
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
 
     private function process_refund() {
         $process_refund = true;
 
         // If the payment was not in publish, don't decrement stats as they were never incremented
-        if ( 'publish' != $this->old_status || 'wpi-refunded' != $this->status ) {
+        if ('publish' != $this->old_status || 'wpi-refunded' != $this->status) {
             $process_refund = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_refund = apply_filters( 'wpinv_should_process_refund', $process_refund, $this );
+        $process_refund = apply_filters('wpinv_should_process_refund', $process_refund, $this);
 
-        if ( false === $process_refund ) {
+        if (false === $process_refund) {
             return;
         }
 
-        do_action( 'wpinv_pre_refund_invoice', $this );
+        do_action('wpinv_pre_refund_invoice', $this);
         
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_refund', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_refund', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_refund', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_refund', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_refund', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_refund', true, $this);
         
-        do_action( 'wpinv_post_refund_invoice', $this );
+        do_action('wpinv_post_refund_invoice', $this);
     }
 
     private function process_failure() {
         $discounts = $this->discounts;
-        if ( empty( $discounts ) ) {
+        if (empty($discounts)) {
             return;
         }
 
-        if ( ! is_array( $discounts ) ) {
-            $discounts = array_map( 'trim', explode( ',', $discounts ) );
+        if (!is_array($discounts)) {
+            $discounts = array_map('trim', explode(',', $discounts));
         }
 
-        foreach ( $discounts as $discount ) {
-            wpinv_decrease_discount_usage( $discount );
+        foreach ($discounts as $discount) {
+            wpinv_decrease_discount_usage($discount);
         }
     }
     
@@ -1196,92 +1196,92 @@ 
         $process_pending = true;
 
         // If the payment was not in publish or revoked status, don't decrement stats as they were never incremented
-        if ( ( 'publish' != $this->old_status && 'revoked' != $this->old_status ) || 'wpi-pending' != $this->status ) {
+        if (('publish' != $this->old_status && 'revoked' != $this->old_status) || 'wpi-pending' != $this->status) {
             $process_pending = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_pending = apply_filters( 'wpinv_should_process_pending', $process_pending, $this );
+        $process_pending = apply_filters('wpinv_should_process_pending', $process_pending, $this);
 
-        if ( false === $process_pending ) {
+        if (false === $process_pending) {
             return;
         }
 
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_pending', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_pending', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_pending', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_pending', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_pending', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_pending', true, $this);
 
         $this->completed_date = '';
-        $this->update_meta( '_wpinv_completed_date', '' );
+        $this->update_meta('_wpinv_completed_date', '');
     }
     
     // get data
-    public function get_meta( $meta_key = '_wpinv_payment_meta', $single = true ) {
-        $meta = get_post_meta( $this->ID, $meta_key, $single );
+    public function get_meta($meta_key = '_wpinv_payment_meta', $single = true) {
+        $meta = get_post_meta($this->ID, $meta_key, $single);
 
-        if ( $meta_key === '_wpinv_payment_meta' ) {
+        if ($meta_key === '_wpinv_payment_meta') {
 
-            if(!is_array($meta)){$meta = array();} // we need this to be an array so make sure it is.
+            if (!is_array($meta)) {$meta = array(); } // we need this to be an array so make sure it is.
 
-            if ( empty( $meta['key'] ) ) {
+            if (empty($meta['key'])) {
                 $meta['key'] = $this->setup_invoice_key();
             }
 
-            if ( empty( $meta['date'] ) ) {
-                $meta['date'] = get_post_field( 'post_date', $this->ID );
+            if (empty($meta['date'])) {
+                $meta['date'] = get_post_field('post_date', $this->ID);
             }
         }
 
-        $meta = apply_filters( 'wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID );
+        $meta = apply_filters('wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID);
 
-        return apply_filters( 'wpinv_get_invoice_meta', $meta, $this->ID, $meta_key );
+        return apply_filters('wpinv_get_invoice_meta', $meta, $this->ID, $meta_key);
     }
     
     public function get_description() {
-        $post = get_post( $this->ID );
+        $post = get_post($this->ID);
         
-        $description = !empty( $post ) ? $post->post_content : '';
-        return apply_filters( 'wpinv_get_description', $description, $this->ID, $this );
+        $description = !empty($post) ? $post->post_content : '';
+        return apply_filters('wpinv_get_description', $description, $this->ID, $this);
     }
     
-    public function get_status( $nicename = false ) {
-        if ( !$nicename ) {
+    public function get_status($nicename = false) {
+        if (!$nicename) {
             $status = $this->status;
         } else {
             $status = $this->status_nicename;
         }
         
-        return apply_filters( 'wpinv_get_status', $status, $nicename, $this->ID, $this );
+        return apply_filters('wpinv_get_status', $status, $nicename, $this->ID, $this);
     }
     
     public function get_cart_details() {
-        return apply_filters( 'wpinv_cart_details', $this->cart_details, $this->ID, $this );
+        return apply_filters('wpinv_cart_details', $this->cart_details, $this->ID, $this);
     }
     
-    public function get_subtotal( $currency = false ) {
-        $subtotal = wpinv_round_amount( $this->subtotal );
+    public function get_subtotal($currency = false) {
+        $subtotal = wpinv_round_amount($this->subtotal);
         
-        if ( $currency ) {
-            $subtotal = wpinv_price( wpinv_format_amount( $subtotal, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $subtotal = wpinv_price(wpinv_format_amount($subtotal, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency);
     }
     
-    public function get_total( $currency = false ) {        
-        if ( $this->is_free_trial() ) {
-            $total = wpinv_round_amount( 0 );
+    public function get_total($currency = false) {        
+        if ($this->is_free_trial()) {
+            $total = wpinv_round_amount(0);
         } else {
-            $total = wpinv_round_amount( $this->total );
+            $total = wpinv_round_amount($this->total);
         }
-        if ( $currency ) {
-            $total = wpinv_price( wpinv_format_amount( $total, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $total = wpinv_price(wpinv_format_amount($total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_total', $total, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_total', $total, $this->ID, $this, $currency);
     }
     
-    public function get_recurring_details( $field = '', $currency = false ) {        
+    public function get_recurring_details($field = '', $currency = false) {        
         $data                 = array();
         $data['cart_details'] = $this->cart_details;
         $data['subtotal']     = $this->get_subtotal();
@@ -1289,45 +1289,45 @@ 
         $data['tax']          = $this->get_tax();
         $data['total']        = $this->get_total();
     
-        if ( !empty( $this->cart_details ) && ( $this->is_parent() || $this->is_renewal() ) ) {
+        if (!empty($this->cart_details) && ($this->is_parent() || $this->is_renewal())) {
             $is_free_trial = $this->is_free_trial();
-            $discounts = $this->get_discounts( true );
+            $discounts = $this->get_discounts(true);
             
-            if ( $is_free_trial || !empty( $discounts ) ) {
+            if ($is_free_trial || !empty($discounts)) {
                 $first_use_only = false;
                 
-                if ( !empty( $discounts ) ) {
-                    foreach ( $discounts as $key => $code ) {
-                        if ( wpinv_discount_is_recurring( $code, true ) ) {
+                if (!empty($discounts)) {
+                    foreach ($discounts as $key => $code) {
+                        if (wpinv_discount_is_recurring($code, true)) {
                             $first_use_only = true;
                             break;
                         }
                     }
                 }
                     
-                if ( !$first_use_only ) {
-                    $data['subtotal'] = wpinv_round_amount( $this->subtotal );
-                    $data['discount'] = wpinv_round_amount( $this->discount );
-                    $data['tax']      = wpinv_round_amount( $this->tax );
-                    $data['total']    = wpinv_round_amount( $this->total );
+                if (!$first_use_only) {
+                    $data['subtotal'] = wpinv_round_amount($this->subtotal);
+                    $data['discount'] = wpinv_round_amount($this->discount);
+                    $data['tax']      = wpinv_round_amount($this->tax);
+                    $data['total']    = wpinv_round_amount($this->total);
                 } else {
                     $cart_subtotal   = 0;
                     $cart_discount   = 0;
                     $cart_tax        = 0;
 
-                    foreach ( $this->cart_details as $key => $item ) {
-                        $item_quantity  = $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                        $item_subtotal  = !empty( $item['subtotal'] ) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
+                    foreach ($this->cart_details as $key => $item) {
+                        $item_quantity  = $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                        $item_subtotal  = !empty($item['subtotal']) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
                         $item_discount  = 0;
-                        $item_tax       = $item_subtotal > 0 && !empty( $item['vat_rate'] ) ? ( $item_subtotal * 0.01 * (float)$item['vat_rate'] ) : 0;
+                        $item_tax       = $item_subtotal > 0 && !empty($item['vat_rate']) ? ($item_subtotal * 0.01 * (float)$item['vat_rate']) : 0;
                         
-                        if ( wpinv_prices_include_tax() ) {
-                            $item_subtotal -= wpinv_round_amount( $item_tax );
+                        if (wpinv_prices_include_tax()) {
+                            $item_subtotal -= wpinv_round_amount($item_tax);
                         }
                         
                         $item_total     = $item_subtotal - $item_discount + $item_tax;
                         // Do not allow totals to go negative
-                        if ( $item_total < 0 ) {
+                        if ($item_total < 0) {
                             $item_total = 0;
                         }
                         
@@ -1335,113 +1335,113 @@ 
                         $cart_discount  += (float)($item_discount);
                         $cart_tax       += (float)($item_tax);
                         
-                        $data['cart_details'][$key]['discount']   = wpinv_round_amount( $item_discount );
-                        $data['cart_details'][$key]['tax']        = wpinv_round_amount( $item_tax );
-                        $data['cart_details'][$key]['price']      = wpinv_round_amount( $item_total );
+                        $data['cart_details'][$key]['discount']   = wpinv_round_amount($item_discount);
+                        $data['cart_details'][$key]['tax']        = wpinv_round_amount($item_tax);
+                        $data['cart_details'][$key]['price']      = wpinv_round_amount($item_total);
                     }
                     
-                    $data['subtotal'] = wpinv_round_amount( $cart_subtotal );
-                    $data['discount'] = wpinv_round_amount( $cart_discount );
-                    $data['tax']      = wpinv_round_amount( $cart_tax );
-                    $data['total']    = wpinv_round_amount( $data['subtotal'] + $data['tax'] );
+                    $data['subtotal'] = wpinv_round_amount($cart_subtotal);
+                    $data['discount'] = wpinv_round_amount($cart_discount);
+                    $data['tax']      = wpinv_round_amount($cart_tax);
+                    $data['total']    = wpinv_round_amount($data['subtotal'] + $data['tax']);
                 }
             }
         }
         
-        $data = apply_filters( 'wpinv_get_invoice_recurring_details', $data, $this, $field, $currency );
+        $data = apply_filters('wpinv_get_invoice_recurring_details', $data, $this, $field, $currency);
 
-        if ( isset( $data[$field] ) ) {
-            return ( $currency ? wpinv_price( $data[$field], $this->get_currency() ) : $data[$field] );
+        if (isset($data[$field])) {
+            return ($currency ? wpinv_price($data[$field], $this->get_currency()) : $data[$field]);
         }
         
         return $data;
     }
     
-    public function get_final_tax( $currency = false ) {        
-        $final_total = wpinv_round_amount( $this->tax );
-        if ( $currency ) {
-            $final_total = wpinv_price( wpinv_format_amount( $final_total, NULL, !$currency ), $this->get_currency() );
+    public function get_final_tax($currency = false) {        
+        $final_total = wpinv_round_amount($this->tax);
+        if ($currency) {
+            $final_total = wpinv_price(wpinv_format_amount($final_total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_final_total', $final_total, $this, $currency );
+        return apply_filters('wpinv_get_invoice_final_total', $final_total, $this, $currency);
     }
     
-    public function get_discounts( $array = false ) {
+    public function get_discounts($array = false) {
         $discounts = $this->discounts;
-        if ( $array && $discounts ) {
-            $discounts = explode( ',', $discounts );
+        if ($array && $discounts) {
+            $discounts = explode(',', $discounts);
         }
-        return apply_filters( 'wpinv_payment_discounts', $discounts, $this->ID, $this, $array );
+        return apply_filters('wpinv_payment_discounts', $discounts, $this->ID, $this, $array);
     }
     
-    public function get_discount( $currency = false, $dash = false ) {
-        if ( !empty( $this->discounts ) ) {
+    public function get_discount($currency = false, $dash = false) {
+        if (!empty($this->discounts)) {
             global $ajax_cart_details;
             $ajax_cart_details = $this->get_cart_details();
             
-            if ( !empty( $ajax_cart_details ) && count( $ajax_cart_details ) == count( $this->items ) ) {
+            if (!empty($ajax_cart_details) && count($ajax_cart_details) == count($this->items)) {
                 $cart_items = $ajax_cart_details;
             } else {
                 $cart_items = $this->items;
             }
 
-            $this->discount = wpinv_get_cart_items_discount_amount( $cart_items , $this->discounts );
+            $this->discount = wpinv_get_cart_items_discount_amount($cart_items, $this->discounts);
         }
-        $discount   = wpinv_round_amount( $this->discount );
+        $discount   = wpinv_round_amount($this->discount);
         $dash       = $dash && $discount > 0 ? '&ndash;' : '';
         
-        if ( $currency ) {
-            $discount = wpinv_price( wpinv_format_amount( $discount, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $discount = wpinv_price(wpinv_format_amount($discount, NULL, !$currency), $this->get_currency());
         }
         
-        $discount   = $dash . $discount;
+        $discount = $dash . $discount;
         
-        return apply_filters( 'wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash );
+        return apply_filters('wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash);
     }
     
     public function get_discount_code() {
         return $this->discount_code;
     }
     
-    public function get_tax( $currency = false ) {
-        $tax = wpinv_round_amount( $this->tax );
+    public function get_tax($currency = false) {
+        $tax = wpinv_round_amount($this->tax);
         
-        if ( $currency ) {
-            $tax = wpinv_price( wpinv_format_amount( $tax, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $tax = wpinv_price(wpinv_format_amount($tax, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency);
     }
     
-    public function get_fees( $type = 'all' ) {
-        $fees    = array();
+    public function get_fees($type = 'all') {
+        $fees = array();
 
-        if ( ! empty( $this->fees ) && is_array( $this->fees ) ) {
-            foreach ( $this->fees as $fee ) {
-                if( 'all' != $type && ! empty( $fee['type'] ) && $type != $fee['type'] ) {
+        if (!empty($this->fees) && is_array($this->fees)) {
+            foreach ($this->fees as $fee) {
+                if ('all' != $type && !empty($fee['type']) && $type != $fee['type']) {
                     continue;
                 }
 
-                $fee['label'] = stripslashes( $fee['label'] );
-                $fee['amount_display'] = wpinv_price( $fee['amount'], $this->get_currency() );
-                $fees[]    = $fee;
+                $fee['label'] = stripslashes($fee['label']);
+                $fee['amount_display'] = wpinv_price($fee['amount'], $this->get_currency());
+                $fees[] = $fee;
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees', $fees, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees', $fees, $this->ID, $this);
     }
     
-    public function get_fees_total( $type = 'all' ) {
-        $fees_total = (float) 0.00;
+    public function get_fees_total($type = 'all') {
+        $fees_total = (float)0.00;
 
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
-        if ( ! empty( $payment_fees ) ) {
-            foreach ( $payment_fees as $fee ) {
-                $fees_total += (float) $fee['amount'];
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
+        if (!empty($payment_fees)) {
+            foreach ($payment_fees as $fee) {
+                $fees_total += (float)$fee['amount'];
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this);
         /*
         $fees = $this->get_fees( $type );
 
@@ -1461,116 +1461,116 @@ 
     }
 
     public function get_user_id() {
-        return apply_filters( 'wpinv_user_id', $this->user_id, $this->ID, $this );
+        return apply_filters('wpinv_user_id', $this->user_id, $this->ID, $this);
     }
     
     public function get_first_name() {
-        return apply_filters( 'wpinv_first_name', $this->first_name, $this->ID, $this );
+        return apply_filters('wpinv_first_name', $this->first_name, $this->ID, $this);
     }
     
     public function get_last_name() {
-        return apply_filters( 'wpinv_last_name', $this->last_name, $this->ID, $this );
+        return apply_filters('wpinv_last_name', $this->last_name, $this->ID, $this);
     }
     
     public function get_user_full_name() {
-        return apply_filters( 'wpinv_user_full_name', $this->full_name, $this->ID, $this );
+        return apply_filters('wpinv_user_full_name', $this->full_name, $this->ID, $this);
     }
     
     public function get_user_info() {
-        return apply_filters( 'wpinv_user_info', $this->user_info, $this->ID, $this );
+        return apply_filters('wpinv_user_info', $this->user_info, $this->ID, $this);
     }
     
     public function get_email() {
-        return apply_filters( 'wpinv_user_email', $this->email, $this->ID, $this );
+        return apply_filters('wpinv_user_email', $this->email, $this->ID, $this);
     }
     
     public function get_address() {
-        return apply_filters( 'wpinv_address', $this->address, $this->ID, $this );
+        return apply_filters('wpinv_address', $this->address, $this->ID, $this);
     }
     
     public function get_phone() {
-        return apply_filters( 'wpinv_phone', $this->phone, $this->ID, $this );
+        return apply_filters('wpinv_phone', $this->phone, $this->ID, $this);
     }
     
     public function get_number() {
-        return apply_filters( 'wpinv_number', $this->number, $this->ID, $this );
+        return apply_filters('wpinv_number', $this->number, $this->ID, $this);
     }
     
     public function get_items() {
-        return apply_filters( 'wpinv_payment_meta_items', $this->items, $this->ID, $this );
+        return apply_filters('wpinv_payment_meta_items', $this->items, $this->ID, $this);
     }
     
     public function get_key() {
-        return apply_filters( 'wpinv_key', $this->key, $this->ID, $this );
+        return apply_filters('wpinv_key', $this->key, $this->ID, $this);
     }
     
     public function get_transaction_id() {
-        return apply_filters( 'wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this);
     }
     
     public function get_gateway() {
-        return apply_filters( 'wpinv_gateway', $this->gateway, $this->ID, $this );
+        return apply_filters('wpinv_gateway', $this->gateway, $this->ID, $this);
     }
     
     public function get_gateway_title() {
-        $this->gateway_title = !empty( $this->gateway_title ) ? $this->gateway_title : wpinv_get_gateway_checkout_label( $this->gateway );
+        $this->gateway_title = !empty($this->gateway_title) ? $this->gateway_title : wpinv_get_gateway_checkout_label($this->gateway);
         
-        return apply_filters( 'wpinv_gateway_title', $this->gateway_title, $this->ID, $this );
+        return apply_filters('wpinv_gateway_title', $this->gateway_title, $this->ID, $this);
     }
     
     public function get_currency() {
-        return apply_filters( 'wpinv_currency_code', $this->currency, $this->ID, $this );
+        return apply_filters('wpinv_currency_code', $this->currency, $this->ID, $this);
     }
     
     public function get_created_date() {
-        return apply_filters( 'wpinv_created_date', $this->date, $this->ID, $this );
+        return apply_filters('wpinv_created_date', $this->date, $this->ID, $this);
     }
     
-    public function get_due_date( $display = false ) {
-        $due_date = apply_filters( 'wpinv_due_date', $this->due_date, $this->ID, $this );
+    public function get_due_date($display = false) {
+        $due_date = apply_filters('wpinv_due_date', $this->due_date, $this->ID, $this);
         
-        if ( !$display || empty( $due_date ) ) {
+        if (!$display || empty($due_date)) {
             return $due_date;
         }
         
-        return date_i18n( get_option( 'date_format' ), strtotime( $due_date ) );
+        return date_i18n(get_option('date_format'), strtotime($due_date));
     }
     
     public function get_completed_date() {
-        return apply_filters( 'wpinv_completed_date', $this->completed_date, $this->ID, $this );
+        return apply_filters('wpinv_completed_date', $this->completed_date, $this->ID, $this);
     }
     
-    public function get_invoice_date( $formatted = true ) {
+    public function get_invoice_date($formatted = true) {
         $date_completed = $this->completed_date;
         $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? $date_completed : '';
         
-        if ( $invoice_date == '' ) {
+        if ($invoice_date == '') {
             $date_created   = $this->date;
             $invoice_date   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? $date_created : '';
         }
         
-        if ( $formatted && $invoice_date ) {
-            $invoice_date   = date_i18n( get_option( 'date_format' ), strtotime( $invoice_date ) );
+        if ($formatted && $invoice_date) {
+            $invoice_date = date_i18n(get_option('date_format'), strtotime($invoice_date));
         }
 
-        return apply_filters( 'wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this);
     }
     
     public function get_ip() {
-        return apply_filters( 'wpinv_user_ip', $this->ip, $this->ID, $this );
+        return apply_filters('wpinv_user_ip', $this->ip, $this->ID, $this);
     }
         
-    public function has_status( $status ) {
-        return apply_filters( 'wpinv_has_status', ( is_array( $status ) && in_array( $this->get_status(), $status ) ) || $this->get_status() === $status ? true : false, $this, $status );
+    public function has_status($status) {
+        return apply_filters('wpinv_has_status', (is_array($status) && in_array($this->get_status(), $status)) || $this->get_status() === $status ? true : false, $this, $status);
     }
     
-    public function add_item( $item_id = 0, $args = array() ) {
+    public function add_item($item_id = 0, $args = array()) {
         global $wpi_current_id, $wpi_item_id;
         
-        $item = new WPInv_Item( $item_id );
+        $item = new WPInv_Item($item_id);
 
         // Bail if this post isn't a item
-        if( !$item || $item->post_type !== 'wpi_item' ) {
+        if (!$item || $item->post_type !== 'wpi_item') {
             return false;
         }
         
@@ -1589,8 +1589,8 @@ 
             'fees'          => array()
         );
 
-        $args = wp_parse_args( apply_filters( 'wpinv_add_item_args', $args, $item->ID ), $defaults );
-        $args['quantity']   = $has_quantities && $args['quantity'] > 0 ? absint( $args['quantity'] ) : 1;
+        $args = wp_parse_args(apply_filters('wpinv_add_item_args', $args, $item->ID), $defaults);
+        $args['quantity'] = $has_quantities && $args['quantity'] > 0 ? absint($args['quantity']) : 1;
 
         $wpi_current_id         = $this->ID;
         $wpi_item_id            = $item->ID;
@@ -1602,19 +1602,19 @@ 
         $found_cart_key         = false;
         
         if ($has_quantities) {
-            $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+            $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
             
-            foreach ( $this->items as $key => $cart_item ) {
-                if ( (int)$item_id !== (int)$cart_item['id'] ) {
+            foreach ($this->items as $key => $cart_item) {
+                if ((int)$item_id !== (int)$cart_item['id']) {
                     continue;
                 }
 
-                $this->items[ $key ]['quantity'] += $args['quantity'];
+                $this->items[$key]['quantity'] += $args['quantity'];
                 break;
             }
             
-            foreach ( $this->cart_details as $cart_key => $cart_item ) {
-                if ( $item_id != $cart_item['id'] ) {
+            foreach ($this->cart_details as $cart_key => $cart_item) {
+                if ($item_id != $cart_item['id']) {
                     continue;
                 }
 
@@ -1626,29 +1626,29 @@ 
         if ($has_quantities && $found_cart_key !== false) {
             $cart_item          = $this->cart_details[$found_cart_key];
             $item_price         = $cart_item['item_price'];
-            $quantity           = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $quantity           = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
             $new_quantity       = $quantity + $args['quantity'];
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
             
             $discount_increased = $discount > 0 && $subtotal > 0 && $discount > (float)$cart_item['discount'] ? $discount - (float)$cart_item['discount'] : 0;
             $tax_increased      = $tax > 0 && $subtotal > 0 && $tax > (float)$cart_item['tax'] ? $tax - (float)$cart_item['tax'] : 0;
             // The total increase equals the number removed * the item_price
-            $total_increased    = wpinv_round_amount( $item_price );
+            $total_increased    = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1664,25 +1664,25 @@ 
             $this->cart_details[$found_cart_key] = $cart_item;
         } else {
             // Set custom price.
-            if ( $args['custom_price'] !== '' ) {
+            if ($args['custom_price'] !== '') {
                 $item_price = $args['custom_price'];
             } else {
                 // Allow overriding the price
-                if ( false !== $args['item_price'] ) {
+                if (false !== $args['item_price']) {
                     $item_price = $args['item_price'];
                 } else {
-                    $item_price = wpinv_get_item_price( $item->ID );
+                    $item_price = wpinv_get_item_price($item->ID);
                 }
             }
 
             // Sanitizing the price here so we don't have a dozen calls later
-            $item_price = wpinv_sanitize_amount( $item_price );
-            $subtotal   = wpinv_round_amount( $item_price * $args['quantity'] );
+            $item_price = wpinv_sanitize_amount($item_price);
+            $subtotal   = wpinv_round_amount($item_price * $args['quantity']);
         
-            $discount   = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax_class  = !empty( $args['vat_class'] ) ? $args['vat_class'] : '';
-            $tax_rate   = !empty( $args['vat_rate'] ) ? $args['vat_rate'] : 0;
-            $tax        = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount   = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax_class  = !empty($args['vat_class']) ? $args['vat_class'] : '';
+            $tax_rate   = !empty($args['vat_rate']) ? $args['vat_rate'] : 0;
+            $tax        = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
 
             // Setup the items meta item
             $new_item = array(
@@ -1690,29 +1690,29 @@ 
                 'quantity' => $args['quantity'],
             );
 
-            $this->items[]  = $new_item;
+            $this->items[] = $new_item;
 
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total      = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
         
             $this->cart_details[] = array(
                 'name'          => !empty($args['name']) ? $args['name'] : $item->get_name(),
                 'id'            => $item->ID,
-                'item_price'    => wpinv_round_amount( $item_price ),
-                'custom_price'  => ( $args['custom_price'] !== '' ? wpinv_round_amount( $args['custom_price'] ) : '' ),
+                'item_price'    => wpinv_round_amount($item_price),
+                'custom_price'  => ($args['custom_price'] !== '' ? wpinv_round_amount($args['custom_price']) : ''),
                 'quantity'      => $args['quantity'],
                 'discount'      => $discount,
-                'subtotal'      => wpinv_round_amount( $subtotal ),
-                'tax'           => wpinv_round_amount( $tax ),
-                'price'         => wpinv_round_amount( $total ),
+                'subtotal'      => wpinv_round_amount($subtotal),
+                'tax'           => wpinv_round_amount($tax),
+                'price'         => wpinv_round_amount($total),
                 'vat_rate'      => $tax_rate,
                 'vat_class'     => $tax_class,
                 'meta'          => $args['meta'],
@@ -1722,18 +1722,18 @@ 
             $subtotal = $subtotal - $discount;
         }
         
-        $added_item = end( $this->cart_details );
-        $added_item['action']  = 'add';
+        $added_item = end($this->cart_details);
+        $added_item['action'] = 'add';
         
         $this->pending['items'][] = $added_item;
         
-        $this->increase_subtotal( $subtotal );
-        $this->increase_tax( $tax );
+        $this->increase_subtotal($subtotal);
+        $this->increase_tax($tax);
 
         return true;
     }
     
-    public function remove_item( $item_id, $args = array() ) {
+    public function remove_item($item_id, $args = array()) {
         // Set some defaults
         $defaults = array(
             'quantity'      => 1,
@@ -1741,51 +1741,51 @@ 
             'custom_price'  => '',
             'cart_index'    => false,
         );
-        $args = wp_parse_args( $args, $defaults );
+        $args = wp_parse_args($args, $defaults);
 
         // Bail if this post isn't a item
-        if ( get_post_type( $item_id ) !== 'wpi_item' ) {
+        if (get_post_type($item_id) !== 'wpi_item') {
             return false;
         }
         
-        $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+        $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
 
-        foreach ( $this->items as $key => $item ) {
-            if ( !empty($item['id']) && (int)$item_id !== (int)$item['id'] ) {
+        foreach ($this->items as $key => $item) {
+            if (!empty($item['id']) && (int)$item_id !== (int)$item['id']) {
                 continue;
             }
 
-            if ( false !== $args['cart_index'] ) {
-                $cart_index = absint( $args['cart_index'] );
-                $cart_item  = ! empty( $this->cart_details[ $cart_index ] ) ? $this->cart_details[ $cart_index ] : false;
+            if (false !== $args['cart_index']) {
+                $cart_index = absint($args['cart_index']);
+                $cart_item  = !empty($this->cart_details[$cart_index]) ? $this->cart_details[$cart_index] : false;
 
-                if ( ! empty( $cart_item ) ) {
+                if (!empty($cart_item)) {
                     // If the cart index item isn't the same item ID, don't remove it
-                    if ( !empty($cart_item['id']) && $cart_item['id'] != $item['id'] ) {
+                    if (!empty($cart_item['id']) && $cart_item['id'] != $item['id']) {
                         continue;
                     }
                 }
             }
 
-            $item_quantity = $this->items[ $key ]['quantity'];
-            if ( $item_quantity > $args['quantity'] ) {
-                $this->items[ $key ]['quantity'] -= $args['quantity'];
+            $item_quantity = $this->items[$key]['quantity'];
+            if ($item_quantity > $args['quantity']) {
+                $this->items[$key]['quantity'] -= $args['quantity'];
                 break;
             } else {
-                unset( $this->items[ $key ] );
+                unset($this->items[$key]);
                 break;
             }
         }
 
         $found_cart_key = false;
-        if ( false === $args['cart_index'] ) {
-            foreach ( $this->cart_details as $cart_key => $item ) {
-                if ( $item_id != $item['id'] ) {
+        if (false === $args['cart_index']) {
+            foreach ($this->cart_details as $cart_key => $item) {
+                if ($item_id != $item['id']) {
                     continue;
                 }
 
-                if ( false !== $args['item_price'] ) {
-                    if ( isset( $item['item_price'] ) && (float) $args['item_price'] != (float) $item['item_price'] ) {
+                if (false !== $args['item_price']) {
+                    if (isset($item['item_price']) && (float)$args['item_price'] != (float)$item['item_price']) {
                         continue;
                     }
                 }
@@ -1794,13 +1794,13 @@ 
                 break;
             }
         } else {
-            $cart_index = absint( $args['cart_index'] );
+            $cart_index = absint($args['cart_index']);
 
-            if ( ! array_key_exists( $cart_index, $this->cart_details ) ) {
+            if (!array_key_exists($cart_index, $this->cart_details)) {
                 return false; // Invalid cart index passed.
             }
 
-            if ( (int) $this->cart_details[ $cart_index ]['id'] > 0 && (int) $this->cart_details[ $cart_index ]['id'] !== (int) $item_id ) {
+            if ((int)$this->cart_details[$cart_index]['id'] > 0 && (int)$this->cart_details[$cart_index]['id'] !== (int)$item_id) {
                 return false; // We still need the proper Item ID to be sure.
             }
 
@@ -1808,41 +1808,41 @@ 
         }
         
         $cart_item  = $this->cart_details[$found_cart_key];
-        $quantity   = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
+        $quantity   = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
         
-        if ( count( $this->cart_details ) == 1 && ( $quantity - $args['quantity'] ) < 1 ) {
+        if (count($this->cart_details) == 1 && ($quantity - $args['quantity']) < 1) {
             return false; // Invoice must contain at least one item.
         }
         
-        $discounts  = $this->get_discounts();
+        $discounts = $this->get_discounts();
         
-        if ( $quantity > $args['quantity'] ) {
+        if ($quantity > $args['quantity']) {
             $item_price         = $cart_item['item_price'];
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
-            $new_quantity       = max( $quantity - $args['quantity'], 1);
+            $new_quantity       = max($quantity - $args['quantity'], 1);
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
             
-            $discount_decrease  = (float)$cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['discount'] / $quantity ) ) : 0;
+            $discount_decrease  = (float)$cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount(((float)$cart_item['discount'] / $quantity)) : 0;
             $discount_decrease  = $discount > 0 && $subtotal > 0 && (float)$cart_item['discount'] > $discount ? (float)$cart_item['discount'] - $discount : $discount_decrease; 
-            $tax_decrease       = (float)$cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['tax'] / $quantity ) ) : 0;
+            $tax_decrease       = (float)$cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount(((float)$cart_item['tax'] / $quantity)) : 0;
             $tax_decrease       = $tax > 0 && $subtotal > 0 && (float)$cart_item['tax'] > $tax ? (float)$cart_item['tax'] - $tax : $tax_decrease;
             
             // The total increase equals the number removed * the item_price
-            $total_decrease     = wpinv_round_amount( $item_price );
+            $total_decrease     = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1861,16 +1861,16 @@ 
             
             $this->cart_details[$found_cart_key] = $cart_item;
             
-            $remove_item = end( $this->cart_details );
+            $remove_item = end($this->cart_details);
         } else {
             $item_price     = $cart_item['item_price'];
-            $discount       = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax            = !empty( $cart_item['tax'] ) ? $cart_item['tax'] : 0;
+            $discount       = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax            = !empty($cart_item['tax']) ? $cart_item['tax'] : 0;
         
-            $subtotal_decrease  = ( $item_price * $quantity ) - $discount;
+            $subtotal_decrease  = ($item_price * $quantity) - $discount;
             $tax_decrease       = $tax;
 
-            unset( $this->cart_details[$found_cart_key] );
+            unset($this->cart_details[$found_cart_key]);
             
             $remove_item             = $args;
             $remove_item['id']       = $item_id;
@@ -1881,8 +1881,8 @@ 
         $remove_item['action']      = 'remove';
         $this->pending['items'][]   = $remove_item;
                
-        $this->decrease_subtotal( $subtotal_decrease );
-        $this->decrease_tax( $tax_decrease );
+        $this->decrease_subtotal($subtotal_decrease);
+        $this->decrease_tax($tax_decrease);
         
         return true;
     }
@@ -1890,7 +1890,7 @@ 
     public function update_items($temp = false) {
         global $wpinv_euvat, $wpi_current_id, $wpi_item_id, $wpi_nosave;
         
-        if ( !empty( $this->cart_details ) ) {
+        if (!empty($this->cart_details)) {
             $wpi_nosave             = $temp;
             $cart_subtotal          = 0;
             $cart_discount          = 0;
@@ -1900,42 +1900,42 @@ 
             $_POST['wpinv_country'] = $this->country;
             $_POST['wpinv_state']   = $this->state;
             
-            foreach ( $this->cart_details as $key => $item ) {
+            foreach ($this->cart_details as $key => $item) {
                 $item_price = $item['item_price'];
-                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                $amount     = wpinv_round_amount( $item_price * $quantity );
+                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                $amount     = wpinv_round_amount($item_price * $quantity);
                 $subtotal   = $item_price * $quantity;
                 
                 $wpi_current_id         = $this->ID;
                 $wpi_item_id            = $item['id'];
                 
-                $discount   = wpinv_get_cart_item_discount_amount( $item, $this->get_discounts() );
+                $discount   = wpinv_get_cart_item_discount_amount($item, $this->get_discounts());
                 
-                $tax_rate   = wpinv_get_tax_rate( $this->country, $this->state, $wpi_item_id );
-                $tax_class  = $wpinv_euvat->get_item_class( $wpi_item_id );
-                $tax        = $item_price > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+                $tax_rate   = wpinv_get_tax_rate($this->country, $this->state, $wpi_item_id);
+                $tax_class  = $wpinv_euvat->get_item_class($wpi_item_id);
+                $tax        = $item_price > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
 
-                if ( wpinv_prices_include_tax() ) {
-                    $subtotal -= wpinv_round_amount( $tax );
+                if (wpinv_prices_include_tax()) {
+                    $subtotal -= wpinv_round_amount($tax);
                 }
 
-                $total      = $subtotal - $discount + $tax;
+                $total = $subtotal - $discount + $tax;
 
                 // Do not allow totals to go negative
-                if( $total < 0 ) {
+                if ($total < 0) {
                     $total = 0;
                 }
 
                 $cart_details[] = array(
                     'id'          => $item['id'],
                     'name'        => $item['name'],
-                    'item_price'  => wpinv_round_amount( $item_price ),
-                    'custom_price'=> ( isset( $item['custom_price'] ) ? $item['custom_price'] : '' ),
+                    'item_price'  => wpinv_round_amount($item_price),
+                    'custom_price'=> (isset($item['custom_price']) ? $item['custom_price'] : ''),
                     'quantity'    => $quantity,
                     'discount'    => $discount,
-                    'subtotal'    => wpinv_round_amount( $subtotal ),
-                    'tax'         => wpinv_round_amount( $tax ),
-                    'price'       => wpinv_round_amount( $total ),
+                    'subtotal'    => wpinv_round_amount($subtotal),
+                    'tax'         => wpinv_round_amount($tax),
+                    'price'       => wpinv_round_amount($total),
                     'vat_rate'    => $tax_rate,
                     'vat_class'   => $tax_class,
                     'meta'        => isset($item['meta']) ? $item['meta'] : array(),
@@ -1946,9 +1946,9 @@ 
                 $cart_discount  += (float)($discount);
                 $cart_tax       += (float)($tax);
             }
-            $this->subtotal = wpinv_round_amount( $cart_subtotal );
-            $this->tax      = wpinv_round_amount( $cart_tax );
-            $this->discount = wpinv_round_amount( $cart_discount );
+            $this->subtotal = wpinv_round_amount($cart_subtotal);
+            $this->tax      = wpinv_round_amount($cart_tax);
+            $this->discount = wpinv_round_amount($cart_discount);
             
             $this->recalculate_total();
             
@@ -1960,221 +1960,221 @@ 
     
     public function recalculate_totals($temp = false) {        
         $this->update_items($temp);
-        $this->save( true );
+        $this->save(true);
         
         return $this;
     }
     
     public function needs_payment() {
-        $valid_invoice_statuses = apply_filters( 'wpinv_valid_invoice_statuses_for_payment', array( 'wpi-pending' ), $this );
+        $valid_invoice_statuses = apply_filters('wpinv_valid_invoice_statuses_for_payment', array('wpi-pending'), $this);
 
-        if ( $this->has_status( $valid_invoice_statuses ) && ( $this->get_total() > 0 || $this->is_free_trial() || $this->is_free() ) ) {
+        if ($this->has_status($valid_invoice_statuses) && ($this->get_total() > 0 || $this->is_free_trial() || $this->is_free())) {
             $needs_payment = true;
         } else {
             $needs_payment = false;
         }
 
-        return apply_filters( 'wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses );
+        return apply_filters('wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses);
     }
     
-    public function get_checkout_payment_url( $with_key = false, $secret = false ) {
+    public function get_checkout_payment_url($with_key = false, $secret = false) {
         $pay_url = wpinv_get_checkout_uri();
 
-        if ( is_ssl() ) {
-            $pay_url = str_replace( 'http:', 'https:', $pay_url );
+        if (is_ssl()) {
+            $pay_url = str_replace('http:', 'https:', $pay_url);
         }
         
         $key = $this->get_key();
 
-        if ( $with_key ) {
-            $pay_url = add_query_arg( 'invoice_key', $key, $pay_url );
+        if ($with_key) {
+            $pay_url = add_query_arg('invoice_key', $key, $pay_url);
         } else {
-            $pay_url = add_query_arg( array( 'wpi_action' => 'pay_for_invoice', 'invoice_key' => $key ), $pay_url );
+            $pay_url = add_query_arg(array('wpi_action' => 'pay_for_invoice', 'invoice_key' => $key), $pay_url);
         }
         
-        if ( $secret ) {
-            $pay_url = add_query_arg( array( '_wpipay' => md5( $this->get_user_id() . '::' . $this->get_email() . '::' . $key ) ), $pay_url );
+        if ($secret) {
+            $pay_url = add_query_arg(array('_wpipay' => md5($this->get_user_id() . '::' . $this->get_email() . '::' . $key)), $pay_url);
         }
 
-        return apply_filters( 'wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret );
+        return apply_filters('wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret);
     }
     
-    public function get_view_url( $with_key = false ) {
-        $invoice_url = get_permalink( $this->ID );
+    public function get_view_url($with_key = false) {
+        $invoice_url = get_permalink($this->ID);
 
-        if ( $with_key ) {
-            $invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
+        if ($with_key) {
+            $invoice_url = add_query_arg('invoice_key', $this->get_key(), $invoice_url);
         }
 
-        return apply_filters( 'wpinv_get_view_url', $invoice_url, $this, $with_key );
+        return apply_filters('wpinv_get_view_url', $invoice_url, $this, $with_key);
     }
     
-    public function generate_key( $string = '' ) {
-        $auth_key  = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-        return strtolower( md5( $string . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'wpinv', true ) ) );  // Unique key
+    public function generate_key($string = '') {
+        $auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+        return strtolower(md5($string . date('Y-m-d H:i:s') . $auth_key . uniqid('wpinv', true))); // Unique key
     }
     
     public function is_recurring() {
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return false;
         }
         
         $has_subscription = false;
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $has_subscription = true;
                 break;
             }
         }
         
-        if ( count( $this->cart_details ) > 1 ) {
+        if (count($this->cart_details) > 1) {
             $has_subscription = false;
         }
 
-        return apply_filters( 'wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details );
+        return apply_filters('wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details);
     }
     
     public function is_free_trial() {
         $is_free_trial = false;
         
-        if ( $this->is_parent() && $item = $this->get_recurring( true ) ) {
-            if ( !empty( $item ) && $item->has_free_trial() ) {
+        if ($this->is_parent() && $item = $this->get_recurring(true)) {
+            if (!empty($item) && $item->has_free_trial()) {
                 $is_free_trial = true;
             }
         }
 
-        return apply_filters( 'wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details );
+        return apply_filters('wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details);
     }
     
-    public function get_recurring( $object = false ) {
+    public function get_recurring($object = false) {
         $item = NULL;
         
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return $item;
         }
         
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $item = $cart_item['id'];
                 break;
             }
         }
         
-        if ( $object ) {
-            $item = $item ? new WPInv_Item( $item ) : NULL;
+        if ($object) {
+            $item = $item ? new WPInv_Item($item) : NULL;
             
-            apply_filters( 'wpinv_invoice_get_recurring_item', $item, $this );
+            apply_filters('wpinv_invoice_get_recurring_item', $item, $this);
         }
 
-        return apply_filters( 'wpinv_invoice_get_recurring_item_id', $item, $this );
+        return apply_filters('wpinv_invoice_get_recurring_item_id', $item, $this);
     }
     
     public function get_subscription_name() {
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return NULL;
         }
         
-        if ( !($name = $item->get_name()) ) {
+        if (!($name = $item->get_name())) {
             $name = $item->post_name;
         }
 
-        return apply_filters( 'wpinv_invoice_get_subscription_name', $name, $this );
+        return apply_filters('wpinv_invoice_get_subscription_name', $name, $this);
     }
         
     public function get_expiration() {
-        $expiration = $this->get_meta( '_wpinv_subscr_expiration', true );
+        $expiration = $this->get_meta('_wpinv_subscr_expiration', true);
         return $expiration;
     }
     
-    public function get_cancelled_date( $formatted = true ) {
-        $cancelled_date = $this->get_subscription_status() == 'cancelled' ? $this->get_meta( '_wpinv_subscr_cancelled_on', true ) : '';
+    public function get_cancelled_date($formatted = true) {
+        $cancelled_date = $this->get_subscription_status() == 'cancelled' ? $this->get_meta('_wpinv_subscr_cancelled_on', true) : '';
         
-        if ( $formatted && $cancelled_date ) {
-            $cancelled_date = date_i18n( get_option( 'date_format' ), strtotime( $cancelled_date ) );
+        if ($formatted && $cancelled_date) {
+            $cancelled_date = date_i18n(get_option('date_format'), strtotime($cancelled_date));
         }
         
         return $cancelled_date;
     }
     
-    public function get_trial_end_date( $formatted = true ) {
-        if ( !$this->is_free_trial() || !$this->is_paid() ) {
+    public function get_trial_end_date($formatted = true) {
+        if (!$this->is_free_trial() || !$this->is_paid()) {
             return NULL;
         }
         
-        $trial_end_date = $this->get_subscription_status() == 'trialing' ? $this->get_meta( '_wpinv_subscr_trial_end', true ) : '';
+        $trial_end_date = $this->get_subscription_status() == 'trialing' ? $this->get_meta('_wpinv_subscr_trial_end', true) : '';
         
-        if ( empty( $trial_end_date ) ) {
-            $trial_start_time = strtotime( $this->get_subscription_start() );
-            $trial_start_time += ( wpinv_period_in_days( $this->get_subscription_trial_interval(), $this->get_subscription_trial_period() ) * DAY_IN_SECONDS ) ;
+        if (empty($trial_end_date)) {
+            $trial_start_time = strtotime($this->get_subscription_start());
+            $trial_start_time += (wpinv_period_in_days($this->get_subscription_trial_interval(), $this->get_subscription_trial_period()) * DAY_IN_SECONDS);
             
-            $trial_end_date = date_i18n( 'Y-m-d H:i:s', $trial_start_time );
+            $trial_end_date = date_i18n('Y-m-d H:i:s', $trial_start_time);
         }
         
-        if ( $formatted && $trial_end_date ) {
-            $trial_end_date = date_i18n( get_option( 'date_format' ), strtotime( $trial_end_date ) );
+        if ($formatted && $trial_end_date) {
+            $trial_end_date = date_i18n(get_option('date_format'), strtotime($trial_end_date));
         }
         
         return $trial_end_date;
     }
     
-    public function get_subscription_created( $default = true ) {
-        $created = $this->get_meta( '_wpinv_subscr_created', true );
+    public function get_subscription_created($default = true) {
+        $created = $this->get_meta('_wpinv_subscr_created', true);
         
-        if ( empty( $created ) && $default ) {
+        if (empty($created) && $default) {
             $created = $this->date;
         }
         return $created;
     }
     
-    public function get_subscription_start( $formatted = true ) {
-        if ( !$this->is_paid() ) {
+    public function get_subscription_start($formatted = true) {
+        if (!$this->is_paid()) {
             return '-';
         }
-        $start   = $this->get_subscription_created();
+        $start = $this->get_subscription_created();
         
-        if ( $formatted ) {
-            $date = date_i18n( get_option( 'date_format' ), strtotime( $start ) );
+        if ($formatted) {
+            $date = date_i18n(get_option('date_format'), strtotime($start));
         } else {
-            $date = date_i18n( 'Y-m-d H:i:s', strtotime( $start ) );
+            $date = date_i18n('Y-m-d H:i:s', strtotime($start));
         }
 
         return $date;
     }
     
-    public function get_subscription_end( $formatted = true ) {
-        if ( !$this->is_paid() ) {
+    public function get_subscription_end($formatted = true) {
+        if (!$this->is_paid()) {
             return '-';
         }
         $start          = $this->get_subscription_created();
         $interval       = $this->get_subscription_interval();
-        $period         = $this->get_subscription_period( true );
+        $period         = $this->get_subscription_period(true);
         $bill_times     = (int)$this->get_bill_times();
         
-        if ( $bill_times == 0 ) {
-            return $formatted ? __( 'Until cancelled', 'invoicing' ) : $bill_times;
+        if ($bill_times == 0) {
+            return $formatted ? __('Until cancelled', 'invoicing') : $bill_times;
         }
         
-        $total_period = $start . '+' . ( $interval * $bill_times ) . ' ' . $period;
+        $total_period = $start . '+' . ($interval * $bill_times) . ' ' . $period;
         
-        $end_time = strtotime( $start . '+' . ( $interval * $bill_times ) . ' ' . $period );
+        $end_time = strtotime($start . '+' . ($interval * $bill_times) . ' ' . $period);
         
-        if ( $this->is_free_trial() ) {
-            $end_time += ( wpinv_period_in_days( $this->get_subscription_trial_interval(), $this->get_subscription_trial_period() ) * DAY_IN_SECONDS ) ;
+        if ($this->is_free_trial()) {
+            $end_time += (wpinv_period_in_days($this->get_subscription_trial_interval(), $this->get_subscription_trial_period()) * DAY_IN_SECONDS);
         }
         
-        if ( $formatted ) {
-            $date = date_i18n( get_option( 'date_format' ), $end_time );
+        if ($formatted) {
+            $date = date_i18n(get_option('date_format'), $end_time);
         } else {
-            $date = date_i18n( 'Y-m-d H:i:s', $end_time );
+            $date = date_i18n('Y-m-d H:i:s', $end_time);
         }
 
         return $date;
     }
     
     public function get_expiration_time() {
-        return strtotime( $this->get_expiration(), current_time( 'timestamp' ) );
+        return strtotime($this->get_expiration(), current_time('timestamp'));
     }
     
     public function get_original_invoice_id() {        
@@ -2186,125 +2186,125 @@ 
         return $subscription_data['bill_times'];
     }
 
-    public function get_child_payments( $self = false ) {
-        $invoices = get_posts( array(
+    public function get_child_payments($self = false) {
+        $invoices = get_posts(array(
             'post_type'         => $this->post_type,
             'post_parent'       => (int)$this->ID,
             'posts_per_page'    => '999',
-            'post_status'       => array( 'publish', 'wpi-processing', 'wpi-renewal' ),
+            'post_status'       => array('publish', 'wpi-processing', 'wpi-renewal'),
             'orderby'           => 'ID',
             'order'             => 'DESC',
             'fields'            => 'ids'
-        ) );
+        ));
         
-        if ( $this->is_free_trial() ) {
+        if ($this->is_free_trial()) {
             $self = false;
         }
         
-        if ( $self && $this->is_paid() ) {
-            if ( !empty( $invoices ) ) {
+        if ($self && $this->is_paid()) {
+            if (!empty($invoices)) {
                 $invoices[] = (int)$this->ID;
             } else {
-                $invoices = array( $this->ID );
+                $invoices = array($this->ID);
             }
             
-            $invoices = array_unique( $invoices );
+            $invoices = array_unique($invoices);
         }
 
         return $invoices;
     }
 
-    public function get_total_payments( $self = true ) {
-        return count( $this->get_child_payments( $self ) );
+    public function get_total_payments($self = true) {
+        return count($this->get_child_payments($self));
     }
     
-    public function get_subscriptions( $limit = -1 ) {
-        $subscriptions = wpinv_get_subscriptions( array( 'parent_invoice_id' => $this->ID, 'numberposts' => $limit ) );
+    public function get_subscriptions($limit = -1) {
+        $subscriptions = wpinv_get_subscriptions(array('parent_invoice_id' => $this->ID, 'numberposts' => $limit));
 
         return $subscriptions;
     }
     
     public function get_subscription_id() {
-        $subscription_id = $this->get_meta( '_wpinv_subscr_profile_id', true );
+        $subscription_id = $this->get_meta('_wpinv_subscr_profile_id', true);
         
-        if ( empty( $subscription_id ) && !empty( $this->parent_invoice ) ) {
-            $parent_invoice = wpinv_get_invoice( $this->parent_invoice );
+        if (empty($subscription_id) && !empty($this->parent_invoice)) {
+            $parent_invoice = wpinv_get_invoice($this->parent_invoice);
             
-            $subscription_id = $parent_invoice->get_meta( '_wpinv_subscr_profile_id', true );
+            $subscription_id = $parent_invoice->get_meta('_wpinv_subscr_profile_id', true);
         }
         
         return $subscription_id;
     }
     
     public function get_subscription_status() {
-        $subscription_status = $this->get_meta( '_wpinv_subscr_status', true );
+        $subscription_status = $this->get_meta('_wpinv_subscr_status', true);
 
-        if ( empty( $subscription_status ) ) {
+        if (empty($subscription_status)) {
             $status = 'pending';
             
-            if ( $this->is_paid() ) {        
+            if ($this->is_paid()) {        
                 $bill_times   = (int)$this->get_bill_times();
                 $times_billed = (int)$this->get_total_payments();
-                $expiration = $this->get_subscription_end( false );
-                $expired = $bill_times != 0 && $expiration != '' && $expiration != '-' && strtotime( date_i18n( 'Y-m-d', strtotime( $expiration ) ) ) < strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) ) ? true : false;
+                $expiration = $this->get_subscription_end(false);
+                $expired = $bill_times != 0 && $expiration != '' && $expiration != '-' && strtotime(date_i18n('Y-m-d', strtotime($expiration))) < strtotime(date_i18n('Y-m-d', current_time('timestamp'))) ? true : false;
                 
-                if ( (int)$bill_times == 0 ) {
+                if ((int)$bill_times == 0) {
                     $status = $expired ? 'expired' : 'active';
-                } else if ( $bill_times > 0 && $times_billed >= $bill_times ) {
+                } else if ($bill_times > 0 && $times_billed >= $bill_times) {
                     $status = 'completed';
-                } else if ( $expired ) {
+                } else if ($expired) {
                     $status = 'expired';
-                } else if ( $bill_times > 0 ) {
+                } else if ($bill_times > 0) {
                     $status = 'active';
                 } else {
                     $status = 'pending';
                 }
             }
             
-            if ( $status && $status != $subscription_status ) {
+            if ($status && $status != $subscription_status) {
                 $subscription_status = $status;
                 
-                $this->update_meta( '_wpinv_subscr_status', $status );
+                $this->update_meta('_wpinv_subscr_status', $status);
             }
         }
         
         return $subscription_status;
     }
     
-    public function get_subscription_status_label( $status = '' ) {
-        $status = !empty( $status ) ? $status : $this->get_subscription_status();
+    public function get_subscription_status_label($status = '') {
+        $status = !empty($status) ? $status : $this->get_subscription_status();
 
-        switch( $status ) {
+        switch ($status) {
             case 'active' :
-                $status_label = __( 'Active', 'invoicing' );
+                $status_label = __('Active', 'invoicing');
                 break;
 
             case 'cancelled' :
-                $status_label = __( 'Cancelled', 'invoicing' );
+                $status_label = __('Cancelled', 'invoicing');
                 break;
                 
             case 'completed' :
-                $status_label = __( 'Completed', 'invoicing' );
+                $status_label = __('Completed', 'invoicing');
                 break;
 
             case 'expired' :
-                $status_label = __( 'Expired', 'invoicing' );
+                $status_label = __('Expired', 'invoicing');
                 break;
 
             case 'pending' :
-                $status_label = __( 'Pending', 'invoicing' );
+                $status_label = __('Pending', 'invoicing');
                 break;
 
             case 'failing' :
-                $status_label = __( 'Failing', 'invoicing' );
+                $status_label = __('Failing', 'invoicing');
                 break;
                 
             case 'stopped' :
-                $status_label = __( 'Stopped', 'invoicing' );
+                $status_label = __('Stopped', 'invoicing');
                 break;
                 
             case 'trialing' :
-                $status_label = __( 'Trialing', 'invoicing' );
+                $status_label = __('Trialing', 'invoicing');
                 break;
 
             default:
@@ -2315,26 +2315,26 @@ 
         return $status_label;
     }
     
-    public function get_subscription_period( $full = false ) {
-        $period = $this->get_meta( '_wpinv_subscr_period', true );
+    public function get_subscription_period($full = false) {
+        $period = $this->get_meta('_wpinv_subscr_period', true);
         
         // Fix period for old invoices
-        if ( $period == 'day' ) {
+        if ($period == 'day') {
             $period = 'D';
-        } else if ( $period == 'week' ) {
+        } else if ($period == 'week') {
             $period = 'W';
-        } else if ( $period == 'month' ) {
+        } else if ($period == 'month') {
             $period = 'M';
-        } else if ( $period == 'year' ) {
+        } else if ($period == 'year') {
             $period = 'Y';
         }
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -2354,39 +2354,39 @@ 
     }
     
     public function get_subscription_interval() {
-        $interval = (int)$this->get_meta( '_wpinv_subscr_interval', true );
+        $interval = (int)$this->get_meta('_wpinv_subscr_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
         
         return $interval;
     }
     
-    public function get_subscription_trial_period( $full = false ) {
-        if ( !$this->is_free_trial() ) {
+    public function get_subscription_trial_period($full = false) {
+        if (!$this->is_free_trial()) {
             return '';
         }
         
-        $period = $this->get_meta( '_wpinv_subscr_trial_period', true );
+        $period = $this->get_meta('_wpinv_subscr_trial_period', true);
         
         // Fix period for old invoices
-        if ( $period == 'day' ) {
+        if ($period == 'day') {
             $period = 'D';
-        } else if ( $period == 'week' ) {
+        } else if ($period == 'week') {
             $period = 'W';
-        } else if ( $period == 'month' ) {
+        } else if ($period == 'month') {
             $period = 'M';
-        } else if ( $period == 'year' ) {
+        } else if ($period == 'year') {
             $period = 'Y';
         }
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -2406,13 +2406,13 @@ 
     }
     
     public function get_subscription_trial_interval() {
-        if ( !$this->is_free_trial() ) {
+        if (!$this->is_free_trial()) {
             return 0;
         }
         
-        $interval = (int)$this->get_meta( '_wpinv_subscr_trial_interval', true );
+        $interval = (int)$this->get_meta('_wpinv_subscr_trial_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
         
@@ -2424,8 +2424,8 @@ 
             'status' => 'failing'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_failing', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_failing', $this->ID, $this);
             return true;
         }
 
@@ -2437,8 +2437,8 @@ 
             'status' => 'stopped'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_stopped', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_stopped', $this->ID, $this);
             return true;
         }
 
@@ -2450,8 +2450,8 @@ 
             'status' => 'active'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_restarted', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_restarted', $this->ID, $this);
             return true;
         }
 
@@ -2463,23 +2463,23 @@ 
             'status' => 'cancelled'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            if ( is_user_logged_in() ) {
-                $userdata = get_userdata( get_current_user_id() );
+        if ($this->update_subscription($args)) {
+            if (is_user_logged_in()) {
+                $userdata = get_userdata(get_current_user_id());
                 $user     = $userdata->user_login;
             } else {
-                $user = __( 'gateway', 'invoicing' );
+                $user = __('gateway', 'invoicing');
             }
             
             $subscription_id = $this->get_subscription_id();
-            if ( !$subscription_id ) {
+            if (!$subscription_id) {
                 $subscription_id = $this->ID;
             }
 
-            $note = sprintf( __( 'Subscription %s has been cancelled by %s', 'invoicing' ), $subscription_id, $user );
-            $this->add_note( $note );
+            $note = sprintf(__('Subscription %s has been cancelled by %s', 'invoicing'), $subscription_id, $user);
+            $this->add_note($note);
 
-            do_action( 'wpinv_subscription_cancelled', $this->ID, $this );
+            do_action('wpinv_subscription_cancelled', $this->ID, $this);
             return true;
         }
 
@@ -2487,11 +2487,11 @@ 
     }
 
     public function can_cancel() {
-        return apply_filters( 'wpinv_subscription_can_cancel', false, $this );
+        return apply_filters('wpinv_subscription_can_cancel', false, $this);
     }
     
-    public function add_subscription( $data = array() ) {
-        if ( empty( $this->ID ) ) {
+    public function add_subscription($data = array()) {
+        if (empty($this->ID)) {
             return false;
         }
 
@@ -2510,85 +2510,85 @@ 
             'profile_id'        => '',
         );
 
-        $args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args($data, $defaults);
 
-        if ( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
-            if ( 'active' == $args['status'] || $args['status'] == 'trialing' ) {
+        if ($args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
+            if ('active' == $args['status'] || $args['status'] == 'trialing') {
                 $args['status'] = 'expired';
             }
         }
 
-        do_action( 'wpinv_subscription_pre_create', $args, $data, $this );
+        do_action('wpinv_subscription_pre_create', $args, $data, $this);
         
-        if ( !empty( $args ) ) {
-            foreach ( $args as $key => $value ) {
-                $this->update_meta( '_wpinv_subscr_' . $key, $value );
+        if (!empty($args)) {
+            foreach ($args as $key => $value) {
+                $this->update_meta('_wpinv_subscr_' . $key, $value);
             }
         }
 
-        do_action( 'wpinv_subscription_post_create', $args, $data, $this );
+        do_action('wpinv_subscription_post_create', $args, $data, $this);
 
         return true;
     }
     
-    public function update_subscription( $args = array() ) {
-        if ( empty( $this->ID ) ) {
+    public function update_subscription($args = array()) {
+        if (empty($this->ID)) {
             return false;
         }
 
-        if ( !empty( $args['expiration'] ) && $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
-            if ( !isset( $args['status'] ) || ( isset( $args['status'] ) && ( 'active' == $args['status'] || $args['status'] == 'trialing' ) ) ) {
+        if (!empty($args['expiration']) && $args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
+            if (!isset($args['status']) || (isset($args['status']) && ('active' == $args['status'] || $args['status'] == 'trialing'))) {
                 $args['status'] = 'expired';
             }
         }
 
-        if ( isset( $args['status'] ) && $args['status'] == 'cancelled' && empty( $args['cancelled_on'] ) ) {
-            $args['cancelled_on'] = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) );
+        if (isset($args['status']) && $args['status'] == 'cancelled' && empty($args['cancelled_on'])) {
+            $args['cancelled_on'] = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
         }
 
-        do_action( 'wpinv_subscription_pre_update', $args, $this );
+        do_action('wpinv_subscription_pre_update', $args, $this);
         
-        if ( !empty( $args ) ) {
-            foreach ( $args as $key => $value ) {
-                $this->update_meta( '_wpinv_subscr_' . $key, $value );
+        if (!empty($args)) {
+            foreach ($args as $key => $value) {
+                $this->update_meta('_wpinv_subscr_' . $key, $value);
             }
         }
 
-        do_action( 'wpinv_subscription_post_update', $args, $this );
+        do_action('wpinv_subscription_post_update', $args, $this);
 
         return true;
     }
     
     public function renew_subscription() {
         $parent_invoice = $this->get_parent_payment();
-        $parent_invoice = empty( $parent_invoice ) ? $this : $parent_invoice;
+        $parent_invoice = empty($parent_invoice) ? $this : $parent_invoice;
         
-        $current_time   = current_time( 'timestamp' );
+        $current_time   = current_time('timestamp');
         $start          = $this->get_subscription_created();
-        $start          = $start ? strtotime( $start ) : $current_time;
+        $start          = $start ? strtotime($start) : $current_time;
         $expires        = $this->get_expiration_time();
         
-        if ( !$expires ) {
-            $expires    = strtotime( '+' . $parent_invoice->get_subscription_interval() . ' ' . $parent_invoice->get_subscription_period( true ), $start );
+        if (!$expires) {
+            $expires    = strtotime('+' . $parent_invoice->get_subscription_interval() . ' ' . $parent_invoice->get_subscription_period(true), $start);
         }
         
-        $expiration     = date_i18n( 'Y-m-d 23:59:59', $expires );
-        $expiration     = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->ID, $this );
+        $expiration     = date_i18n('Y-m-d 23:59:59', $expires);
+        $expiration     = apply_filters('wpinv_subscription_renewal_expiration', $expiration, $this->ID, $this);
         $bill_times     = $parent_invoice->get_bill_times();
         $times_billed   = $parent_invoice->get_total_payments();
         
-        if ( $parent_invoice->get_subscription_status() == 'trialing' && ( $times_billed > 0 || strtotime( date_i18n( 'Y-m-d' ) ) < strtotime( $parent_invoice->get_trial_end_date( false ) ) ) ) {
+        if ($parent_invoice->get_subscription_status() == 'trialing' && ($times_billed > 0 || strtotime(date_i18n('Y-m-d')) < strtotime($parent_invoice->get_trial_end_date(false)))) {
             $args = array(
                 'status'     => 'active',
             );
 
-            $parent_invoice->update_subscription( $args );
+            $parent_invoice->update_subscription($args);
         }
         
-        do_action( 'wpinv_subscription_pre_renew', $this->ID, $expiration, $this );
+        do_action('wpinv_subscription_pre_renew', $this->ID, $expiration, $this);
 
-        $status       = 'active';
-        if ( $bill_times > 0 && $times_billed >= $bill_times ) {
+        $status = 'active';
+        if ($bill_times > 0 && $times_billed >= $bill_times) {
             $this->complete_subscription();
             $status = 'completed';
         }
@@ -2598,10 +2598,10 @@ 
             'status'     => $status,
         );
 
-        $this->update_subscription( $args );
+        $this->update_subscription($args);
 
-        do_action( 'wpinv_subscription_post_renew', $this->ID, $expiration, $this );
-        do_action( 'wpinv_recurring_set_subscription_status', $this->ID, $status, $this );
+        do_action('wpinv_subscription_post_renew', $this->ID, $expiration, $this);
+        do_action('wpinv_recurring_set_subscription_status', $this->ID, $status, $this);
     }
     
     public function complete_subscription() {
@@ -2609,8 +2609,8 @@ 
             'status' => 'completed'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_completed', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_completed', $this->ID, $this);
         }
     }
     
@@ -2619,44 +2619,44 @@ 
             'status' => 'expired'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_expired', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_expired', $this->ID, $this);
         }
     }
 
     public function get_cancel_url() {
-        $url = wp_nonce_url( add_query_arg( array( 'wpi_action' => 'cancel_subscription', 'sub_id' => $this->ID ) ), 'wpinv-recurring-cancel' );
+        $url = wp_nonce_url(add_query_arg(array('wpi_action' => 'cancel_subscription', 'sub_id' => $this->ID)), 'wpinv-recurring-cancel');
 
-        return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+        return apply_filters('wpinv_subscription_cancel_url', $url, $this);
     }
 
     public function can_update() {
-        return apply_filters( 'wpinv_subscription_can_update', false, $this );
+        return apply_filters('wpinv_subscription_can_update', false, $this);
     }
 
     public function get_update_url() {
-        $url = add_query_arg( array( 'action' => 'update', 'sub_id' => $this->ID ) );
+        $url = add_query_arg(array('action' => 'update', 'sub_id' => $this->ID));
 
-        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+        return apply_filters('wpinv_subscription_update_url', $url, $this);
     }
 
     public function is_parent() {
-        $is_parent = empty( $this->parent_invoice ) ? true : false;
+        $is_parent = empty($this->parent_invoice) ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_parent', $is_parent, $this );
+        return apply_filters('wpinv_invoice_is_parent', $is_parent, $this);
     }
     
     public function is_renewal() {
         $is_renewal = $this->parent_invoice && $this->parent_invoice != $this->ID ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_renewal', $is_renewal, $this );
+        return apply_filters('wpinv_invoice_is_renewal', $is_renewal, $this);
     }
     
     public function get_parent_payment() {
         $parent_payment = NULL;
         
-        if ( $this->is_renewal() ) {
-            $parent_payment = wpinv_get_invoice( $this->parent_invoice );
+        if ($this->is_renewal()) {
+            $parent_payment = wpinv_get_invoice($this->parent_invoice);
         }
         
         return $parent_payment;
@@ -2667,100 +2667,100 @@ 
         
         $subscription_status = $this->get_subscription_status();
 
-        if( ! $this->is_subscription_expired() && ( $subscription_status == 'active' || $subscription_status == 'cancelled' || $subscription_status == 'trialing' ) ) {
+        if (!$this->is_subscription_expired() && ($subscription_status == 'active' || $subscription_status == 'cancelled' || $subscription_status == 'trialing')) {
             $ret = true;
         }
 
-        return apply_filters( 'wpinv_subscription_is_active', $ret, $this->ID, $this );
+        return apply_filters('wpinv_subscription_is_active', $ret, $this->ID, $this);
     }
 
     public function is_subscription_expired() {
         $ret = false;
         $subscription_status = $this->get_subscription_status();
 
-        if ( $subscription_status == 'expired' ) {
+        if ($subscription_status == 'expired') {
             $ret = true;
-        } else if ( 'active' === $subscription_status || 'cancelled' === $subscription_status || 'trialing' == $subscription_status ) {
+        } else if ('active' === $subscription_status || 'cancelled' === $subscription_status || 'trialing' == $subscription_status) {
             $ret        = false;
             $expiration = $this->get_expiration_time();
 
-            if ( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+            if ($expiration && strtotime('NOW', current_time('timestamp')) > $expiration) {
                 $ret = true;
 
-                if ( 'active' === $subscription_status || 'trialing' === $subscription_status ) {
+                if ('active' === $subscription_status || 'trialing' === $subscription_status) {
                     $this->expire_subscription();
                 }
             }
         }
 
-        return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->ID, $this );
+        return apply_filters('wpinv_subscription_is_expired', $ret, $this->ID, $this);
     }
     
-    public function get_new_expiration( $item_id = 0, $trial = true ) {
-        $item   = new WPInv_Item( $item_id );
+    public function get_new_expiration($item_id = 0, $trial = true) {
+        $item   = new WPInv_Item($item_id);
         $interval = $item->get_recurring_interval();
-        $period = $item->get_recurring_period( true );
+        $period = $item->get_recurring_period(true);
         
-        $expiration_time = strtotime( '+' . $interval . ' ' . $period );
+        $expiration_time = strtotime('+' . $interval . ' ' . $period);
         
-        if ( $trial && $this->is_free_trial() && $item->has_free_trial() ) {
-            $expiration_time += ( wpinv_period_in_days( $item->get_trial_interval(), $item->get_trial_period() ) * DAY_IN_SECONDS ) ;
+        if ($trial && $this->is_free_trial() && $item->has_free_trial()) {
+            $expiration_time += (wpinv_period_in_days($item->get_trial_interval(), $item->get_trial_period()) * DAY_IN_SECONDS);
         }
 
-        return date_i18n( 'Y-m-d 23:59:59', $expiration_time );
+        return date_i18n('Y-m-d 23:59:59', $expiration_time);
     }
     
-    public function get_subscription_data( $filed = '' ) {
-        $fields = array( 'item_id', 'status', 'period', 'initial_amount', 'recurring_amount', 'interval', 'bill_times', 'trial_period', 'trial_interval', 'expiration', 'profile_id', 'created', 'cancelled_on' );
+    public function get_subscription_data($filed = '') {
+        $fields = array('item_id', 'status', 'period', 'initial_amount', 'recurring_amount', 'interval', 'bill_times', 'trial_period', 'trial_interval', 'expiration', 'profile_id', 'created', 'cancelled_on');
         
         $subscription_meta = array();
-        foreach ( $fields as $field ) {
-            $subscription_meta[ $field ] = $this->get_meta( '_wpinv_subscr_' . $field );
+        foreach ($fields as $field) {
+            $subscription_meta[$field] = $this->get_meta('_wpinv_subscr_' . $field);
         }
         
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
         
-        if ( !empty( $item ) ) {
-            if ( empty( $subscription_meta['item_id'] ) ) {
+        if (!empty($item)) {
+            if (empty($subscription_meta['item_id'])) {
                 $subscription_meta['item_id'] = $item->ID;
             }
-            if ( empty( $subscription_meta['period'] ) ) {
+            if (empty($subscription_meta['period'])) {
                 $subscription_meta['period'] = $item->get_recurring_period();
             }
-            if ( empty( $subscription_meta['interval'] ) ) {
+            if (empty($subscription_meta['interval'])) {
                 $subscription_meta['interval'] = $item->get_recurring_interval();
             }
-            if ( $item->has_free_trial() ) {
-                if ( empty( $subscription_meta['trial_period'] ) ) {
+            if ($item->has_free_trial()) {
+                if (empty($subscription_meta['trial_period'])) {
                     $subscription_meta['trial_period'] = $item->get_trial_period();
                 }
-                if ( empty( $subscription_meta['trial_interval'] ) ) {
+                if (empty($subscription_meta['trial_interval'])) {
                     $subscription_meta['trial_interval'] = $item->get_trial_interval();
                 }
             } else {
                 $subscription_meta['trial_period']      = '';
                 $subscription_meta['trial_interval']    = 0;
             }
-            if ( !$subscription_meta['bill_times'] && $subscription_meta['bill_times'] !== 0 ) {
+            if (!$subscription_meta['bill_times'] && $subscription_meta['bill_times'] !== 0) {
                 $subscription_meta['bill_times'] = $item->get_recurring_limit();
             }
-            if ( $subscription_meta['initial_amount'] === '' || $subscription_meta['recurring_amount'] === '' ) {
-                $subscription_meta['initial_amount']    = wpinv_round_amount( $this->get_total() );
-                $subscription_meta['recurring_amount']  = wpinv_round_amount( $this->get_recurring_details( 'total' ) );
+            if ($subscription_meta['initial_amount'] === '' || $subscription_meta['recurring_amount'] === '') {
+                $subscription_meta['initial_amount']    = wpinv_round_amount($this->get_total());
+                $subscription_meta['recurring_amount']  = wpinv_round_amount($this->get_recurring_details('total'));
             }
         }
         
-        if ( $filed === '' ) {
-            return apply_filters( 'wpinv_get_invoice_subscription_data', $subscription_meta, $this );
+        if ($filed === '') {
+            return apply_filters('wpinv_get_invoice_subscription_data', $subscription_meta, $this);
         }
         
-        $value = isset( $subscription_meta[$filed] ) ? $subscription_meta[$filed] : '';
+        $value = isset($subscription_meta[$filed]) ? $subscription_meta[$filed] : '';
         
-        return apply_filters( 'wpinv_invoice_subscription_data_value', $value, $subscription_meta, $this );
+        return apply_filters('wpinv_invoice_subscription_data_value', $value, $subscription_meta, $this);
     }
     
     public function is_paid() {
-        if ( $this->has_status( array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+        if ($this->has_status(array('publish', 'wpi-processing', 'wpi-renewal'))) {
             return true;
         }
         
@@ -2768,23 +2768,23 @@ 
     }
     
     public function is_refunded() {
-        $is_refunded = $this->has_status( array( 'wpi-refunded' ) );
+        $is_refunded = $this->has_status(array('wpi-refunded'));
 
-        return apply_filters( 'wpinv_invoice_is_refunded', $is_refunded, $this );
+        return apply_filters('wpinv_invoice_is_refunded', $is_refunded, $this);
     }
     
     public function is_free() {
         $is_free = false;
         
-        if ( !( (float)wpinv_round_amount( $this->get_total() ) > 0 ) ) {
-            if ( $this->is_parent() && $this->is_recurring() ) {
-                $is_free = (float)wpinv_round_amount( $this->get_recurring_details( 'total' ) ) > 0 ? false : true;
+        if (!((float)wpinv_round_amount($this->get_total()) > 0)) {
+            if ($this->is_parent() && $this->is_recurring()) {
+                $is_free = (float)wpinv_round_amount($this->get_recurring_details('total')) > 0 ? false : true;
             } else {
                 $is_free = true;
             }
         }
         
-        return apply_filters( 'wpinv_invoice_is_free', $is_free, $this );
+        return apply_filters('wpinv_invoice_is_free', $is_free, $this);
     }
     
     public function has_vat() {
@@ -2792,41 +2792,41 @@ 
         
         $requires_vat = false;
         
-        if ( $this->country ) {
+        if ($this->country) {
             $wpi_country        = $this->country;
             
-            $requires_vat       = $wpinv_euvat->requires_vat( $requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule( $this ) );
+            $requires_vat       = $wpinv_euvat->requires_vat($requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule($this));
         }
         
-        return apply_filters( 'wpinv_invoice_has_vat', $requires_vat, $this );
+        return apply_filters('wpinv_invoice_has_vat', $requires_vat, $this);
     }
     
     public function refresh_item_ids() {
         $item_ids = array();
         
-        if ( !empty( $this->cart_details ) ) {
-            foreach ( $this->cart_details as $key => $item ) {
-                if ( !empty( $item['id'] ) ) {
+        if (!empty($this->cart_details)) {
+            foreach ($this->cart_details as $key => $item) {
+                if (!empty($item['id'])) {
                     $item_ids[] = $item['id'];
                 }
             }
         }
         
-        $item_ids = !empty( $item_ids ) ? implode( ',', array_unique( $item_ids ) ) : '';
+        $item_ids = !empty($item_ids) ? implode(',', array_unique($item_ids)) : '';
         
-        update_post_meta( $this->ID, '_wpinv_item_ids', $item_ids );
+        update_post_meta($this->ID, '_wpinv_item_ids', $item_ids);
     }
     
-    public function get_invoice_quote_type( $post_id ) {
-        if ( empty( $post_id ) ) {
+    public function get_invoice_quote_type($post_id) {
+        if (empty($post_id)) {
             return '';
         }
 
-        $type = get_post_type( $post_id );
+        $type = get_post_type($post_id);
 
-        if ( 'wpi_invoice' === $type ) {
+        if ('wpi_invoice' === $type) {
             $post_type = __('Invoice', 'invoicing');
-        } else{
+        } else {
             $post_type = __('Quote', 'invoicing');
         }
 

includes/admin/register-settings.php

Spacing +509 added lines, -509 removed lines

@@ -1,66 +1,66 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
     global $wpinv_options;
 
-    $value = isset( $wpinv_options[ $key ] ) ? $wpinv_options[ $key ] : $default;
-    $value = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value = isset($wpinv_options[$key]) ? $wpinv_options[$key] : $default;
+    $value = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
-    if ( empty( $value ) ) {
-        $remove_option = wpinv_delete_option( $key );
+    if (empty($value)) {
+        $remove_option = wpinv_delete_option($key);
         return $remove_option;
     }
 
     // First let's grab the current settings
-    $options = get_option( 'wpinv_settings' );
+    $options = get_option('wpinv_settings');
 
     // Let other plugin alter the value
-    $value = apply_filters( 'wpinv_update_option', $value, $key );
+    $value = apply_filters('wpinv_update_option', $value, $key);
 
     // Next let's try to update the value
-    $options[ $key ] = $value;
-    $did_update = update_option( 'wpinv_settings', $options );
+    $options[$key] = $value;
+    $did_update = update_option('wpinv_settings', $options);
 
     // If it's updated, let's update the global variable
-    if ( $did_update ) {
+    if ($did_update) {
         global $wpinv_options;
-        $wpinv_options[ $key ] = $value;
+        $wpinv_options[$key] = $value;
     }
 
     return $did_update;
 }
 
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // First let's grab the current settings
-    $options = get_option( 'wpinv_settings' );
+    $options = get_option('wpinv_settings');
 
     // Next let's try to update the value
-    if( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
+    if (isset($options[$key])) {
+        unset($options[$key]);
     }
 
-    $did_update = update_option( 'wpinv_settings', $options );
+    $did_update = update_option('wpinv_settings', $options);
 
     // If it updated, let's update the global variable
-    if ( $did_update ){
+    if ($did_update) {
         global $wpinv_options;
         $wpinv_options = $options;
     }
@@ -69,37 +69,37 @@ 
 }
 
 function wpinv_get_settings() {
-    $settings = get_option( 'wpinv_settings' );
+    $settings = get_option('wpinv_settings');
 
-    if ( empty( $settings ) ) {
+    if (empty($settings)) {
         // Update old settings with new single option
-        $general_settings   = is_array( get_option( 'wpinv_settings_general' ) )    ? get_option( 'wpinv_settings_general' )    : array();
-        $gateways_settings  = is_array( get_option( 'wpinv_settings_gateways' ) )   ? get_option( 'wpinv_settings_gateways' )   : array();
-        $email_settings     = is_array( get_option( 'wpinv_settings_emails' ) )     ? get_option( 'wpinv_settings_emails' )     : array();
-        $tax_settings       = is_array( get_option( 'wpinv_settings_taxes' ) )      ? get_option( 'wpinv_settings_taxes' )      : array();
-        $misc_settings      = is_array( get_option( 'wpinv_settings_misc' ) )       ? get_option( 'wpinv_settings_misc' )       : array();
-        $tool_settings      = is_array( get_option( 'wpinv_settings_tools' ) )      ? get_option( 'wpinv_settings_tools' )      : array();
+        $general_settings   = is_array(get_option('wpinv_settings_general')) ? get_option('wpinv_settings_general') : array();
+        $gateways_settings  = is_array(get_option('wpinv_settings_gateways')) ? get_option('wpinv_settings_gateways') : array();
+        $email_settings     = is_array(get_option('wpinv_settings_emails')) ? get_option('wpinv_settings_emails') : array();
+        $tax_settings       = is_array(get_option('wpinv_settings_taxes')) ? get_option('wpinv_settings_taxes') : array();
+        $misc_settings      = is_array(get_option('wpinv_settings_misc')) ? get_option('wpinv_settings_misc') : array();
+        $tool_settings      = is_array(get_option('wpinv_settings_tools')) ? get_option('wpinv_settings_tools') : array();
 
-        $settings = array_merge( $general_settings, $gateways_settings, $tax_settings, $tool_settings );
+        $settings = array_merge($general_settings, $gateways_settings, $tax_settings, $tool_settings);
 
-        update_option( 'wpinv_settings', $settings );
+        update_option('wpinv_settings', $settings);
 
     }
-    return apply_filters( 'wpinv_get_settings', $settings );
+    return apply_filters('wpinv_get_settings', $settings);
 }
 
 function wpinv_register_settings() {
-    if ( false == get_option( 'wpinv_settings' ) ) {
-        add_option( 'wpinv_settings' );
+    if (false == get_option('wpinv_settings')) {
+        add_option('wpinv_settings');
     }
     
     $register_settings = wpinv_get_registered_settings();
     
-    foreach ( $register_settings as $tab => $sections ) {
-        foreach ( $sections as $section => $settings) {
+    foreach ($register_settings as $tab => $sections) {
+        foreach ($sections as $section => $settings) {
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
@@ -111,42 +111,42 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
+            foreach ($settings as $option) {
                 // For backwards compatibility
-                if ( empty( $option['id'] ) ) {
+                if (empty($option['id'])) {
                     continue;
                 }
 
-                $name = isset( $option['name'] ) ? $option['name'] : '';
+                $name = isset($option['name']) ? $option['name'] : '';
 
                 add_settings_field(
                     'wpinv_settings[' . $option['id'] . ']',
                     $name,
-                    function_exists( 'wpinv_' . $option['type'] . '_callback' ) ? 'wpinv_' . $option['type'] . '_callback' : 'wpinv_missing_callback',
+                    function_exists('wpinv_' . $option['type'] . '_callback') ? 'wpinv_' . $option['type'] . '_callback' : 'wpinv_missing_callback',
                     'wpinv_settings_' . $tab . '_' . $section,
                     'wpinv_settings_' . $tab . '_' . $section,
                     array(
                         'section'     => $section,
-                        'id'          => isset( $option['id'] )          ? $option['id']          : null,
-                        'desc'        => ! empty( $option['desc'] )      ? $option['desc']        : '',
-                        'name'        => isset( $option['name'] )        ? $option['name']        : null,
-                        'size'        => isset( $option['size'] )        ? $option['size']        : null,
-                        'options'     => isset( $option['options'] )     ? $option['options']     : '',
-                        'selected'    => isset( $option['selected'] )    ? $option['selected']    : null,
-                        'std'         => isset( $option['std'] )         ? $option['std']         : '',
-                        'min'         => isset( $option['min'] )         ? $option['min']         : null,
-                        'max'         => isset( $option['max'] )         ? $option['max']         : null,
-                        'step'        => isset( $option['step'] )        ? $option['step']        : null,
-                        'chosen'      => isset( $option['chosen'] )      ? $option['chosen']      : null,
-                        'placeholder' => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-                        'allow_blank' => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-                        'readonly'    => isset( $option['readonly'] )    ? $option['readonly']    : false,
-                        'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
-                        'onchange'    => !empty( $option['onchange'] )   ? $option['onchange']    : '',
-                        'custom'      => !empty( $option['custom'] )     ? $option['custom']      : '',
-                        'class'       =>  !empty( $option['class'] )     ? $option['class']      : '',
-                        'cols'        => !empty( $option['cols'] ) && (int)$option['cols'] > 0 ? (int)$option['cols'] : 50,
-                        'rows'        => !empty( $option['rows'] ) && (int)$option['rows'] > 0 ? (int)$option['rows'] : 5,
+                        'id'          => isset($option['id']) ? $option['id'] : null,
+                        'desc'        => !empty($option['desc']) ? $option['desc'] : '',
+                        'name'        => isset($option['name']) ? $option['name'] : null,
+                        'size'        => isset($option['size']) ? $option['size'] : null,
+                        'options'     => isset($option['options']) ? $option['options'] : '',
+                        'selected'    => isset($option['selected']) ? $option['selected'] : null,
+                        'std'         => isset($option['std']) ? $option['std'] : '',
+                        'min'         => isset($option['min']) ? $option['min'] : null,
+                        'max'         => isset($option['max']) ? $option['max'] : null,
+                        'step'        => isset($option['step']) ? $option['step'] : null,
+                        'chosen'      => isset($option['chosen']) ? $option['chosen'] : null,
+                        'placeholder' => isset($option['placeholder']) ? $option['placeholder'] : null,
+                        'allow_blank' => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+                        'readonly'    => isset($option['readonly']) ? $option['readonly'] : false,
+                        'faux'        => isset($option['faux']) ? $option['faux'] : false,
+                        'onchange'    => !empty($option['onchange']) ? $option['onchange'] : '',
+                        'custom'      => !empty($option['custom']) ? $option['custom'] : '',
+                        'class'       =>  !empty($option['class']) ? $option['class'] : '',
+                        'cols'        => !empty($option['cols']) && (int)$option['cols'] > 0 ? (int)$option['cols'] : 50,
+                        'rows'        => !empty($option['rows']) && (int)$option['rows'] > 0 ? (int)$option['rows'] : 5,
                     )
                 );
             }
@@ -154,180 +154,180 @@ 
     }
 
     // Creates our settings in the options table
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 function wpinv_get_registered_settings() {
-    $pages = wpinv_get_pages( true );
+    $pages = wpinv_get_pages(true);
     
     $currencies = wpinv_get_currencies();
     
     $currency_code_options = array();
-    foreach ( $currencies as $code => $name ) {
-        $currency_code_options[ $code ] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol( $code ) . ')';
+    foreach ($currencies as $code => $name) {
+        $currency_code_options[$code] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol($code) . ')';
     }
     
     $due_payment_options       = array();
-    $due_payment_options[0]    = __( 'Now', 'invoicing' );
-    for ( $i = 1; $i <= 30; $i++ ) {
+    $due_payment_options[0]    = __('Now', 'invoicing');
+    for ($i = 1; $i <= 30; $i++) {
         $due_payment_options[$i] = $i;
     }
     
     $invoice_number_padd_options = array();
-    for ( $i = 0; $i <= 20; $i++ ) {
+    for ($i = 0; $i <= 20; $i++) {
         $invoice_number_padd_options[$i] = $i;
     }
     
     $currency_symbol = wpinv_currency_symbol();
     
     $last_number = '';
-    if ( $last_invoice_number = get_option( 'wpinv_last_invoice_number' ) ) {
-        $last_invoice_number = is_numeric( $last_invoice_number ) ? $last_invoice_number : wpinv_clean_invoice_number( $last_invoice_number );
+    if ($last_invoice_number = get_option('wpinv_last_invoice_number')) {
+        $last_invoice_number = is_numeric($last_invoice_number) ? $last_invoice_number : wpinv_clean_invoice_number($last_invoice_number);
 
-        if ( !empty( $last_invoice_number ) ) {
-            $last_number = ' ' . wp_sprintf( __( "( Last Invoice's sequential number: <b>%s</b> )", 'invoicing' ), $last_invoice_number );
+        if (!empty($last_invoice_number)) {
+            $last_number = ' ' . wp_sprintf(__("( Last Invoice's sequential number: <b>%s</b> )", 'invoicing'), $last_invoice_number);
         }
     }
     
     $alert_wrapper_start = '<p style="color: #F00">';
     $alert_wrapper_close = '</p>';
     $wpinv_settings = array(
-        'general' => apply_filters( 'wpinv_settings_general',
+        'general' => apply_filters('wpinv_settings_general',
             array(
                 'main' => array(
                     'location_settings' => array(
                         'id'   => 'location_settings',
-                        'name' => '<h3>' . __( 'Default Location', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Default Location', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'default_country' => array(
                         'id'      => 'default_country',
-                        'name'    => __( 'Default Country', 'invoicing' ),
-                        'desc'    => __( 'Where does your store operate from?', 'invoicing' ),
+                        'name'    => __('Default Country', 'invoicing'),
+                        'desc'    => __('Where does your store operate from?', 'invoicing'),
                         'type'    => 'select',
                         'options' => wpinv_get_country_list(),
                         'std'     => 'GB',
                         'chosen'  => true,
-                        'placeholder' => __( 'Select a country', 'invoicing' ),
+                        'placeholder' => __('Select a country', 'invoicing'),
                     ),
                     'default_state' => array(
                         'id'      => 'default_state',
-                        'name'    => __( 'Default State / Province', 'invoicing' ),
-                        'desc'    => __( 'What state / province does your store operate from?', 'invoicing' ),
+                        'name'    => __('Default State / Province', 'invoicing'),
+                        'desc'    => __('What state / province does your store operate from?', 'invoicing'),
                         'type'    => 'country_states',
-                        'placeholder' => __( 'Select a state', 'invoicing' ),
+                        'placeholder' => __('Select a state', 'invoicing'),
                     ),
                     'store_name' => array(
                         'id'   => 'store_name',
-                        'name' => __( 'Store Name', 'invoicing' ),
-                        'desc' => __( 'Store name to print on invoices.', 'invoicing' ),
+                        'name' => __('Store Name', 'invoicing'),
+                        'desc' => __('Store name to print on invoices.', 'invoicing'),
                         'std'     => get_option('blogname'),
                         'type' => 'text',
                     ),
                     'logo' => array(
                         'id'   => 'logo',
-                        'name' => __( 'Logo URL', 'invoicing' ),
-                        'desc' => __( 'Store logo to print on invoices.', 'invoicing' ),
+                        'name' => __('Logo URL', 'invoicing'),
+                        'desc' => __('Store logo to print on invoices.', 'invoicing'),
                         'type' => 'text',
                     ),
                     'store_address' => array(
                         'id'   => 'store_address',
-                        'name' => __( 'Store Address', 'invoicing' ),
-                        'desc' => __( 'Enter the store address to display on invoice', 'invoicing' ),
+                        'name' => __('Store Address', 'invoicing'),
+                        'desc' => __('Enter the store address to display on invoice', 'invoicing'),
                         'type' => 'textarea',
                     ),
                     'page_settings' => array(
                         'id'   => 'page_settings',
-                        'name' => '<h3>' . __( 'Page Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Page Settings', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'checkout_page' => array(
                         'id'          => 'checkout_page',
-                        'name'        => __( 'Checkout Page', 'invoicing' ),
-                        'desc'        => __( 'This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing' ),
+                        'name'        => __('Checkout Page', 'invoicing'),
+                        'desc'        => __('This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'success_page' => array(
                         'id'          => 'success_page',
-                        'name'        => __( 'Success Page', 'invoicing' ),
-                        'desc'        => __( 'This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing' ),
+                        'name'        => __('Success Page', 'invoicing'),
+                        'desc'        => __('This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'failure_page' => array(
                         'id'          => 'failure_page',
-                        'name'        => __( 'Failed Transaction Page', 'invoicing' ),
-                        'desc'        => __( 'This is the page buyers are sent to if their transaction is cancelled or fails', 'invoicing' ),
+                        'name'        => __('Failed Transaction Page', 'invoicing'),
+                        'desc'        => __('This is the page buyers are sent to if their transaction is cancelled or fails', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'invoice_history_page' => array(
                         'id'          => 'invoice_history_page',
-                        'name'        => __( 'Invoice History Page', 'invoicing' ),
-                        'desc'        => __( 'This page shows an invoice history for the current user', 'invoicing' ),
+                        'name'        => __('Invoice History Page', 'invoicing'),
+                        'desc'        => __('This page shows an invoice history for the current user', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     )
                 ),
                 'currency_section' => array(
                     'currency_settings' => array(
                         'id'   => 'currency_settings',
-                        'name' => '<h3>' . __( 'Currency Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Currency Settings', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'currency' => array(
                         'id'      => 'currency',
-                        'name'    => __( 'Currency', 'invoicing' ),
-                        'desc'    => __( 'Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing' ),
+                        'name'    => __('Currency', 'invoicing'),
+                        'desc'    => __('Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing'),
                         'type'    => 'select',
                         'options' => $currency_code_options,
                         'chosen'  => true,
                     ),
                     'currency_position' => array(
                         'id'      => 'currency_position',
-                        'name'    => __( 'Currency Position', 'invoicing' ),
-                        'desc'    => __( 'Choose the location of the currency sign.', 'invoicing' ),
+                        'name'    => __('Currency Position', 'invoicing'),
+                        'desc'    => __('Choose the location of the currency sign.', 'invoicing'),
                         'type'    => 'select',
                         'options'  => array(
-                            'left'        => __( 'Left', 'invoicing' ) . ' (' . $currency_symbol . wpinv_format_amount( '99.99' ) . ')',
-                            'right'       => __( 'Right', 'invoicing' ) . ' ('. wpinv_format_amount( '99.99' ) . $currency_symbol . ')',
-                            'left_space'  => __( 'Left with space', 'invoicing' ) . ' (' . $currency_symbol . ' ' . wpinv_format_amount( '99.99' ) . ')',
-                            'right_space' => __( 'Right with space', 'invoicing' ) . ' (' . wpinv_format_amount( '99.99' ) . ' ' . $currency_symbol . ')'
+                            'left'        => __('Left', 'invoicing') . ' (' . $currency_symbol . wpinv_format_amount('99.99') . ')',
+                            'right'       => __('Right', 'invoicing') . ' (' . wpinv_format_amount('99.99') . $currency_symbol . ')',
+                            'left_space'  => __('Left with space', 'invoicing') . ' (' . $currency_symbol . ' ' . wpinv_format_amount('99.99') . ')',
+                            'right_space' => __('Right with space', 'invoicing') . ' (' . wpinv_format_amount('99.99') . ' ' . $currency_symbol . ')'
                         )
                     ),
                     'thousands_separator' => array(
                         'id'   => 'thousands_separator',
-                        'name' => __( 'Thousands Separator', 'invoicing' ),
-                        'desc' => __( 'The symbol (usually , or .) to separate thousands', 'invoicing' ),
+                        'name' => __('Thousands Separator', 'invoicing'),
+                        'desc' => __('The symbol (usually , or .) to separate thousands', 'invoicing'),
                         'type' => 'text',
                         'size' => 'small',
                         'std'  => ',',
                     ),
                     'decimal_separator' => array(
                         'id'   => 'decimal_separator',
-                        'name' => __( 'Decimal Separator', 'invoicing' ),
-                        'desc' => __( 'The symbol (usually , or .) to separate decimal points', 'invoicing' ),
+                        'name' => __('Decimal Separator', 'invoicing'),
+                        'desc' => __('The symbol (usually , or .) to separate decimal points', 'invoicing'),
                         'type' => 'text',
                         'size' => 'small',
                         'std'  => '.',
                     ),
                     'decimals' => array(
                         'id'   => 'decimals',
-                        'name' => __( 'Number of Decimals', 'invoicing' ),
-                        'desc' => __( 'This sets the number of decimal points shown in displayed prices.', 'invoicing' ),
+                        'name' => __('Number of Decimals', 'invoicing'),
+                        'desc' => __('This sets the number of decimal points shown in displayed prices.', 'invoicing'),
                         'type' => 'number',
                         'size' => 'small',
                         'std'  => '2',
@@ -339,29 +339,29 @@ 
                 'labels' => array(
                     'labels' => array(
                         'id'   => 'labels_settings',
-                        'name' => '<h3>' . __( 'Invoice Labels', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Invoice Labels', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'vat_name' => array(
                         'id' => 'vat_name',
-                        'name' => __( 'VAT Name', 'invoicing' ),
-                        'desc' => __( 'Enter the VAT name', 'invoicing' ),
+                        'name' => __('VAT Name', 'invoicing'),
+                        'desc' => __('Enter the VAT name', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => 'VAT'
                     ),
                     'vat_invoice_notice_label' => array(
                         'id' => 'vat_invoice_notice_label',
-                        'name' => __( 'Invoice Notice Label', 'invoicing' ),
-                        'desc' => __( 'Use this to add an invoice notice section (label) to your invoices', 'invoicing' ),
+                        'name' => __('Invoice Notice Label', 'invoicing'),
+                        'desc' => __('Use this to add an invoice notice section (label) to your invoices', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                     ),
                     'vat_invoice_notice' => array(
                         'id' => 'vat_invoice_notice',
-                        'name' => __( 'Invoice notice', 'invoicing' ),
-                        'desc' =>   __( 'Use this to add an invoice notice section (description) to your invoices', 'invoicing' ),
+                        'name' => __('Invoice notice', 'invoicing'),
+                        'desc' =>   __('Use this to add an invoice notice section (description) to your invoices', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                     )
@@ -373,22 +373,22 @@ 
                 'main' => array(
                     'gateway_settings' => array(
                         'id'   => 'api_header',
-                        'name' => '<h3>' . __( 'Gateway Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Gateway Settings', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'gateways' => array(
                         'id'      => 'gateways',
-                        'name'    => __( 'Payment Gateways', 'invoicing' ),
-                        'desc'    => __( 'Choose the payment gateways you want to enable.', 'invoicing' ),
+                        'name'    => __('Payment Gateways', 'invoicing'),
+                        'desc'    => __('Choose the payment gateways you want to enable.', 'invoicing'),
                         'type'    => 'gateways',
                         'std'     => array('manual'=>1),
                         'options' => wpinv_get_payment_gateways(),
                     ),
                     'default_gateway' => array(
                         'id'      => 'default_gateway',
-                        'name'    => __( 'Default Gateway', 'invoicing' ),
-                        'desc'    => __( 'This gateway will be loaded automatically with the checkout page.', 'invoicing' ),
+                        'name'    => __('Default Gateway', 'invoicing'),
+                        'desc'    => __('This gateway will be loaded automatically with the checkout page.', 'invoicing'),
                         'type'    => 'gateway_select',
                         'std'     => 'manual',
                         'options' => wpinv_get_payment_gateways(),
@@ -402,19 +402,19 @@ 
                 'main' => array(
                     'tax_settings' => array(
                         'id'   => 'tax_settings',
-                        'name' => '<h3>' . __( 'Tax Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Tax Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'enable_taxes' => array(
                         'id'   => 'enable_taxes',
-                        'name' => __( 'Enable Taxes', 'invoicing' ),
-                        'desc' => __( 'Check this to enable taxes on invoices.', 'invoicing' ),
+                        'name' => __('Enable Taxes', 'invoicing'),
+                        'desc' => __('Check this to enable taxes on invoices.', 'invoicing'),
                         'type' => 'checkbox',
                     ),
                     'tax_rate' => array(
                         'id'   => 'tax_rate',
-                        'name' => __( 'Fallback Tax Rate', 'invoicing' ),
-                        'desc' => __( 'Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing' ),
+                        'name' => __('Fallback Tax Rate', 'invoicing'),
+                        'desc' => __('Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing'),
                         'type' => 'number',
                         'size' => 'small',
                         'min'  => '0',
@@ -426,8 +426,8 @@ 
                 'rates' => array(
                     'tax_rates' => array(
                         'id'   => 'tax_rates',
-                        'name' => '<h3>' . __( 'Tax Rates', 'invoicing' ) . '</h3>',
-                        'desc' => __( 'Enter tax rates for specific regions.', 'invoicing' ),
+                        'name' => '<h3>' . __('Tax Rates', 'invoicing') . '</h3>',
+                        'desc' => __('Enter tax rates for specific regions.', 'invoicing'),
                         'type' => 'tax_rates',
                     ),
                 )
@@ -439,62 +439,62 @@ 
                 'main' => array(
                     'email_settings_header' => array(
                         'id'   => 'email_settings_header',
-                        'name' => '<h3>' . __( 'Email Sender Options', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Email Sender Options', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'email_from_name' => array(
                         'id'   => 'email_from_name',
-                        'name' => __( 'From Name', 'invoicing' ),
-                        'desc' => __( 'Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing' ),
-                        'std' => esc_attr( get_bloginfo( 'name', 'display' ) ),
+                        'name' => __('From Name', 'invoicing'),
+                        'desc' => __('Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing'),
+                        'std' => esc_attr(get_bloginfo('name', 'display')),
                         'type' => 'text',
                     ),
                     'email_from' => array(
                         'id'   => 'email_from',
-                        'name' => __( 'From Email', 'invoicing' ),
-                        'desc' => sprintf (__( 'Email address to send invoice emails from. This will act as the "from" and "reply-to" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing' ), $alert_wrapper_start, $alert_wrapper_close),
-                        'std' => get_option( 'admin_email' ),
+                        'name' => __('From Email', 'invoicing'),
+                        'desc' => sprintf(__('Email address to send invoice emails from. This will act as the "from" and "reply-to" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing'), $alert_wrapper_start, $alert_wrapper_close),
+                        'std' => get_option('admin_email'),
                         'type' => 'text',
                     ),
                     'overdue_settings_header' => array(
                         'id'   => 'overdue_settings_header',
-                        'name' => '<h3>' . __( 'Due Date Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Due Date Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'overdue_active' => array(
                         'id'   => 'overdue_active',
-                        'name' => __( 'Enable Due Date', 'invoicing' ),
-                        'desc' => __( 'Check this to enable due date option for invoices.', 'invoicing' ),
+                        'name' => __('Enable Due Date', 'invoicing'),
+                        'desc' => __('Check this to enable due date option for invoices.', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => false,
                     ),
                     'overdue_days' => array(
                         'id'          => 'overdue_days',
-                        'name'        => __( 'Default Due Date', 'invoicing' ),
-                        'desc'        => __( 'Number of days each Invoice is due after the created date. This will automatically set the date in the "Due Date" field. Can be overridden on individual Invoices.', 'invoicing' ),
+                        'name'        => __('Default Due Date', 'invoicing'),
+                        'desc'        => __('Number of days each Invoice is due after the created date. This will automatically set the date in the "Due Date" field. Can be overridden on individual Invoices.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $due_payment_options,
                         'chosen'      => true,
                         'std'         => 0,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'email_template_header' => array(
                         'id'   => 'email_template_header',
-                        'name' => '<h3>' . __( 'Email Template', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Email Template', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'email_header_image' => array(
                         'id'   => 'email_header_image',
-                        'name' => __( 'Header Image', 'invoicing' ),
-                        'desc' => __( 'URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing' ),
+                        'name' => __('Header Image', 'invoicing'),
+                        'desc' => __('URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing'),
                         'std' => '',
                         'type' => 'text',
                     ),
                     'email_footer_text' => array(
                         'id'   => 'email_footer_text',
-                        'name' => __( 'Footer Text', 'invoicing' ),
-                        'desc' => __( 'The text to appear in the footer of all invoice emails.', 'invoicing' ),
-                        'std' => get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GeoDirectory', 'invoicing' ),
+                        'name' => __('Footer Text', 'invoicing'),
+                        'desc' => __('The text to appear in the footer of all invoice emails.', 'invoicing'),
+                        'std' => get_bloginfo('name', 'display') . ' - ' . __('Powered by GeoDirectory', 'invoicing'),
                         'type' => 'textarea',
                         'class' => 'regular-text',
                         'rows' => 2,
@@ -502,29 +502,29 @@ 
                     ),
                     'email_base_color' => array(
                         'id'   => 'email_base_color',
-                        'name' => __( 'Base Color', 'invoicing' ),
-                        'desc' => __( 'The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing' ),
+                        'name' => __('Base Color', 'invoicing'),
+                        'desc' => __('The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing'),
                         'std' => '#557da2',
                         'type' => 'color',
                     ),
                     'email_background_color' => array(
                         'id'   => 'email_background_color',
-                        'name' => __( 'Background Color', 'invoicing' ),
-                        'desc' => __( 'The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing' ),
+                        'name' => __('Background Color', 'invoicing'),
+                        'desc' => __('The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing'),
                         'std' => '#f5f5f5',
                         'type' => 'color',
                     ),
                     'email_body_background_color' => array(
                         'id'   => 'email_body_background_color',
-                        'name' => __( 'Body Background Color', 'invoicing' ),
-                        'desc' => __( 'The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing' ),
+                        'name' => __('Body Background Color', 'invoicing'),
+                        'desc' => __('The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing'),
                         'std' => '#fdfdfd',
                         'type' => 'color',
                     ),
                     'email_text_color' => array(
                         'id'   => 'email_text_color',
-                        'name' => __( 'Body Text Color', 'invoicing' ),
-                        'desc' => __( 'The main body text color. Default <code>#505050</code>.', 'invoicing' ),
+                        'name' => __('Body Text Color', 'invoicing'),
+                        'desc' => __('The main body text color. Default <code>#505050</code>.', 'invoicing'),
                         'std' => '#505050',
                         'type' => 'color',
                     ),
@@ -543,19 +543,19 @@ 
                 'main' => array(
                     'invoice_number_format_settings' => array(
                         'id'   => 'invoice_number_format_settings',
-                        'name' => '<h3>' . __( 'Invoice Number', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Invoice Number', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'sequential_invoice_number' => array(
                         'id'   => 'sequential_invoice_number',
-                        'name' => __( 'Sequential Invoice Numbers', 'invoicing' ),
-                        'desc' => __( 'Check this box to enable sequential invoice numbers.', 'invoicing' ),
+                        'name' => __('Sequential Invoice Numbers', 'invoicing'),
+                        'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing'),
                         'type' => 'checkbox',
                     ),
                     'invoice_sequence_start' => array(
                         'id'   => 'invoice_sequence_start',
-                        'name' => __( 'Sequential Starting Number', 'invoicing' ),
-                        'desc' => __( 'The number at which the invoice number sequence should begin.', 'invoicing' ) . $last_number,
+                        'name' => __('Sequential Starting Number', 'invoicing'),
+                        'desc' => __('The number at which the invoice number sequence should begin.', 'invoicing') . $last_number,
                         'type' => 'number',
                         'size' => 'small',
                         'std'  => '1',
@@ -563,8 +563,8 @@ 
                     ),
                     'invoice_number_padd' => array(
                         'id'      => 'invoice_number_padd',
-                        'name'    => __( 'Minimum Digits', 'invoicing' ),
-                        'desc'    => __( 'If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing' ),
+                        'name'    => __('Minimum Digits', 'invoicing'),
+                        'desc'    => __('If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing'),
                         'type'    => 'select',
                         'options' => $invoice_number_padd_options,
                         'std'     => 5,
@@ -572,8 +572,8 @@ 
                     ),
                     'invoice_number_prefix' => array(
                         'id' => 'invoice_number_prefix',
-                        'name' => __( 'Invoice Number Prefix', 'invoicing' ),
-                        'desc' => __( 'Prefix for all invoice numbers. Ex: WPINV-', 'invoicing' ),
+                        'name' => __('Invoice Number Prefix', 'invoicing'),
+                        'desc' => __('Prefix for all invoice numbers. Ex: WPINV-', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => 'WPINV-',
@@ -581,32 +581,32 @@ 
                     ),
                     'invoice_number_postfix' => array(
                         'id' => 'invoice_number_postfix',
-                        'name' => __( 'Invoice Number Postfix', 'invoicing' ),
-                        'desc' => __( 'Postfix for all invoice numbers.', 'invoicing' ),
+                        'name' => __('Invoice Number Postfix', 'invoicing'),
+                        'desc' => __('Postfix for all invoice numbers.', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => ''
                     ),
                     'checkout_settings' => array(
                         'id'   => 'checkout_settings',
-                        'name' => '<h3>' . __( 'Checkout Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Checkout Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'login_to_checkout' => array(
                         'id'   => 'login_to_checkout',
-                        'name' => __( 'Require Login To Checkout', 'invoicing' ),
-                        'desc' => __( 'If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing' ),
+                        'name' => __('Require Login To Checkout', 'invoicing'),
+                        'desc' => __('If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing'),
                         'type' => 'checkbox',
                     ),
                     'uninstall_settings' => array(
                         'id'   => 'uninstall_settings',
-                        'name' => '<h3>' . __( 'Uninstall Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Uninstall Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'remove_data_on_unistall' => array(
                         'id'   => 'remove_data_on_unistall',
-                        'name' => __( 'Remove Data on Uninstall?', 'invoicing' ),
-                        'desc' => __( 'Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing' ),
+                        'name' => __('Remove Data on Uninstall?', 'invoicing'),
+                        'desc' => __('Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => ''
                     ),
@@ -614,74 +614,74 @@ 
                 'fields' => array(
                     'fields_settings' => array(
                         'id'   => 'fields_settings',
-                        'name' => '<h3>' . __( 'Address Fields', 'invoicing' ) . '</h3>',
-                        'desc' => __( 'Tick fields which are mandatory in invoice address fields.', 'invoicing' ),
+                        'name' => '<h3>' . __('Address Fields', 'invoicing') . '</h3>',
+                        'desc' => __('Tick fields which are mandatory in invoice address fields.', 'invoicing'),
                         'type' => 'header',
                     ),
                     'fname_mandatory' => array(
                         'id'   => 'fname_mandatory',
-                        'name' => __( 'First Name', 'invoicing' ),
+                        'name' => __('First Name', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'lname_mandatory' => array(
                         'id'   => 'lname_mandatory',
-                        'name' => __( 'Last Name', 'invoicing' ),
+                        'name' => __('Last Name', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'address_mandatory' => array(
                         'id'   => 'address_mandatory',
-                        'name' => __( 'Address', 'invoicing' ),
+                        'name' => __('Address', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'city_mandatory' => array(
                         'id'   => 'city_mandatory',
-                        'name' => __( 'City', 'invoicing' ),
+                        'name' => __('City', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'country_mandatory' => array(
                         'id'   => 'country_mandatory',
-                        'name' => __( 'Country', 'invoicing' ),
+                        'name' => __('Country', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'state_mandatory' => array(
                         'id'   => 'state_mandatory',
-                        'name' => __( 'State / Province', 'invoicing' ),
+                        'name' => __('State / Province', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'zip_mandatory' => array(
                         'id'   => 'zip_mandatory',
-                        'name' => __( 'ZIP / Postcode', 'invoicing' ),
+                        'name' => __('ZIP / Postcode', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'phone_mandatory' => array(
                         'id'   => 'phone_mandatory',
-                        'name' => __( 'Phone Number', 'invoicing' ),
+                        'name' => __('Phone Number', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'address_autofill_settings' => array(
                         'id'   => 'address_autofill_settings',
-                        'name' => '<h3>' . __( 'Google Address Auto Complete', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Google Address Auto Complete', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'address_autofill_active' => array(
                         'id'   => 'address_autofill_active',
-                        'name' => __( 'Enable/Disable', 'invoicing' ),
-                        'desc' => __( 'Enable google address auto complete', 'invoicing' ),
+                        'name' => __('Enable/Disable', 'invoicing'),
+                        'desc' => __('Enable google address auto complete', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => 0
                     ),
                     'address_autofill_api' => array(
                         'id' => 'address_autofill_api',
-                        'name' => __( 'Google Place API Key', 'invoicing' ),
-                        'desc' => wp_sprintf(__( 'Enter google place API key. For more information go to google place API %sdocumenation%s', 'invoicing' ), '<a href="https://developers.google.com/maps/documentation/javascript/places-autocomplete" target="_blank">', '</a>' ),
+                        'name' => __('Google Place API Key', 'invoicing'),
+                        'desc' => wp_sprintf(__('Enter google place API key. For more information go to google place API %sdocumenation%s', 'invoicing'), '<a href="https://developers.google.com/maps/documentation/javascript/places-autocomplete" target="_blank">', '</a>'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => ''
@@ -695,8 +695,8 @@ 
                 'main' => array(
                     'tool_settings' => array(
                         'id'   => 'tool_settings',
-                        'name' => '<h3>' . __( 'Diagnostic Tools', 'invoicing' ) . '</h3>',
-                        'desc' => __( 'Invoicing diagnostic tools', 'invoicing' ),
+                        'name' => '<h3>' . __('Diagnostic Tools', 'invoicing') . '</h3>',
+                        'desc' => __('Invoicing diagnostic tools', 'invoicing'),
                         'type' => 'tools',
                     ),
                 ),
@@ -704,135 +704,135 @@ 
         )
     );
 
-    return apply_filters( 'wpinv_registered_settings', $wpinv_settings );
+    return apply_filters('wpinv_registered_settings', $wpinv_settings);
 }
 
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
     global $wpinv_options;
 
-    if ( empty( $_POST['_wp_http_referer'] ) ) {
+    if (empty($_POST['_wp_http_referer'])) {
         return $input;
     }
 
-    parse_str( $_POST['_wp_http_referer'], $referrer );
+    parse_str($_POST['_wp_http_referer'], $referrer);
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][ $key ]['type'] ) ? $settings[ $tab ][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$key]['type']) ? $settings[$tab][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[$key] = apply_filters( 'wpinv_settings_sanitize_' . $type, $value, $key );
+            $input[$key] = apply_filters('wpinv_settings_sanitize_' . $type, $value, $key);
         }
 
         // General filter
-        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = $section == 'main' ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = $section == 'main' ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings = array_merge( $main_settings, $section_settings );
+    $found_settings = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( empty( $input[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (empty($input[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
 
-function wpinv_settings_sanitize_misc_accounting( $input ) {
+function wpinv_settings_sanitize_misc_accounting($input) {
     global $wpinv_options, $wpi_session;
 
-    if ( !current_user_can( 'manage_options' ) ) {
+    if (!current_user_can('manage_options')) {
         return $input;
     }
 
-    if( ! empty( $input['enable_sequential'] ) && !wpinv_get_option( 'enable_sequential' ) ) {
+    if (!empty($input['enable_sequential']) && !wpinv_get_option('enable_sequential')) {
         // Shows an admin notice about upgrading previous order numbers
-        $wpi_session->set( 'upgrade_sequential', '1' );
+        $wpi_session->set('upgrade_sequential', '1');
     }
 
     return $input;
 }
-add_filter( 'wpinv_settings_misc-accounting_sanitize', 'wpinv_settings_sanitize_misc_accounting' );
+add_filter('wpinv_settings_misc-accounting_sanitize', 'wpinv_settings_sanitize_misc_accounting');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if( !current_user_can( 'manage_options' ) ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!current_user_can('manage_options')) {
         return $input;
     }
 
-    $new_rates = !empty( $_POST['tax_rates'] ) ? array_values( $_POST['tax_rates'] ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? array_values($_POST['tax_rates']) : array();
 
     $tax_rates = array();
 
-    if ( !empty( $new_rates ) ) {
-        foreach ( $new_rates as $rate ) {
-            if ( isset( $rate['country'] ) && empty( $rate['country'] ) && empty( $rate['state'] ) ) {
+    if (!empty($new_rates)) {
+        foreach ($new_rates as $rate) {
+            if (isset($rate['country']) && empty($rate['country']) && empty($rate['state'])) {
                 continue;
             }
             
-            $rate['rate'] = wpinv_sanitize_amount( $rate['rate'], 4 );
+            $rate['rate'] = wpinv_sanitize_amount($rate['rate'], 4);
             
             $tax_rates[] = $rate;
         }
     }
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
-function wpinv_sanitize_text_field( $input ) {
-    return trim( $input );
+function wpinv_sanitize_text_field($input) {
+    return trim($input);
 }
-add_filter( 'wpinv_settings_sanitize_text', 'wpinv_sanitize_text_field' );
+add_filter('wpinv_settings_sanitize_text', 'wpinv_sanitize_text_field');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-    $tabs['emails']   = __( 'Emails', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
-
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+    $tabs['emails']   = __('Emails', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
+
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
-    } else if ( $tab ) {
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
+    } else if ($tab) {
         $tabs = false;
     }
 
@@ -842,136 +842,136 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
     $sections = array(
-        'general' => apply_filters( 'wpinv_settings_sections_general', array(
-            'main' => __( 'General Settings', 'invoicing' ),
-            'currency_section' => __( 'Currency Settings', 'invoicing' ),
-            'labels' => __( 'Label Texts', 'invoicing' ),
-        ) ),
-        'gateways' => apply_filters( 'wpinv_settings_sections_gateways', array(
-            'main' => __( 'Gateway Settings', 'invoicing' ),
-        ) ),
-        'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
-            'main' => __( 'Tax Settings', 'invoicing' ),
-            'rates' => __( 'Tax Rates', 'invoicing' ),
-        ) ),
-        'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
-            'main' => __( 'Email Settings', 'invoicing' ),
-        ) ),
-        'misc' => apply_filters( 'wpinv_settings_sections_misc', array(
-            'main' => __( 'Miscellaneous', 'invoicing' ),
-            'fields' => __( 'Fields Settings', 'invoicing' ),
-        ) ),
-        'tools' => apply_filters( 'wpinv_settings_sections_tools', array(
-            'main' => __( 'Diagnostic Tools', 'invoicing' ),
-        ) ),
+        'general' => apply_filters('wpinv_settings_sections_general', array(
+            'main' => __('General Settings', 'invoicing'),
+            'currency_section' => __('Currency Settings', 'invoicing'),
+            'labels' => __('Label Texts', 'invoicing'),
+        )),
+        'gateways' => apply_filters('wpinv_settings_sections_gateways', array(
+            'main' => __('Gateway Settings', 'invoicing'),
+        )),
+        'taxes' => apply_filters('wpinv_settings_sections_taxes', array(
+            'main' => __('Tax Settings', 'invoicing'),
+            'rates' => __('Tax Rates', 'invoicing'),
+        )),
+        'emails' => apply_filters('wpinv_settings_sections_emails', array(
+            'main' => __('Email Settings', 'invoicing'),
+        )),
+        'misc' => apply_filters('wpinv_settings_sections_misc', array(
+            'main' => __('Miscellaneous', 'invoicing'),
+            'fields' => __('Fields Settings', 'invoicing'),
+        )),
+        'tools' => apply_filters('wpinv_settings_sections_tools', array(
+            'main' => __('Diagnostic Tools', 'invoicing'),
+        )),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
+function wpinv_get_pages($with_slug = false, $default_label = NULL) {
 	$pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== NULL && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
         echo $args['desc'];
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 	global $wpinv_options;
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	} elseif (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key($args['id']) . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '" />';
     
 	echo $html;
 }
 
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	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 ) : '';
+	$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>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 	global $wpinv_options;
 	
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$sanitize_id = wpinv_sanitize_key($args['id']);
 	
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
+	if (!empty($args['options'])) {
+		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 '<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><br/>';
+			echo '<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><br/>';
 		endforeach;
 		echo '<p class="description">' . $args['desc'] . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
+			if (isset($wpinv_options[$args['id']][$key])) {
 				$enabled = $option;
 			} else {
 				$enabled = NULL;
@@ -979,196 +979,196 @@ 
 
 			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+					echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
+					$card = strtolower(str_replace(' ', '', $option));
 
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+					if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+						$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+						$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 						$content_dir = WP_CONTENT_DIR;
 
-						if ( function_exists( 'wp_normalize_path' ) ) {
+						if (function_exists('wp_normalize_path')) {
 							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
+							$image = wp_normalize_path($image);
+							$content_dir = wp_normalize_path($content_dir);
 						}
 
-						$image = str_replace( $content_dir, content_url(), $image );
+						$image = str_replace($content_dir, content_url(), $image);
 					}
 
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+					echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
 			echo $option . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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);
         
         $checked = false;
 
-		if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
+		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'] ] ) )
+		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/>';
+		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 ) {
+function wpinv_gateways_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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 ] ) )
+        if (isset($wpinv_options['gateways'][$key]))
 			$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/>';
+		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;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
 	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']">';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            $selected = selected( $key, $args['selected'], false );
+	foreach ($args['options'] as $key => $option) :
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            $selected = selected($key, $args['selected'], false);
         } else {
-            $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
+            $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>';
+		echo '<option value="' . wpinv_sanitize_key($key) . '"' . $selected . '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+	$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>';
+	$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 ) {
+function wpinv_number_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$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'] ) : '';
+	$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>';
+	$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 ) {
+function wpinv_textarea_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$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';
+    $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;
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$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;
 }
 
 function wpinv_missing_callback($args) {
 	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+		__('The callback function used for the %s setting is missing.', 'invoicing'),
 		'<strong>' . $args['id'] . '</strong>'
 	);
 }
@@ -1176,137 +1176,137 @@ 
 function wpinv_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
     
-    if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
         $value = $args['selected'];
     }
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
 	}
 
-	if ( isset( $args['chosen'] ) ) {
+	if (isset($args['chosen'])) {
 		$chosen = 'class="wpinv-chosen"';
 	} else {
 		$chosen = '';
 	}
     
-    if( !empty( $args['onchange'] ) ) {
-        $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $onchange = ' onchange="' . esc_attr($args['onchange']) . '"';
     } else {
         $onchange = '';
     }
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" ' . $chosen . 'data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" ' . $chosen . '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 .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$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 .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wpinv_options, $wp_version;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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'] : '';
+		if (empty($args['allow_blank']) && empty($value)) {
+			$value = isset($args['std']) ? $args['std'] : '';
 		}
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$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' ) ) {
+	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 ) ) );
+		wp_editor(stripslashes($value), 'wpinv_settings_' . esc_attr($args['id']), array('textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']', 'textarea_rows' => absint($rows)));
 		$html = ob_get_clean();
 	} else {
-		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	$html .= '<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;
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+	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;
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $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']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$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;
 }
@@ -1314,9 +1314,9 @@ 
 function wpinv_country_states_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -1324,17 +1324,17 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$chosen = ( $args['chosen'] ? ' wpinv-chosen' : '' );
-	$class = empty( $states ) ? ' class="wpinv-no-states' . $chosen . '"' : 'class="' . $chosen . '"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$chosen = ($args['chosen'] ? ' wpinv-chosen' : '');
+	$class = empty($states) ? ' class="wpinv-no-states' . $chosen . '"' : 'class="' . $chosen . '"';
+	$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 .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -1349,25 +1349,25 @@ 
 	<table id="wpinv_tax_rates" class="wp-list-table widefat fixed posts">
 		<thead>
 			<tr>
-				<th scope="col" class="wpinv_tax_country"><?php _e( 'Country', 'invoicing' ); ?></th>
-				<th scope="col" class="wpinv_tax_state"><?php _e( 'State / Province', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_tax_global" title="<?php esc_attr_e( 'Apply rate to whole country, regardless of state / province', 'invoicing' ); ?>"><?php _e( 'Country Wide', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_tax_rate"><?php _e( 'Rate %', 'invoicing' ); ?></th> 
-                <th scope="col" class="wpinv_tax_name"><?php _e( 'Tax Name', 'invoicing' ); ?></th>
-				<th scope="col" class="wpinv_tax_action"><?php _e( 'Remove', 'invoicing' ); ?></th>
+				<th scope="col" class="wpinv_tax_country"><?php _e('Country', 'invoicing'); ?></th>
+				<th scope="col" class="wpinv_tax_state"><?php _e('State / Province', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_tax_global" title="<?php esc_attr_e('Apply rate to whole country, regardless of state / province', 'invoicing'); ?>"><?php _e('Country Wide', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_tax_rate"><?php _e('Rate %', 'invoicing'); ?></th> 
+                <th scope="col" class="wpinv_tax_name"><?php _e('Tax Name', 'invoicing'); ?></th>
+				<th scope="col" class="wpinv_tax_action"><?php _e('Remove', 'invoicing'); ?></th>
 			</tr>
 		</thead>
         <tbody>
-		<?php if( !empty( $rates ) ) : ?>
-			<?php foreach( $rates as $key => $rate ) : ?>
+		<?php if (!empty($rates)) : ?>
+			<?php foreach ($rates as $key => $rate) : ?>
             <?php 
-            $sanitized_key = wpinv_sanitize_key( $key );
+            $sanitized_key = wpinv_sanitize_key($key);
             ?>
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
+					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'],
@@ -1375,72 +1375,72 @@ 
 						'show_option_none' => false,
 						'class'            => 'wpinv-tax-country',
 						'chosen'           => false,
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) );
+						'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 ),
+					$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,
 							'chosen'           => false,
-							'placeholder'      => __( 'Choose a state', 'invoicing' )
-						) );
+							'placeholder'      => __('Choose a state', 'invoicing')
+						));
 					} else {
-						echo wpinv_html_text( array(
+						echo wpinv_html_text(array(
 							'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
-							'value' => ! empty( $rate['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'] ) ); ?>/>
-					<label for="tax_rates[<?php echo $sanitized_key; ?>][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
+					<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'])); ?>/>
+					<label for="tax_rates[<?php echo $sanitized_key; ?>][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
 				</td>
-				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[<?php echo $sanitized_key; ?>][rate]" value="<?php echo esc_html( $rate['rate'] ); ?>"/></td>
-                <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[<?php echo $sanitized_key; ?>][name]" value="<?php echo esc_html( $rate['name'] ); ?>"/></td>
-				<td class="wpinv_tax_action"><span class="wpinv_remove_tax_rate button-secondary"><?php _e( 'Remove Rate', 'invoicing' ); ?></span></td>
+				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[<?php echo $sanitized_key; ?>][rate]" value="<?php echo esc_html($rate['rate']); ?>"/></td>
+                <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[<?php echo $sanitized_key; ?>][name]" value="<?php echo esc_html($rate['name']); ?>"/></td>
+				<td class="wpinv_tax_action"><span class="wpinv_remove_tax_rate button-secondary"><?php _e('Remove Rate', 'invoicing'); ?></span></td>
 			</tr>
 			<?php endforeach; ?>
 		<?php else : ?>
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
+					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',
 						'chosen'           => false,
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) ); ?>
+						'placeholder'      => __('Choose a country', 'invoicing')
+					)); ?>
 				</td>
 				<td class="wpinv_tax_state">
-					<?php echo wpinv_html_text( array(
+					<?php echo wpinv_html_text(array(
 						'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"/>
-					<label for="tax_rates[0][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
+					<label for="tax_rates[0][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
 				</td>
-				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[0][rate]" placeholder="<?php echo (float)wpinv_get_option( 'tax_rate', 0 ) ;?>" value="<?php echo (float)wpinv_get_option( 'tax_rate', 0 ) ;?>"/></td>
+				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[0][rate]" placeholder="<?php echo (float)wpinv_get_option('tax_rate', 0); ?>" value="<?php echo (float)wpinv_get_option('tax_rate', 0); ?>"/></td>
                 <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[0][name]" /></td>
-				<td><span class="wpinv_remove_tax_rate button-secondary"><?php _e( 'Remove Rate', 'invoicing' ); ?></span></td>
+				<td><span class="wpinv_remove_tax_rate button-secondary"><?php _e('Remove Rate', 'invoicing'); ?></span></td>
 			</tr>
 		<?php endif; ?>
         </tbody>
-        <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>
+        <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();
@@ -1451,54 +1451,54 @@ 
     ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
-    <?php if ( $args['desc'] ) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+    <?php if ($args['desc']) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php _e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php _e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php _e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php _e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php _e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php _e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
-            <?php do_action( 'wpinv_tools_row' ); ?>
+            <?php do_action('wpinv_tools_row'); ?>
         <tbody>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
     echo ob_get_clean();
 }
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return 'manage_options';
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
-function wpinv_settings_sanitize_input( $value, $key ) {
-    if ( $key == 'tax_rate' || $key == 'eu_fallback_rate' ) {
-        $value = wpinv_sanitize_amount( $value, 4 );
+function wpinv_settings_sanitize_input($value, $key) {
+    if ($key == 'tax_rate' || $key == 'eu_fallback_rate') {
+        $value = wpinv_sanitize_amount($value, 4);
         $value = $value >= 100 ? 99 : $value;
     }
         
     return $value;
 }
-add_filter( 'wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2 );
+add_filter('wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2);
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = !empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = !empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
     
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
\ No newline at end of file
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
\ No newline at end of file

includes/wpinv-helper-functions.php

Spacing +364 added lines, -364 removed lines

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