AyeCode / invoicing

includes/wpinv-template-functions.php

Doc Comments +10 added lines

@@ -136,6 +136,9 @@ 
 	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
 }
 
+/**
+ * @param string $template_name
+ */
 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 );
@@ -168,6 +171,10 @@ 
     return apply_filters( 'wpinv_locate_template', $template, $template_name, $template_path );
 }
 
+/**
+ * @param string $slug
+ * @param boolean $name
+ */
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
 	do_action( 'get_template_part_' . $slug, $slug, $name );
 
@@ -867,6 +874,9 @@ 
     return apply_filters( 'wpinv_get_watermark', $output, $id );
 }
 
+/**
+ * @param integer $id
+ */
 function wpinv_get_watermark( $id ) {
     if ( !$id > 0 ) {
         return NULL;

Indentation +98 added lines, -98 removed lines

@@ -103,29 +103,29 @@ 
 
 function wpinv_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
     if ( ! empty( $args ) && is_array( $args ) ) {
-		extract( $args );
-	}
+        extract( $args );
+    }
 
-	$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 = 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 );
 
-	if ( ! file_exists( $located ) ) {
+    if ( ! file_exists( $located ) ) {
         _doing_it_wrong( __FUNCTION__, sprintf( '<code>%s</code> does not exist.', $located ), '2.1' );
-		return;
-	}
+        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 = '' ) {
-	ob_start();
-	wpinv_get_template( $template_name, $args, $template_path, $default_path );
-	return ob_get_clean();
+    ob_start();
+    wpinv_get_template( $template_name, $args, $template_path, $default_path );
+    return ob_get_clean();
 }
 
 function wpinv_locate_template( $template_name, $template_path = '', $default_path = '' ) {
@@ -155,126 +155,126 @@ 
 }
 
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+    do_action( 'get_template_part_' . $slug, $slug, $name );
 
-	// Setup possible parts
-	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
-	$templates[] = $slug . '.php';
+    // Setup possible parts
+    $templates = array();
+    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 );
+    // Allow template parts to be filtered
+    $templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
 
-	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+    // Return the part that is found
+    return wpinv_locate_tmpl( $templates, $load, false );
 }
 
 function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
-	// No file found yet
-	$located = false;
+    // No file found yet
+    $located = false;
 
-	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+    // Try to find a template file
+    foreach ( (array)$template_names as $template_name ) {
 
-		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+        // Continue if template is empty
+        if ( empty( $template_name ) )
+            continue;
 
-		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+        // Trim off any slashes from the 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 ) {
+        // try locating this template file by looping through the template paths
+        foreach( wpinv_get_theme_template_paths() as $template_path ) {
 
-			if( file_exists( $template_path . $template_name ) ) {
-				$located = $template_path . $template_name;
-				break;
-			}
-		}
+            if( file_exists( $template_path . $template_name ) ) {
+                $located = $template_path . $template_name;
+                break;
+            }
+        }
 
-		if( !empty( $located ) ) {
-			break;
-		}
-	}
+        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;
+    return $located;
 }
 
 function wpinv_get_theme_template_paths() {
-	$template_dir = wpinv_get_theme_template_dir_name();
+    $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,
-		100 => wpinv_get_templates_dir()
-	);
+    $file_paths = array(
+        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 );
+    // sort the file paths based on priority
+    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', 'invoicing' ) );
+    return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
 }
 
 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( 'invoice_subscription_page' );
+    $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( 'invoice_subscription_page' );
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
-		return;
-	}
+    if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+        return;
+    }
 
-	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
+    echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
 add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
 
 function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+    $classes = (array)$class;
 
-	if( wpinv_is_checkout() ) {
-		$classes[] = 'wpinv-checkout';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_checkout() ) {
+        $classes[] = 'wpinv-checkout';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_success_page() ) {
-		$classes[] = 'wpinv-success';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_success_page() ) {
+        $classes[] = 'wpinv-success';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_failed_transaction_page() ) {
-		$classes[] = 'wpinv-failed-transaction';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_failed_transaction_page() ) {
+        $classes[] = 'wpinv-failed-transaction';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_invoice_history_page() ) {
-		$classes[] = 'wpinv-history';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_invoice_history_page() ) {
+        $classes[] = 'wpinv-history';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_subscriptions_history_page() ) {
-		$classes[] = 'wpinv-subscription';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_subscriptions_history_page() ) {
+        $classes[] = 'wpinv-subscription';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_test_mode() ) {
-		$classes[] = 'wpinv-test-mode';
-		$classes[] = 'wpinv-page';
-	}
+    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' );
 
@@ -1030,7 +1030,7 @@ 
 
                     $item       = $item_id ? new WPInv_Item( $item_id ) : NULL;
                     $summary    = '';
-	                $item_name    = '';
+                    $item_name    = '';
                     $cols       = 3;
                     if ( !empty($item) ) {
                         $item_name  = $item->get_name();
@@ -1408,7 +1408,7 @@ 
     $form_action  = esc_url( wpinv_get_checkout_uri() );
 
     ob_start();
-	    do_action( 'wpinv_checkout_content_before' );
+        do_action( 'wpinv_checkout_content_before' );
         echo '<div id="wpinv_checkout_wrap">';
 
         if ( wpinv_get_cart_contents() || wpinv_cart_has_fees() ) {
@@ -1431,7 +1431,7 @@ 
             do_action( 'wpinv_cart_empty' );
         }
         echo '</div><!--end #wpinv_checkout_wrap-->';
-	    do_action( 'wpinv_checkout_content_after' );
+        do_action( 'wpinv_checkout_content_after' );
     return ob_get_clean();
 }
 
@@ -1458,7 +1458,7 @@ 
 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>' );
 }
 
 /**
@@ -1468,7 +1468,7 @@ 
  * @return void
  */
 function wpinv_empty_checkout_cart() {
-	echo wpinv_empty_cart_message();
+    echo wpinv_empty_cart_message();
 }
 add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
 

Spacing +734 added lines, -734 removed lines

@@ -7,91 +7,91 @@ 
  */
  
 // 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', wpinv_get_theme_template_dir_name() );
+    return apply_filters('wpinv_template_path', wpinv_get_theme_template_dir_name());
 }
 
-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 btn-print-invoice" 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 btn-invoice-history" 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 btn-print-invoice" 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 btn-invoice-history" 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';
@@ -101,105 +101,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;
 }
@@ -208,149 +208,149 @@ 
 	$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', 'invoicing' ) );
+	return trailingslashit(apply_filters('wpinv_templates_dir', 'invoicing'));
 }
 
 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( 'invoice_subscription_page' );
+	$pages[] = wpinv_get_option('success_page');
+	$pages[] = wpinv_get_option('failure_page');
+	$pages[] = wpinv_get_option('invoice_history_page');
+	$pages[] = wpinv_get_option('invoice_subscription_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_subscriptions_history_page() ) {
+	if (wpinv_is_subscriptions_history_page()) {
 		$classes[] = 'wpinv-subscription';
 		$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,
@@ -359,8 +359,8 @@ 
         'selected'         => 0,
         '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,
@@ -368,74 +368,74 @@ 
         '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['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>';
         }
     }
 
@@ -444,7 +444,7 @@ 
     return $output;
 }
 
-function wpinv_item_dropdown( $args = array() ) {
+function wpinv_item_dropdown($args = array()) {
     $defaults = array(
         'name'              => 'wpi_item',
         'id'                => 'wpi_item',
@@ -452,14 +452,14 @@ 
         'multiple'          => false,
         'selected'          => 0,
         '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,
         'show_recurring'    => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $item_args = array(
         'post_type'      => 'wpi_item',
@@ -468,44 +468,44 @@ 
         'posts_per_page' => $args['number']
     );
     
-    $item_args  = apply_filters( 'wpinv_item_dropdown_query_args', $item_args, $args, $defaults );
+    $item_args  = apply_filters('wpinv_item_dropdown_query_args', $item_args, $args, $defaults);
 
-    $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'],
@@ -516,12 +516,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,
@@ -532,38 +532,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,
@@ -573,51 +573,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,
@@ -627,31 +627,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'       => '',
@@ -660,13 +660,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;
@@ -675,7 +675,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    = '';
@@ -686,69 +686,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>
@@ -756,18 +756,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);
         }
     }
 
@@ -776,7 +776,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();
@@ -800,7 +800,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() {
@@ -810,192 +810,192 @@ 
     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 ) ) && ( $invoice->is_paid() || $invoice->is_refunded() ) ) { ?>
+        <?php if (($gateway_name = wpinv_get_payment_gateway_name($invoice_id)) && ($invoice->is_paid() || $invoice->is_refunded())) { ?>
             <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 do_action( 'wpinv_display_details_after_due_date', $invoice_id ); ?>
-        <?php if ( $owner_vat_number = $wpinv_euvat->get_vat_number() ) { ?>
+        <?php do_action('wpinv_display_details_after_due_date', $invoice_id); ?>
+        <?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 do_action( 'wpinv_display_details_after_due_date', $invoice_id ); ?>
-        <?php if ( $use_taxes && ( $user_vat_number = wpinv_get_invoice_vat_number( $invoice_id ) ) ) { ?>
+        <?php do_action('wpinv_display_details_after_due_date', $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();
-    if ( !$use_taxes && (float)$invoice->get_tax() > 0 ) {
+    if (!$use_taxes && (float)$invoice->get_tax() > 0) {
         $use_taxes = true;
     }
     $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;
@@ -1004,67 +1004,67 @@ 
     <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    = '';
-	                $item_name    = '';
+	                $item_name = '';
                     $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;
 
-                    $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'] ), $invoice->get_currency() );
-                        $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']), $invoice->get_currency());
+                        $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
                     }
 
-                    $action = apply_filters( 'wpinv_display_line_item_action', '', $cart_item, $invoice, $cols );
+                    $action = apply_filters('wpinv_display_line_item_action', '', $cart_item, $invoice, $cols);
 
-                    $line_item = '<tr class="row-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . ' wpinv-item">';
-                        $line_item .= '<td class="name">' . $action. 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">' . $action . 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>';
@@ -1073,55 +1073,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>
@@ -1130,35 +1130,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>
@@ -1166,82 +1166,82 @@ 
                 <?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');
 
     $custom_css = wpinv_get_option('template_custom_css');
-    if(isset($custom_css) && !empty($custom_css)){
-        $custom_css     = wp_kses( $custom_css, array( '\'', '\"' ) );
-        $custom_css     = str_replace( '&gt;', '>', $custom_css );
+    if (isset($custom_css) && !empty($custom_css)) {
+        $custom_css     = wp_kses($custom_css, array('\'', '\"'));
+        $custom_css     = str_replace('&gt;', '>', $custom_css);
         echo '<style type="text/css">';
         echo $custom_css;
         echo '</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'];
@@ -1257,98 +1257,98 @@ 
         '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'] ), $invoice->get_currency() );
-        $quantity       = !empty( $cart_item['quantity'] ) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
-        $item_subtotal  = wpinv_price( wpinv_format_amount( $cart_item['subtotal'] ), $invoice->get_currency() );
+        $item_price     = wpinv_price(wpinv_format_amount($cart_item['item_price']), $invoice->get_currency());
+        $quantity       = !empty($cart_item['quantity']) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
+        $item_subtotal  = wpinv_price(wpinv_format_amount($cart_item['subtotal']), $invoice->get_currency());
         $can_remove     = true;
 
-        $summary = apply_filters( 'wpinv_admin_invoice_line_item_summary', '', $cart_item, $wpi_item, $invoice );
+        $summary = apply_filters('wpinv_admin_invoice_line_item_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'] ), $invoice->get_currency() );
-            $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']), $invoice->get_currency());
+            $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();
 }
@@ -1360,32 +1360,32 @@ 
     $wpi_checkout_id = wpinv_get_invoice_cart_id();
 
     //Maybe update the prices
-    if(! empty( $_GET['wpi_dynamic_item'] ) && ! empty( $_GET['wpi_dynamic_price'] ) ) {
+    if (!empty($_GET['wpi_dynamic_item']) && !empty($_GET['wpi_dynamic_price'])) {
 
         //If the invoice exists, update it with new pricing details
-        if (! empty( $wpi_checkout_id ) ) {
+        if (!empty($wpi_checkout_id)) {
 
             $_invoice       = wpinv_get_invoice_cart();
             $_cart_details  = $_invoice->get_cart_details();
-            $_dynamic_item  = sanitize_text_field( $_GET['wpi_dynamic_item'] );
+            $_dynamic_item  = sanitize_text_field($_GET['wpi_dynamic_item']);
 
             //First, fetch the item
-            $item    = new WPInv_Item( $_dynamic_item );
+            $item = new WPInv_Item($_dynamic_item);
     
             //Next, ensure it supports dynamic pricing...
-            if( $item->supports_dynamic_pricing() && $item->get_is_dynamic_pricing() ) {
+            if ($item->supports_dynamic_pricing() && $item->get_is_dynamic_pricing()) {
                 
                 //... and that the new price is not lower than the minimum price
-                $_dynamic_price = (float) wpinv_sanitize_amount( sanitize_text_field( $_GET['wpi_dynamic_price'] ) );
-                if( $_dynamic_price < $item->get_minimum_price() ) {
+                $_dynamic_price = (float)wpinv_sanitize_amount(sanitize_text_field($_GET['wpi_dynamic_price']));
+                if ($_dynamic_price < $item->get_minimum_price()) {
                     $_dynamic_price = $item->get_minimum_price();
                 }
 
                 //Finally, update our invoice with the new price
-                if ( !empty( $_cart_details ) ) {
+                if (!empty($_cart_details)) {
 
-                    foreach ( $_cart_details as $key => $item ) {
-                        if ( !empty( $item['id'] ) && $_dynamic_item == $item['id'] ) {
+                    foreach ($_cart_details as $key => $item) {
+                        if (!empty($item['id']) && $_dynamic_item == $item['id']) {
                             $_cart_details[$key]['custom_price'] = $_dynamic_price;
                             $_cart_details[$key]['item_price']   = $_dynamic_price;
                         }
@@ -1393,8 +1393,8 @@ 
 
                     $_meta = $_invoice->get_meta();
                     $_meta['cart_details'] = $_cart_details;
-                    $_invoice->set( 'payment_meta', $_meta );
-                    $_invoice->set( 'cart_details', $_cart_details );
+                    $_invoice->set('payment_meta', $_meta);
+                    $_invoice->set('cart_details', $_cart_details);
                     $_invoice->recalculate_totals();
 
                 }
@@ -1405,60 +1405,60 @@ 
 
     }
 
-    $form_action  = esc_url( wpinv_get_checkout_uri() );
+    $form_action = esc_url(wpinv_get_checkout_uri());
 
     ob_start();
-	    do_action( 'wpinv_checkout_content_before' );
+	    do_action('wpinv_checkout_content_before');
         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-->';
-	    do_action( 'wpinv_checkout_content_after' );
+	    do_action('wpinv_checkout_content_after');
     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;
 
     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>');
 }
 
 /**
@@ -1470,83 +1470,83 @@ 
 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_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">
@@ -1559,10 +1559,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($){
@@ -1577,127 +1577,127 @@ 
 <?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;" data-free="1"' : '' ); ?>>
-            <?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;" data-free="1"' : ''); ?>>
+            <?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' );
-
-                    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 );
-                            $gateway_label = wpinv_get_gateway_checkout_label( $gateway_id );
-                            $description   = wpinv_get_gateway_description( $gateway_id );
+                    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);
+                            $gateway_label = wpinv_get_gateway_checkout_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_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_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 _e( $description, 'invoicing' ); ?></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 _e($description, 'invoicing'); ?></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>';
+                        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',
@@ -1705,16 +1705,16 @@ 
                             'show_option_all'  => false,
                             'show_option_none' => false,
                             'class'            => 'wpi-input form-control wpi_select2',
-                            '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',
@@ -1722,61 +1722,61 @@ 
                                 'show_option_all'  => false,
                                 'show_option_none' => false,
                                 'class'            => 'wpi-input form-control wpi_select2',
-                                '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" />
@@ -1786,9 +1786,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() {
@@ -1797,116 +1797,116 @@ 
 <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_accept_tandc() {
-    $page = wpinv_get_option( 'tandc_page' );
+    $page = wpinv_get_option('tandc_page');
     ?>
     <div id="wpinv_checkout_tandc" class="panel panel-success">
         <div class="panel-body">
             <?php echo wpinv_get_policy_text(); ?>
             <?php
-            if(isset($page) && (int)$page > 0 && apply_filters( 'wpinv_checkout_show_terms', true )){
-                $terms_link = esc_url( get_permalink( $page ) );
+            if (isset($page) && (int)$page > 0 && apply_filters('wpinv_checkout_show_terms', true)) {
+                $terms_link = esc_url(get_permalink($page));
                 ?>
                 <label class="">
-                    <input type="checkbox" class="wpi-terms-checkbox" name="wpi_terms" id="wpi-terms" <?php checked( apply_filters( 'wpinv_terms_is_checked_default', isset( $_POST['wpi_terms'] ) ), true ); ?>> <span><?php printf( __( 'I&rsquo;ve read and accept the <a href="%s" target="_blank" class="wpi-terms-and-conditions-link">terms &amp; conditions</a>', 'invoicing' ), $terms_link ); ?></span> <span class="wpi-required">*</span>
+                    <input type="checkbox" class="wpi-terms-checkbox" name="wpi_terms" id="wpi-terms" <?php checked(apply_filters('wpinv_terms_is_checked_default', isset($_POST['wpi_terms'])), true); ?>> <span><?php printf(__('I&rsquo;ve read and accept the <a href="%s" target="_blank" class="wpi-terms-and-conditions-link">terms &amp; conditions</a>', 'invoicing'), $terms_link); ?></span> <span class="wpi-required">*</span>
                 </label>
             <?php } ?>
         </div>
     </div>
     <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_accept_tandc', 9995 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_accept_tandc', 9995);
 
 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>
@@ -1914,74 +1914,74 @@ 
     <?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 ) ) {
-        $subscription = wpinv_get_subscription( $invoice, true );
+function wpinv_invoice_subscription_details($invoice) {
+    if (!empty($invoice) && $invoice->is_recurring() && !wpinv_is_subscription_payment($invoice)) {
+        $subscription = wpinv_get_subscription($invoice, true);
 
-        if ( empty( $subscription ) ) {
+        if (empty($subscription)) {
             return;
         }
 
@@ -1992,15 +1992,15 @@ 
         $payments = $subscription->get_child_payments();
         ?>
         <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>
@@ -2014,29 +2014,29 @@ 
                 </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
                         $i = 1;
-                        foreach ( $payments as $payment ) {
+                        foreach ($payments as $payment) {
                             $invoice_id = $payment->ID;
                     ?>
                     <tr>
-                        <th scope="row"><?php echo $i;?></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 $i; ?></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 $i++; } ?>
                 </tbody>
@@ -2047,52 +2047,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">
@@ -2104,43 +2104,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   = array('note');
+    $note_classes[] = get_comment_meta($note->comment_ID, '_wpi_customer_note', true) ? 'customer-note' : '';
     $note_classes[] = $note->comment_author === 'System' ? '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   = 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' || current_user_can( 'manage_options' ) ) { ?>
-                <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' || current_user_can('manage_options')) { ?>
+                <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;
@@ -2150,43 +2150,43 @@ 
 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' );
+add_action('wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content');
 
-add_action( 'wpinv_checkout_billing_fields_last', 'wpinv_force_company_name_field');
-function wpinv_force_company_name_field(){
+add_action('wpinv_checkout_billing_fields_last', 'wpinv_force_company_name_field');
+function wpinv_force_company_name_field() {
     $invoice = wpinv_get_invoice_cart();
-    $user_id = wpinv_get_user_id( $invoice->ID );
-    $company = empty( $user_id ) ? "" : get_user_meta( $user_id, '_wpinv_company', true );
-    if ( 1 == wpinv_get_option( 'force_show_company' ) && !wpinv_use_taxes() ) {
+    $user_id = wpinv_get_user_id($invoice->ID);
+    $company = empty($user_id) ? "" : get_user_meta($user_id, '_wpinv_company', true);
+    if (1 == wpinv_get_option('force_show_company') && !wpinv_use_taxes()) {
         ?>
         <p class="wpi-cart-field wpi-col2 wpi-colf">
             <label for="wpinv_company" class="wpi-label"><?php _e('Company Name', 'invoicing'); ?></label>
@@ -2211,21 +2211,21 @@ 
  * @return string
  */
 function wpinv_get_policy_text() {
-    $privacy_page_id = get_option( 'wp_page_for_privacy_policy', 0 );
+    $privacy_page_id = get_option('wp_page_for_privacy_policy', 0);
 
-    $text = wpinv_get_option('invoicing_privacy_checkout_message', sprintf( __( 'Your personal data will be used to process your invoice, payment and for other purposes described in our %s.', 'invoicing' ), '[wpinv_privacy_policy]' ));
+    $text = wpinv_get_option('invoicing_privacy_checkout_message', sprintf(__('Your personal data will be used to process your invoice, payment and for other purposes described in our %s.', 'invoicing'), '[wpinv_privacy_policy]'));
 
-    if(!$privacy_page_id){
-        $privacy_page_id = wpinv_get_option( 'privacy_page', 0 );
+    if (!$privacy_page_id) {
+        $privacy_page_id = wpinv_get_option('privacy_page', 0);
     }
 
-    $privacy_link    = $privacy_page_id ? '<a href="' . esc_url( get_permalink( $privacy_page_id ) ) . '" class="wpinv-privacy-policy-link" target="_blank">' . __( 'privacy policy', 'invoicing' ) . '</a>' : __( 'privacy policy', 'invoicing' );
+    $privacy_link = $privacy_page_id ? '<a href="' . esc_url(get_permalink($privacy_page_id)) . '" class="wpinv-privacy-policy-link" target="_blank">' . __('privacy policy', 'invoicing') . '</a>' : __('privacy policy', 'invoicing');
 
     $find_replace = array(
         '[wpinv_privacy_policy]' => $privacy_link,
     );
 
-    $privacy_text = str_replace( array_keys( $find_replace ), array_values( $find_replace ), $text );
+    $privacy_text = str_replace(array_keys($find_replace), array_values($find_replace), $text);
 
     return wp_kses_post(wpautop($privacy_text));
 }
@@ -2234,25 +2234,25 @@ 
 /**
  * Allows the user to set their own price for an invoice item
  */
-function wpinv_checkout_cart_item_name_your_price( $cart_item, $key ) {
+function wpinv_checkout_cart_item_name_your_price($cart_item, $key) {
     
     //Ensure we have an item id
-    if(! is_array( $cart_item ) || empty( $cart_item['id'] ) ) {
+    if (!is_array($cart_item) || empty($cart_item['id'])) {
         return;
     }
 
     //Fetch the item
     $item_id = $cart_item['id'];
-    $item    = new WPInv_Item( $item_id );
+    $item    = new WPInv_Item($item_id);
     
-    if(! $item->supports_dynamic_pricing() || !$item->get_is_dynamic_pricing() ) {
+    if (!$item->supports_dynamic_pricing() || !$item->get_is_dynamic_pricing()) {
         return;
     }
 
     //Fetch the dynamic pricing "strings"
-    $suggested_price_text = esc_html( wpinv_get_option( 'suggested_price_text', __( 'Suggested Price:', 'invoicing' ) ) );
-    $minimum_price_text   = esc_html( wpinv_get_option( 'minimum_price_text', __( 'Minimum Price:', 'invoicing' ) ) );
-    $name_your_price_text = esc_html( wpinv_get_option( 'name_your_price_text', __( 'Name Your Price', 'invoicing' ) ) );
+    $suggested_price_text = esc_html(wpinv_get_option('suggested_price_text', __('Suggested Price:', 'invoicing')));
+    $minimum_price_text   = esc_html(wpinv_get_option('minimum_price_text', __('Minimum Price:', 'invoicing')));
+    $name_your_price_text = esc_html(wpinv_get_option('name_your_price_text', __('Name Your Price', 'invoicing')));
 
     //Display a "name_your_price" button
     echo " &mdash; <a href='#' class='wpinv-name-your-price-frontend small'>$name_your_price_text</a></div>";
@@ -2261,7 +2261,7 @@ 
     echo '<div class="name-your-price-miniform">';
     
     //Maybe display the recommended price
-    if( $item->get_price() > 0 && !empty( $suggested_price_text ) ) {
+    if ($item->get_price() > 0 && !empty($suggested_price_text)) {
         $suggested_price = $item->get_the_price();
         echo "<div>$suggested_price_text &mdash; $suggested_price</div>";
     }
@@ -2269,30 +2269,30 @@ 
     //Display the update price form
     $symbol         = wpinv_currency_symbol();
     $position       = wpinv_currency_position();
-    $minimum        = esc_attr( $item->get_minimum_price() );
-    $price          = esc_attr( $cart_item['item_price'] );
-    $update         = esc_attr__( "Update", 'invoicing' );
+    $minimum        = esc_attr($item->get_minimum_price());
+    $price          = esc_attr($cart_item['item_price']);
+    $update         = esc_attr__("Update", 'invoicing');
 
     //Ensure it supports dynamic prici
-    if( $price < $minimum ) {
+    if ($price < $minimum) {
         $price = $minimum;
     }
 
     echo '<label>';
     echo $position != 'right' ? $symbol . '&nbsp;' : '';
     echo "<input type='number' min='$minimum' placeholder='$price' value='$price' class='wpi-field-price' />";
-    echo $position == 'right' ? '&nbsp;' . $symbol : '' ;
+    echo $position == 'right' ? '&nbsp;' . $symbol : '';
     echo "</label>";
     echo "<input type='hidden' value='$item_id' class='wpi-field-item' />";
     echo "<a class='btn btn-success wpinv-submit wpinv-update-dynamic-price-frontend'>$update</a>";
 
     //Maybe display the minimum price
-    if( $item->get_minimum_price() > 0 && !empty( $minimum_price_text ) ) {
-        $minimum_price = wpinv_price( wpinv_format_amount( $item->get_minimum_price() ) );
+    if ($item->get_minimum_price() > 0 && !empty($minimum_price_text)) {
+        $minimum_price = wpinv_price(wpinv_format_amount($item->get_minimum_price()));
         echo "<div>$minimum_price_text &mdash; $minimum_price</div>";
     }
 
     echo "</div>";
 
 }
-add_action( 'wpinv_checkout_cart_item_price_after', 'wpinv_checkout_cart_item_name_your_price', 10, 2 );
\ No newline at end of file
+add_action('wpinv_checkout_cart_item_price_after', 'wpinv_checkout_cart_item_name_your_price', 10, 2);
\ No newline at end of file

widgets/invoice-history.php

Indentation +15 added lines, -15 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -24,15 +24,15 @@ 
             'block-keywords'=> "['invoicing','history']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_history',
-            'name'          => __('Invoicing > Invoice History','invoicing'),
+            'name'          => __('Invoicing > Invoice History', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-history-class',
-                'description' => esc_html__('Displays invoice history.','invoicing'),
+                'description' => esc_html__('Displays invoice history.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -43,7 +43,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -55,13 +55,13 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    ob_start();
 
-	    do_action( 'wpinv_before_user_invoice_history' );
-	    wpinv_get_template_part( 'wpinv-invoice-history' );
-	    do_action( 'wpinv_after_user_invoice_history' );
+	    do_action('wpinv_before_user_invoice_history');
+	    wpinv_get_template_part('wpinv-invoice-history');
+	    do_action('wpinv_after_user_invoice_history');
 
 	    $output = ob_get_clean();
 	    return trim($output);

widgets/invoice-messages.php

Indentation +12 added lines, -12 removed lines

@@ -44,22 +44,22 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    wpinv_print_errors();
+        wpinv_print_errors();
 
-	    return '<div class="wpinv">' . ob_get_clean() . '</div>';
+        return '<div class="wpinv">' . ob_get_clean() . '</div>';
 
     }
 

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -22,15 +22,15 @@ 
             'block-keywords'=> "['invoicing','history']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_messages',
-            'name'          => __('Invoicing > Invoice Messages','invoicing'),
+            'name'          => __('Invoicing > Invoice Messages', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-messages-class',
-                'description' => esc_html__('Displays invoice error and warning messages on checkout page.','invoicing'),
+                'description' => esc_html__('Displays invoice error and warning messages on checkout page.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -41,7 +41,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -53,7 +53,7 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    ob_start();
 

widgets/checkout.php

Indentation +10 added lines, -10 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -24,15 +24,15 @@ 
             'block-keywords'=> "['invoicing','checkout']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_checkout',
-            'name'          => __('Invoicing > Checkout','invoicing'),
+            'name'          => __('Invoicing > Checkout', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-checkout-class',
-                'description' => esc_html__('Displays checkout form.','invoicing'),
+                'description' => esc_html__('Displays checkout form.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -43,7 +43,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -55,7 +55,7 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    return wpinv_checkout_form();
 

widgets/subscriptions.php

Indentation +15 added lines, -15 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -24,15 +24,15 @@ 
             'block-keywords'=> "['invoicing','subscriptions']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_subscriptions',
-            'name'          => __('Invoicing > Subscriptions History','invoicing'),
+            'name'          => __('Invoicing > Subscriptions History', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-checkout-class',
-                'description' => esc_html__('Displays subscriptions history.','invoicing'),
+                'description' => esc_html__('Displays subscriptions history.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -43,7 +43,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -55,13 +55,13 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    ob_start();
 
-	    do_action( 'wpinv_before_user_subscriptions' );
-	    wpinv_get_template_part( 'wpinv-subscriptions-history' );
-	    do_action( 'wpinv_after_user_subscriptions' );
+	    do_action('wpinv_before_user_subscriptions');
+	    wpinv_get_template_part('wpinv-subscriptions-history');
+	    do_action('wpinv_after_user_subscriptions');
 
 	    $output = ob_get_clean();
 	    return trim($output);

widgets/invoice-receipt.php

Indentation +15 added lines, -15 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -22,15 +22,15 @@ 
             'block-keywords'=> "['invoicing','receipt']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_receipt',
-            'name'          => __('Invoicing > Invoice Receipt','invoicing'),
+            'name'          => __('Invoicing > Invoice Receipt', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-receipt-class',
-                'description' => esc_html__('Displays invoice receipt after checkout.','invoicing'),
+                'description' => esc_html__('Displays invoice receipt after checkout.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -41,7 +41,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -53,13 +53,13 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    ob_start();
 
-	    do_action( 'wpinv_success_content_before' );
-	    echo wpinv_payment_receipt( $args );
-	    do_action( 'wpinv_success_content_after' );
+	    do_action('wpinv_success_content_before');
+	    echo wpinv_payment_receipt($args);
+	    do_action('wpinv_success_content_after');
 
 	    $output = ob_get_clean();
 	    return trim($output);

includes/admin/class-wpinv-admin-menus.php

Spacing +88 added lines, -88 removed lines

@@ -3,7 +3,7 @@ 
  * Setup menus in WP admin.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Admin_Menus Class.
@@ -13,34 +13,34 @@ 
      * Hook in tabs.
      */
     public function __construct() {
-        add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-        add_action( 'admin_menu', array( $this, 'add_addons_menu' ), 99 );
-        add_action( 'admin_menu', array( $this, 'remove_admin_submenus' ), 10 );
-        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+        add_action('admin_menu', array($this, 'admin_menu'), 10);
+        add_action('admin_menu', array($this, 'add_addons_menu'), 99);
+        add_action('admin_menu', array($this, 'remove_admin_submenus'), 10);
+        add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
     }
 
     public function admin_menu() {
         global $menu;
 
-        if ( !(current_user_can( 'manage_invoicing' ) || current_user_can( 'manage_options' )) ) {
+        if (!(current_user_can('manage_invoicing') || current_user_can('manage_options'))) {
             return;
         }
 
-        $capability = apply_filters( 'invoicing_capability', 'manage_invoicing' );
+        $capability = apply_filters('invoicing_capability', 'manage_invoicing');
 
-        if ( current_user_can( 'manage_options' ) ) {
-            $menu[] = array( '', 'read', 'separator-wpinv', '', 'wp-menu-separator wpinv' );
+        if (current_user_can('manage_options')) {
+            $menu[] = array('', 'read', 'separator-wpinv', '', 'wp-menu-separator wpinv');
         }
 
-        $wpi_invoice = get_post_type_object( 'wpi_invoice' );
+        $wpi_invoice = get_post_type_object('wpi_invoice');
 
-        add_menu_page( __( 'Invoicing', 'invoicing' ), __( 'Invoicing', 'invoicing' ), $capability, 'wpinv', null, $wpi_invoice->menu_icon, '54.123460' );
+        add_menu_page(__('Invoicing', 'invoicing'), __('Invoicing', 'invoicing'), $capability, 'wpinv', null, $wpi_invoice->menu_icon, '54.123460');
 
-        add_submenu_page( 'wpinv', __( 'Invoice Settings', 'invoicing' ), __( 'Settings', 'invoicing' ), $capability, 'wpinv-settings', array( $this, 'options_page' ));
+        add_submenu_page('wpinv', __('Invoice Settings', 'invoicing'), __('Settings', 'invoicing'), $capability, 'wpinv-settings', array($this, 'options_page'));
     }
 
-    public function add_addons_menu(){
-        if ( !apply_filters( 'wpi_show_addons_page', true ) ) {
+    public function add_addons_menu() {
+        if (!apply_filters('wpi_show_addons_page', true)) {
             return;
         }
 
@@ -50,78 +50,78 @@ 
             __('Extensions', 'invoicing'),
             'manage_options',
             'wpi-addons',
-            array( $this, 'addons_page' )
+            array($this, 'addons_page')
         );
     }
 
-    public function addons_page(){
+    public function addons_page() {
         $addon_obj = new WPInv_Admin_Addons();
         $addon_obj->output();
     }
 
     function options_page() {
-        $page       = isset( $_GET['page'] )                ? strtolower( $_GET['page'] )               : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        if ( $page !== 'wpinv-settings' ) {
+        if ($page !== 'wpinv-settings') {
             return;
         }
 
         $settings_tabs = wpinv_get_settings_tabs();
         $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
-        $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
-        $sections      = wpinv_get_settings_tab_sections( $active_tab );
+        $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
+        $sections      = wpinv_get_settings_tab_sections($active_tab);
         $key           = 'main';
 
-        if ( is_array( $sections ) ) {
-            $key = key( $sections );
+        if (is_array($sections)) {
+            $key = key($sections);
         }
 
-        $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
-        $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? $_GET['section'] : $key;
+        $registered_sections = wpinv_get_settings_tab_sections($active_tab);
+        $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? $_GET['section'] : $key;
         ob_start();
         ?>
         <div class="wrap">
             <h1 class="nav-tab-wrapper">
                 <?php
-                foreach( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
-                    $tab_url = add_query_arg( array(
+                foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
+                    $tab_url = add_query_arg(array(
                         'settings-updated' => false,
                         'tab' => $tab_id,
-                    ) );
+                    ));
 
                     // Remove the section from the tabs so we always end up at the main section
-                    $tab_url = remove_query_arg( 'section', $tab_url );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    $tab_url = remove_query_arg('section', $tab_url);
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
 
                     $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
 
-                    echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';
-                    echo esc_html( $tab_name );
+                    echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . $active . '">';
+                    echo esc_html($tab_name);
                     echo '</a>';
                 }
                 ?>
             </h1>
             <?php
-            $number_of_sections = count( $sections );
+            $number_of_sections = count($sections);
             $number = 0;
-            if ( $number_of_sections > 1 ) {
+            if ($number_of_sections > 1) {
                 echo '<div><ul class="subsubsub">';
-                foreach( $sections as $section_id => $section_name ) {
+                foreach ($sections as $section_id => $section_name) {
                     echo '<li>';
                     $number++;
-                    $tab_url = add_query_arg( array(
+                    $tab_url = add_query_arg(array(
                         'settings-updated' => false,
                         'tab' => $active_tab,
                         'section' => $section_id
-                    ) );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    ));
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
                     $class = '';
-                    if ( $section == $section_id ) {
+                    if ($section == $section_id) {
                         $class = 'current';
                     }
-                    echo '<a class="' . $class . '" href="' . esc_url( $tab_url ) . '">' . $section_name . '</a>';
+                    echo '<a class="' . $class . '" href="' . esc_url($tab_url) . '">' . $section_name . '</a>';
 
-                    if ( $number != $number_of_sections ) {
+                    if ($number != $number_of_sections) {
                         echo ' | ';
                     }
                     echo '</li>';
@@ -133,19 +133,19 @@ 
                 <form method="post" action="options.php">
                     <table class="form-table">
                         <?php
-                        settings_fields( 'wpinv_settings' );
+                        settings_fields('wpinv_settings');
 
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_top', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_top', $active_tab);
                         }
 
-                        do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
+                        do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
 
                         // For backwards compatibility
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_bottom', $active_tab);
                         }
                         ?>
                     </table>
@@ -159,52 +159,52 @@ 
     }
 
     public function remove_admin_submenus() {
-        remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+        remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
     }
 
-    public function add_nav_menu_meta_boxes(){
-        add_meta_box( 'wpinv_endpoints_nav_link', __( 'Invoicing Pages', 'invoicing' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' );
+    public function add_nav_menu_meta_boxes() {
+        add_meta_box('wpinv_endpoints_nav_link', __('Invoicing Pages', 'invoicing'), array($this, 'nav_menu_links'), 'nav-menus', 'side', 'low');
     }
 
-    public function nav_menu_links(){
+    public function nav_menu_links() {
         $endpoints = $this->get_menu_items();
         ?>
         <div id="invoicing-endpoints" class="posttypediv">
-        <?php if(!empty($endpoints['pages'])){ ?>
+        <?php if (!empty($endpoints['pages'])) { ?>
             <div id="tabs-panel-invoicing-endpoints" class="tabs-panel tabs-panel-active">
                 <ul id="invoicing-endpoints-checklist" class="categorychecklist form-no-clear">
                     <?php
                     $walker = new Walker_Nav_Menu_Checklist(array());
-                    echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $endpoints['pages']), 0, (object) array('walker' => $walker));
+                    echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $endpoints['pages']), 0, (object)array('walker' => $walker));
                     ?>
                 </ul>
             </div>
         <?php } ?>
         <p class="button-controls">
         <span class="list-controls">
-            <a href="<?php echo admin_url( 'nav-menus.php?page-tab=all&selectall=1#invoicing-endpoints' ); ?>" class="select-all"><?php _e( 'Select all', 'invoicing' ); ?></a>
+            <a href="<?php echo admin_url('nav-menus.php?page-tab=all&selectall=1#invoicing-endpoints'); ?>" class="select-all"><?php _e('Select all', 'invoicing'); ?></a>
         </span>
             <span class="add-to-menu">
-            <input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'invoicing' ); ?>" name="add-post-type-menu-item" id="submit-invoicing-endpoints">
+            <input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'invoicing'); ?>" name="add-post-type-menu-item" id="submit-invoicing-endpoints">
             <span class="spinner"></span>
         </span>
         </p>
         <?php
     }
 
-    public function get_menu_items(){
+    public function get_menu_items() {
         $items = array();
 
-        $wpinv_history_page_id = (int)wpinv_get_option( 'invoice_history_page' );
-        if($wpinv_history_page_id > 0){
+        $wpinv_history_page_id = (int)wpinv_get_option('invoice_history_page');
+        if ($wpinv_history_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_history_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Invoice History Page','invoicing');
-            $item->url = get_permalink( $wpinv_history_page_id );
+            $item->title = __('Invoice History Page', 'invoicing');
+            $item->url = get_permalink($wpinv_history_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -213,16 +213,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_sub_history_page_id = (int)wpinv_get_option( 'invoice_subscription_page' );
-        if($wpinv_sub_history_page_id > 0){
+        $wpinv_sub_history_page_id = (int)wpinv_get_option('invoice_subscription_page');
+        if ($wpinv_sub_history_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_sub_history_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Invoice Subscriptions Page','invoicing');
-            $item->url = get_permalink( $wpinv_sub_history_page_id );
+            $item->title = __('Invoice Subscriptions Page', 'invoicing');
+            $item->url = get_permalink($wpinv_sub_history_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -231,16 +231,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_checkout_page_id = (int)wpinv_get_option( 'checkout_page' );
-        if($wpinv_checkout_page_id > 0){
+        $wpinv_checkout_page_id = (int)wpinv_get_option('checkout_page');
+        if ($wpinv_checkout_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_checkout_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Checkout Page','invoicing');
-            $item->url = get_permalink( $wpinv_checkout_page_id );
+            $item->title = __('Checkout Page', 'invoicing');
+            $item->url = get_permalink($wpinv_checkout_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -249,16 +249,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_tandc_page_id = (int)wpinv_get_option( 'tandc_page' );
-        if($wpinv_tandc_page_id > 0){
+        $wpinv_tandc_page_id = (int)wpinv_get_option('tandc_page');
+        if ($wpinv_tandc_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_tandc_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Terms & Conditions','invoicing');
-            $item->url = get_permalink( $wpinv_tandc_page_id );
+            $item->title = __('Terms & Conditions', 'invoicing');
+            $item->url = get_permalink($wpinv_tandc_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -267,16 +267,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_success_page_id = (int)wpinv_get_option( 'success_page' );
-        if($wpinv_success_page_id > 0){
+        $wpinv_success_page_id = (int)wpinv_get_option('success_page');
+        if ($wpinv_success_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_success_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Success Page','invoicing');
-            $item->url = get_permalink( $wpinv_success_page_id );
+            $item->title = __('Success Page', 'invoicing');
+            $item->url = get_permalink($wpinv_success_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -285,16 +285,16 @@ 
             $items['pages'][] = $item;
         }
 
-        $wpinv_failure_page_id = (int)wpinv_get_option( 'failure_page' );
-        if($wpinv_failure_page_id > 0){
+        $wpinv_failure_page_id = (int)wpinv_get_option('failure_page');
+        if ($wpinv_failure_page_id > 0) {
             $item = new stdClass();
             $item->object_id = $wpinv_failure_page_id;
             $item->db_id = 0;
-            $item->object =  'page';
+            $item->object = 'page';
             $item->menu_item_parent = 0;
             $item->type = 'post_type';
-            $item->title = __('Failed Transaction Page','invoicing');
-            $item->url = get_permalink( $wpinv_failure_page_id );
+            $item->title = __('Failed Transaction Page', 'invoicing');
+            $item->url = get_permalink($wpinv_failure_page_id);
             $item->target = '';
             $item->attr_title = '';
             $item->classes = array('wpinv-menu-item');
@@ -303,7 +303,7 @@ 
             $items['pages'][] = $item;
         }
 
-        return apply_filters( 'wpinv_menu_items', $items );
+        return apply_filters('wpinv_menu_items', $items);
     }
 
 }

includes/class-wpinv.php

Indentation +18 added lines, -18 removed lines

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

Spacing +199 added lines, -199 removed lines

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

widgets/buy-item.php

Indentation +43 added lines, -43 removed lines

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

Spacing +18 added lines, -18 removed lines

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