AyeCode / invoicing

includes/wpinv-user-functions.php

Spacing +64 added lines, -64 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-function wpinv_user_invoices( $current_page = 1 ) {    
+function wpinv_user_invoices($current_page = 1) {    
     global $current_page;
-    do_action( 'wpinv_before_user_invoices_template', $current_page );
-    wpinv_get_template_part( 'wpinv-invoice-history' );
-    do_action( 'wpinv_after_user_invoices_template', $current_page );
+    do_action('wpinv_before_user_invoices_template', $current_page);
+    wpinv_get_template_part('wpinv-invoice-history');
+    do_action('wpinv_after_user_invoices_template', $current_page);
 }
 
-function wpinv_get_users_invoices( $user = 0, $number = 20, $pagination = false, $status = 'publish' ) {
-    if ( empty( $user ) ) {
+function wpinv_get_users_invoices($user = 0, $number = 20, $pagination = false, $status = 'publish') {
+    if (empty($user)) {
         $user = get_current_user_id();
     }
 
-    if ( 0 === $user ) {
+    if (0 === $user) {
         return false;
     }
 
-    if ( $pagination ) {
-        if ( get_query_var( 'paged' ) )
+    if ($pagination) {
+        if (get_query_var('paged'))
             $paged = get_query_var('paged');
-        else if ( get_query_var( 'page' ) )
-            $paged = get_query_var( 'page' );
+        else if (get_query_var('page'))
+            $paged = get_query_var('page');
         else
             $paged = 1;
     }
@@ -31,21 +31,21 @@ 
         'post_type'      => 'wpi_invoice',
         'posts_per_page' => 2,
         'paged'          => null,
-        'post_status'    => array( 'publish', 'pending' ),
+        'post_status'    => array('publish', 'pending'),
         'user'           => $user,
         'order'          => 'date',
     );
 
-    $invoices = get_posts( $args );
+    $invoices = get_posts($args);
 
     // No invoices
-    if ( ! $invoices )
+    if (!$invoices)
         return false;
 
     return $invoices;
 }
 
-function wpinv_dropdown_users( $args = '' ) {
+function wpinv_dropdown_users($args = '') {
     $defaults = array(
         'show_option_all' => '', 'show_option_none' => '', 'hide_if_only_one_author' => '',
         'orderby' => 'display_name', 'order' => 'ASC',
@@ -56,18 +56,18 @@ 
         'option_none_value' => -1
     );
 
-    $defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
+    $defaults['selected'] = is_author() ? get_query_var('author') : 0;
 
-    $r = wp_parse_args( $args, $defaults );
+    $r = wp_parse_args($args, $defaults);
 
-    $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who' ) );
+    $query_args = wp_array_slice_assoc($r, array('blog_id', 'include', 'exclude', 'orderby', 'order', 'who'));
 
-    $fields = array( 'ID', 'user_login', 'user_email' );
+    $fields = array('ID', 'user_login', 'user_email');
 
-    $show = ! empty( $r['show'] ) ? $r['show'] : 'display_name';
-    if ( 'display_name_with_login' === $show ) {
+    $show = !empty($r['show']) ? $r['show'] : 'display_name';
+    if ('display_name_with_login' === $show) {
         $fields[] = 'display_name';
-    } else if ( 'display_name_with_email' === $show ) {
+    } else if ('display_name_with_email' === $show) {
         $fields[] = 'display_name';
     } else {
         $fields[] = $show;
@@ -79,99 +79,99 @@ 
     $show_option_none = $r['show_option_none'];
     $option_none_value = $r['option_none_value'];
 
-    $query_args = apply_filters( 'wpinv_dropdown_users_args', $query_args, $r );
+    $query_args = apply_filters('wpinv_dropdown_users_args', $query_args, $r);
 
-    $users = get_users( $query_args );
+    $users = get_users($query_args);
 
     $output = '';
-    if ( ! empty( $users ) && ( empty( $r['hide_if_only_one_author'] ) || count( $users ) > 1 ) ) {
-        $name = esc_attr( $r['name'] );
-        if ( $r['multi'] && ! $r['id'] ) {
+    if (!empty($users) && (empty($r['hide_if_only_one_author']) || count($users) > 1)) {
+        $name = esc_attr($r['name']);
+        if ($r['multi'] && !$r['id']) {
             $id = '';
         } else {
-            $id = $r['id'] ? " id='" . esc_attr( $r['id'] ) . "'" : " id='$name'";
+            $id = $r['id'] ? " id='" . esc_attr($r['id']) . "'" : " id='$name'";
         }
         $output = "<select name='{$name}'{$id} class='" . $r['class'] . "'>\n";
 
-        if ( $show_option_all ) {
+        if ($show_option_all) {
             $output .= "\t<option value='0'>$show_option_all</option>\n";
         }
 
-        if ( $show_option_none ) {
-            $_selected = selected( $option_none_value, $r['selected'], false );
-            $output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
+        if ($show_option_none) {
+            $_selected = selected($option_none_value, $r['selected'], false);
+            $output .= "\t<option value='" . esc_attr($option_none_value) . "'$_selected>$show_option_none</option>\n";
         }
 
-        if ( $r['include_selected'] && ( $r['selected'] > 0 ) ) {
+        if ($r['include_selected'] && ($r['selected'] > 0)) {
             $found_selected = false;
-            $r['selected'] = (int) $r['selected'];
-            foreach ( (array) $users as $user ) {
-                $user->ID = (int) $user->ID;
-                if ( $user->ID === $r['selected'] ) {
+            $r['selected'] = (int)$r['selected'];
+            foreach ((array)$users as $user) {
+                $user->ID = (int)$user->ID;
+                if ($user->ID === $r['selected']) {
                     $found_selected = true;
                 }
             }
 
-            if ( ! $found_selected ) {
-                $users[] = get_userdata( $r['selected'] );
+            if (!$found_selected) {
+                $users[] = get_userdata($r['selected']);
             }
         }
 
-        foreach ( (array) $users as $user ) {
-            if ( 'display_name_with_login' === $show ) {
+        foreach ((array)$users as $user) {
+            if ('display_name_with_login' === $show) {
                 /* translators: 1: display name, 2: user_login */
-                $display = sprintf( _x( '%1$s (%2$s)', 'user dropdown' ), $user->display_name, $user->user_login );
-            } elseif ( 'display_name_with_email' === $show ) {
+                $display = sprintf(_x('%1$s (%2$s)', 'user dropdown'), $user->display_name, $user->user_login);
+            } elseif ('display_name_with_email' === $show) {
                 /* translators: 1: display name, 2: user_email */
-                if ( $user->display_name == $user->user_email ) {
+                if ($user->display_name == $user->user_email) {
                     $display = $user->display_name;
                 } else {
-                    $display = sprintf( _x( '%1$s (%2$s)', 'user dropdown' ), $user->display_name, $user->user_email );
+                    $display = sprintf(_x('%1$s (%2$s)', 'user dropdown'), $user->display_name, $user->user_email);
                 }
-            } elseif ( ! empty( $user->$show ) ) {
+            } elseif (!empty($user->$show)) {
                 $display = $user->$show;
             } else {
                 $display = '(' . $user->user_login . ')';
             }
 
-            $_selected = selected( $user->ID, $r['selected'], false );
-            $output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
+            $_selected = selected($user->ID, $r['selected'], false);
+            $output .= "\t<option value='$user->ID'$_selected>" . esc_html($display) . "</option>\n";
         }
 
         $output .= "</select>";
     }
 
-    $html = apply_filters( 'wpinv_dropdown_users', $output );
+    $html = apply_filters('wpinv_dropdown_users', $output);
 
-    if ( $r['echo'] ) {
+    if ($r['echo']) {
         echo $html;
     }
     return $html;
 }
 
-function wpinv_guest_redirect( $redirect_to, $user_id = 0 ) {
-    if ( (int)wpinv_get_option( 'guest_checkout' ) && $user_id > 0 ) {
-        wpinv_login_user( $user_id );
+function wpinv_guest_redirect($redirect_to, $user_id = 0) {
+    if ((int)wpinv_get_option('guest_checkout') && $user_id > 0) {
+        wpinv_login_user($user_id);
     } else {
-        $redirect_to = wp_login_url( $redirect_to );
+        $redirect_to = wp_login_url($redirect_to);
     }
     
-    $redirect_to = apply_filters( 'wpinv_invoice_link_guest_redirect', $redirect_to, $user_id );
+    $redirect_to = apply_filters('wpinv_invoice_link_guest_redirect', $redirect_to, $user_id);
     
-    wp_redirect( $redirect_to );
+    wp_redirect($redirect_to);
 }
 
-function wpinv_login_user( $user_id ) {
-    if ( is_user_logged_in() ) {
+function wpinv_login_user($user_id) {
+    if (is_user_logged_in()) {
         return true;
     }
     
-    $user = get_user_by( 'id', $user_id );
+    $user = get_user_by('id', $user_id);
     
-    if ( !empty( $user ) && !is_wp_error( $user ) && !empty( $user->user_login ) ) {
-        wp_set_current_user( $user_id, $user->user_login );
-        wp_set_auth_cookie( $user_id );
-        do_action( 'wp_login', $user->user_login );
+    if (!empty($user) && !is_wp_error($user) && !empty($user->user_login)) {
+        wp_set_current_user($user_id, $user->user_login);
+        wp_set_auth_cookie($user_id);
+        do_action('wp_login', $user->user_login);
         
         return true;
     }

includes/class-wpinv-reports.php

Spacing +169 added lines, -169 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -21,68 +21,68 @@ 
     public function init() {
         global $wp_filesystem;
 
-        if ( empty( $wp_filesystem ) ) {
-            require_once( ABSPATH . '/wp-admin/includes/file.php' );
+        if (empty($wp_filesystem)) {
+            require_once(ABSPATH . '/wp-admin/includes/file.php');
             WP_Filesystem();
             global $wp_filesystem;
         }
         $this->wp_filesystem    = $wp_filesystem;
         
         $this->export_dir       = $this->export_location();
-        $this->export_url       = $this->export_location( true );
+        $this->export_url       = $this->export_location(true);
         $this->export           = 'invoicing';
         $this->filetype         = 'csv';
         $this->per_page         = 20;
         
-        do_action( 'wpinv_class_reports_init', $this );
+        do_action('wpinv_class_reports_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_reports_includes', $this );
+        do_action('wpinv_class_reports_includes', $this);
     }
     
     public function actions() {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'add_submenu' ), 10 );
-            add_action( 'wpinv_reports_tab_export', array( $this, 'export' ) );
-            add_action( 'wp_ajax_wpinv_ajax_export', array( $this, 'ajax_export' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'add_submenu'), 10);
+            add_action('wpinv_reports_tab_export', array($this, 'export'));
+            add_action('wp_ajax_wpinv_ajax_export', array($this, 'ajax_export'));
             
             // Export Invoices.
-            add_action( 'wpinv_export_set_params_invoices', array( $this, 'set_invoices_export' ) );
-            add_filter( 'wpinv_export_get_columns_invoices', array( $this, 'get_invoices_columns' ) );
-            add_filter( 'wpinv_export_get_data_invoices', array( $this, 'get_invoices_data' ) );
-            add_filter( 'wpinv_get_export_status_invoices', array( $this, 'invoices_export_status' ) );
+            add_action('wpinv_export_set_params_invoices', array($this, 'set_invoices_export'));
+            add_filter('wpinv_export_get_columns_invoices', array($this, 'get_invoices_columns'));
+            add_filter('wpinv_export_get_data_invoices', array($this, 'get_invoices_data'));
+            add_filter('wpinv_get_export_status_invoices', array($this, 'invoices_export_status'));
         }
-        do_action( 'wpinv_class_reports_actions', $this );
+        do_action('wpinv_class_reports_actions', $this);
     }
     
     public function add_submenu() {
         global $wpi_reports_page;
-        $wpi_reports_page = add_submenu_page( 'wpinv', __( 'Reports', 'invoicing' ), __( 'Reports', 'invoicing' ), 'manage_options', 'wpinv-reports', array( $this, 'reports_page' ) );
+        $wpi_reports_page = add_submenu_page('wpinv', __('Reports', 'invoicing'), __('Reports', 'invoicing'), 'manage_options', 'wpinv-reports', array($this, 'reports_page'));
     }
     
     public function reports_page() {
-        if ( !wp_script_is( 'postbox', 'enqueued' ) ) {
-            wp_enqueue_script( 'postbox' );
+        if (!wp_script_is('postbox', 'enqueued')) {
+            wp_enqueue_script('postbox');
         }
-        if ( !wp_script_is( 'jquery-ui-datepicker', 'enqueued' ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if (!wp_script_is('jquery-ui-datepicker', 'enqueued')) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        $current_page = admin_url( 'admin.php?page=wpinv-reports' );
-        $active_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'export';
+        $current_page = admin_url('admin.php?page=wpinv-reports');
+        $active_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'export';
         ?>
         <div class="wrap wpi-reports-wrap">
-            <h1><?php echo esc_html( __( 'Reports', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Reports', 'invoicing')); ?></h1>
             <h2 class="nav-tab-wrapper wp-clearfix">
-                <a href="<?php echo add_query_arg( array( 'tab' => 'export', 'settings-updated' => false ), $current_page ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'invoicing' ); ?></a>
-                <?php do_action( 'wpinv_reports_page_tabs' ); ;?>
+                <a href="<?php echo add_query_arg(array('tab' => 'export', 'settings-updated' => false), $current_page); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'invoicing'); ?></a>
+                <?php do_action('wpinv_reports_page_tabs'); ;?>
             </h2>
             <div class="wpi-reports-content wpi-reports-<?php echo $active_tab; ?>">
             <?php
-                do_action( 'wpinv_reports_page_top' );
-                do_action( 'wpinv_reports_tab_' . $active_tab );
-                do_action( 'wpinv_reports_page_bottom' );
+                do_action('wpinv_reports_page_top');
+                do_action('wpinv_reports_tab_' . $active_tab);
+                do_action('wpinv_reports_page_bottom');
             ?>
         </div>
         <?php
@@ -90,97 +90,97 @@ 
     
     public function export() {
         $statuses = wpinv_get_invoice_statuses();
-        $statuses = array_merge( array( 'any' => __( 'All Statuses', 'invoicing' ) ), $statuses );
+        $statuses = array_merge(array('any' => __('All Statuses', 'invoicing')), $statuses);
         ?>
         <div class="metabox-holder">
             <div id="post-body">
                 <div id="post-body-content">
-                    <?php do_action( 'wpinv_reports_tab_export_content_top' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_top'); ?>
                     
                     <div class="postbox wpi-export-invoices">
-                        <h2 class="hndle ui-sortabled-handle"><span><?php _e( 'Invoices','invoicing' ); ?></span></h2>
+                        <h2 class="hndle ui-sortabled-handle"><span><?php _e('Invoices', 'invoicing'); ?></span></h2>
                         <div class="inside">
-                            <p><?php _e( 'Download a CSV of all payment invoices.', 'invoicing' ); ?></p>
+                            <p><?php _e('Download a CSV of all payment invoices.', 'invoicing'); ?></p>
                             <form id="wpi-export-invoices" class="wpi-export-form" method="post">
-                                <?php echo wpinv_html_date_field( array( 
+                                <?php echo wpinv_html_date_field(array( 
                                     'id' => 'wpi_export_from_date', 
                                     'name' => 'from_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'From date', 'invoicing' ) )
+                                    'placeholder' => __('From date', 'invoicing') )
                                 ); ?>
-                                <?php echo wpinv_html_date_field( array( 
+                                <?php echo wpinv_html_date_field(array( 
                                     'id' => 'wpi_export_to_date',
                                     'name' => 'to_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'To date', 'invoicing' ) )
+                                    'placeholder' => __('To date', 'invoicing') )
                                 ); ?>
                                 <span id="wpinv-status-wrap">
-                                <?php echo wpinv_html_select( array(
+                                <?php echo wpinv_html_select(array(
                                     'options'          => $statuses,
                                     'name'             => 'status',
                                     'id'               => 'wpi_export_status',
                                     'show_option_all'  => false,
                                     'show_option_none' => false,
                                     'class'            => '',
-                                ) ); ?>
-                                <?php wp_nonce_field( 'wpi_ajax_export', 'wpi_ajax_export' ); ?>
+                                )); ?>
+                                <?php wp_nonce_field('wpi_ajax_export', 'wpi_ajax_export'); ?>
                                 </span>
                                 <span id="wpinv-submit-wrap">
                                     <input type="hidden" value="invoices" name="export" />
-                                    <input type="submit" value="<?php _e( 'Generate CSV', 'invoicing' ); ?>" class="button-primary" />
+                                    <input type="submit" value="<?php _e('Generate CSV', 'invoicing'); ?>" class="button-primary" />
                                 </span>
                             </form>
                         </div>
                     </div>
                     
-                    <?php do_action( 'wpinv_reports_tab_export_content_bottom' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_bottom'); ?>
                 </div>
             </div>
         </div>
         <?php
     }
     
-    public function export_location( $relative = false ) {
+    public function export_location($relative = false) {
         $upload_dir         = wp_upload_dir();
-        $export_location    = $relative ? trailingslashit( $upload_dir['baseurl'] ) . 'cache' : trailingslashit( $upload_dir['basedir'] ) . 'cache';
-        $export_location    = apply_filters( 'wpinv_export_location', $export_location, $relative );
+        $export_location    = $relative ? trailingslashit($upload_dir['baseurl']) . 'cache' : trailingslashit($upload_dir['basedir']) . 'cache';
+        $export_location    = apply_filters('wpinv_export_location', $export_location, $relative);
         
-        return trailingslashit( $export_location );
+        return trailingslashit($export_location);
     }
     
     public function check_export_location() {
         try {
-            if ( empty( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: Could not access filesystem.', 'invoicing' );
+            if (empty($this->wp_filesystem)) {
+                return __('Filesystem ERROR: Could not access filesystem.', 'invoicing');
             }
 
-            if ( is_wp_error( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing' );
+            if (is_wp_error($this->wp_filesystem)) {
+                return __('Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing');
             }
         
-            $is_dir         = $this->wp_filesystem->is_dir( $this->export_dir );
-            $is_writeable   = $is_dir && is_writeable( $this->export_dir );
+            $is_dir         = $this->wp_filesystem->is_dir($this->export_dir);
+            $is_writeable   = $is_dir && is_writeable($this->export_dir);
             
-            if ( $is_dir && $is_writeable ) {
+            if ($is_dir && $is_writeable) {
                return true;
-            } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+            } else if ($is_dir && !$is_writeable) {
+               if (!$this->wp_filesystem->chmod($this->export_dir, FS_CHMOD_DIR)) {
+                   return wp_sprintf(__('Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing'), $this->export_dir);
                }
                
                return true;
             } else {
-                if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
-                    return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );
+                if (!$this->wp_filesystem->mkdir($this->export_dir, FS_CHMOD_DIR)) {
+                    return wp_sprintf(__('Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing'), $this->export_dir);
                 }
                 
                 return true;
             }
-        } catch ( Exception $e ) {
+        } catch (Exception $e) {
             return $e->getMessage();
         }
     }
@@ -188,130 +188,130 @@ 
     public function ajax_export() {
         $response               = array();
         $response['success']    = false;
-        $response['msg']        = __( 'Invalid export request found.', 'invoicing' );
+        $response['msg']        = __('Invalid export request found.', 'invoicing');
         
-        if ( empty( $_POST['data'] ) || !current_user_can( 'manage_options' ) ) {
-            wp_send_json( $response );
+        if (empty($_POST['data']) || !current_user_can('manage_options')) {
+            wp_send_json($response);
         }
 
-        parse_str( $_POST['data'], $data );
+        parse_str($_POST['data'], $data);
         
-        $data['step']   = !empty( $_POST['step'] ) ? absint( $_POST['step'] ) : 1;
+        $data['step'] = !empty($_POST['step']) ? absint($_POST['step']) : 1;
 
         $_REQUEST = (array)$data;
-        if ( !( !empty( $_REQUEST['wpi_ajax_export'] ) && wp_verify_nonce( $_REQUEST['wpi_ajax_export'], 'wpi_ajax_export' ) ) ) {
-            $response['msg']    = __( 'Security check failed.', 'invoicing' );
-            wp_send_json( $response );
+        if (!(!empty($_REQUEST['wpi_ajax_export']) && wp_verify_nonce($_REQUEST['wpi_ajax_export'], 'wpi_ajax_export'))) {
+            $response['msg'] = __('Security check failed.', 'invoicing');
+            wp_send_json($response);
         }
         
-        if ( ( $error = $this->check_export_location( true ) ) !== true ) {
-            $response['msg'] = __( 'Filesystem ERROR: ' . $error, 'invoicing' );
-            wp_send_json( $response );
+        if (($error = $this->check_export_location(true)) !== true) {
+            $response['msg'] = __('Filesystem ERROR: ' . $error, 'invoicing');
+            wp_send_json($response);
         }
                         
-        $this->set_export_params( $_REQUEST );
+        $this->set_export_params($_REQUEST);
         
         $return = $this->process_export_step();
         $done   = $this->get_export_status();
         
-        if ( $return ) {
+        if ($return) {
             $this->step += 1;
             
             $response['success']    = true;
             $response['msg']        = '';
             
-            if ( $done >= 100 ) {
+            if ($done >= 100) {
                 $this->step     = 'done';
-                $new_filename   = 'wpi-' . $this->export . '-' . date( 'y-m-d-H-i' ) . '.' . $this->filetype;
+                $new_filename   = 'wpi-' . $this->export . '-' . date('y-m-d-H-i') . '.' . $this->filetype;
                 $new_file       = $this->export_dir . $new_filename;
                 
-                if ( file_exists( $this->file ) ) {
-                    $this->wp_filesystem->move( $this->file, $new_file, true );
+                if (file_exists($this->file)) {
+                    $this->wp_filesystem->move($this->file, $new_file, true);
                 }
                 
-                if ( file_exists( $new_file ) ) {
-                    $response['data']['file'] = array( 'u' => $this->export_url . $new_filename, 's' => size_format( filesize( $new_file ), 2 ) );
+                if (file_exists($new_file)) {
+                    $response['data']['file'] = array('u' => $this->export_url . $new_filename, 's' => size_format(filesize($new_file), 2));
                 }
             }
             
             $response['data']['step']   = $this->step;
             $response['data']['done']   = $done;
         } else {
-            $response['msg']    = __( 'No data found for export.', 'invoicing' );
+            $response['msg'] = __('No data found for export.', 'invoicing');
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
-    public function set_export_params( $request ) {
+    public function set_export_params($request) {
         $this->empty    = false;
-        $this->step     = !empty( $request['step'] ) ? absint( $request['step'] ) : 1;
-        $this->export   = !empty( $request['export'] ) ? $request['export'] : $this->export;
+        $this->step     = !empty($request['step']) ? absint($request['step']) : 1;
+        $this->export   = !empty($request['export']) ? $request['export'] : $this->export;
         $this->filename = 'wpi-' . $this->export . '-' . $request['wpi_ajax_export'] . '.' . $this->filetype;
         $this->file     = $this->export_dir . $this->filename;
         
-        do_action( 'wpinv_export_set_params_' . $this->export, $request );
+        do_action('wpinv_export_set_params_' . $this->export, $request);
     }
     
     public function get_columns() {
         $columns = array(
-            'id'   => __( 'ID',   'invoicing' ),
-            'date' => __( 'Date', 'invoicing' )
+            'id'   => __('ID', 'invoicing'),
+            'date' => __('Date', 'invoicing')
         );
         
-        return apply_filters( 'wpinv_export_get_columns_' . $this->export, $columns );
+        return apply_filters('wpinv_export_get_columns_' . $this->export, $columns);
     }
     
     protected function get_export_file() {
         $file = '';
 
-        if ( $this->wp_filesystem->exists( $this->file ) ) {
-            $file = $this->wp_filesystem->get_contents( $this->file );
+        if ($this->wp_filesystem->exists($this->file)) {
+            $file = $this->wp_filesystem->get_contents($this->file);
         } else {
-            $this->wp_filesystem->put_contents( $this->file, '' );
+            $this->wp_filesystem->put_contents($this->file, '');
         }
 
         return $file;
     }
     
-    protected function attach_export_data( $data = '' ) {
-        $filedata   = $this->get_export_file();
-        $filedata   .= $data;
+    protected function attach_export_data($data = '') {
+        $filedata = $this->get_export_file();
+        $filedata .= $data;
         
-        $this->wp_filesystem->put_contents( $this->file, $filedata );
+        $this->wp_filesystem->put_contents($this->file, $filedata);
 
-        $rows       = file( $this->file, FILE_SKIP_EMPTY_LINES );
+        $rows       = file($this->file, FILE_SKIP_EMPTY_LINES);
         $columns    = $this->get_columns();
-        $columns    = empty( $columns ) ? 0 : 1;
+        $columns    = empty($columns) ? 0 : 1;
 
-        $this->empty = count( $rows ) == $columns ? true : false;
+        $this->empty = count($rows) == $columns ? true : false;
     }
     
     public function print_columns() {
         $column_data    = '';
         $columns        = $this->get_columns();
         $i              = 1;
-        foreach( $columns as $key => $column ) {
-            $column_data .= '"' . addslashes( $column ) . '"';
-            $column_data .= $i == count( $columns ) ? '' : ',';
+        foreach ($columns as $key => $column) {
+            $column_data .= '"' . addslashes($column) . '"';
+            $column_data .= $i == count($columns) ? '' : ',';
             $i++;
         }
         $column_data .= "\r\n";
 
-        $this->attach_export_data( $column_data );
+        $this->attach_export_data($column_data);
 
         return $column_data;
     }
     
     public function process_export_step() {
-        if ( $this->step < 2 ) {
-            @unlink( $this->file );
+        if ($this->step < 2) {
+            @unlink($this->file);
             $this->print_columns();
         }
         
         $return = $this->print_rows();
         
-        if ( $return ) {
+        if ($return) {
             return true;
         } else {
             return false;
@@ -320,23 +320,23 @@ 
     
     public function get_export_status() {
         $status = 100;
-        return apply_filters( 'wpinv_get_export_status_' . $this->export, $status );
+        return apply_filters('wpinv_get_export_status_' . $this->export, $status);
     }
     
     public function get_export_data() {
         $data = array(
             0 => array(
                 'id'   => '',
-                'data' => date( 'F j, Y' )
+                'data' => date('F j, Y')
             ),
             1 => array(
                 'id'   => '',
-                'data' => date( 'F j, Y' )
+                'data' => date('F j, Y')
             )
         );
 
-        $data = apply_filters( 'wpinv_export_get_data', $data );
-        $data = apply_filters( 'wpinv_export_get_data_' . $this->export, $data );
+        $data = apply_filters('wpinv_export_get_data', $data);
+        $data = apply_filters('wpinv_export_get_data_' . $this->export, $data);
 
         return $data;
     }
@@ -346,20 +346,20 @@ 
         $data       = $this->get_export_data();
         $columns    = $this->get_columns();
 
-        if ( $data ) {
-            foreach ( $data as $row ) {
+        if ($data) {
+            foreach ($data as $row) {
                 $i = 1;
-                foreach ( $row as $key => $column ) {
-                    if ( array_key_exists( $key, $columns ) ) {
-                        $row_data .= '"' . addslashes( preg_replace( "/\"/","'", $column ) ) . '"';
-                        $row_data .= $i == count( $columns ) ? '' : ',';
+                foreach ($row as $key => $column) {
+                    if (array_key_exists($key, $columns)) {
+                        $row_data .= '"' . addslashes(preg_replace("/\"/", "'", $column)) . '"';
+                        $row_data .= $i == count($columns) ? '' : ',';
                         $i++;
                     }
                 }
                 $row_data .= "\r\n";
             }
 
-            $this->attach_export_data( $row_data );
+            $this->attach_export_data($row_data);
 
             return $row_data;
         }
@@ -368,46 +368,46 @@ 
     }
     
     // Export Invoices.
-    public function set_invoices_export( $request ) {
-        $this->from_date    = isset( $request['from_date'] ) ? sanitize_text_field( $request['from_date'] ) : '';
-        $this->to_date      = isset( $request['to_date'] ) ? sanitize_text_field( $request['to_date'] ) : '';
-        $this->status       = isset( $request['status'] ) ? sanitize_text_field( $request['status'] ) : 'publish';
+    public function set_invoices_export($request) {
+        $this->from_date    = isset($request['from_date']) ? sanitize_text_field($request['from_date']) : '';
+        $this->to_date      = isset($request['to_date']) ? sanitize_text_field($request['to_date']) : '';
+        $this->status       = isset($request['status']) ? sanitize_text_field($request['status']) : 'publish';
     }
     
-    public function get_invoices_columns( $columns = array() ) {
+    public function get_invoices_columns($columns = array()) {
         $columns = array(
-            'id'            => __( 'ID',   'invoicing' ),
-            'number'        => __( 'Number',   'invoicing' ),
-            'date'          => __( 'Date', 'invoicing' ),
-            'amount'        => __( 'Amount', 'invoicing' ),
-            'status_nicename'  => __( 'Status Nicename', 'invoicing' ),
-            'status'        => __( 'Status', 'invoicing' ),
-            'tax'           => __( 'Tax', 'invoicing' ),
-            'discount'      => __( 'Discount', 'invoicing' ),
-            'user_id'       => __( 'User ID', 'invoicing' ),
-            'email'         => __( 'Email', 'invoicing' ),
-            'first_name'    => __( 'First Name', 'invoicing' ),
-            'last_name'     => __( 'Last Name', 'invoicing' ),
-            'address'       => __( 'Address', 'invoicing' ),
-            'city'          => __( 'City', 'invoicing' ),
-            'state'         => __( 'State', 'invoicing' ),
-            'country'       => __( 'Country', 'invoicing' ),
-            'zip'           => __( 'Zipcode', 'invoicing' ),
-            'phone'         => __( 'Phone', 'invoicing' ),
-            'company'       => __( 'Company', 'invoicing' ),
-            'vat_number'    => __( 'Vat Number', 'invoicing' ),
-            'ip'            => __( 'IP', 'invoicing' ),
-            'gateway'       => __( 'Gateway', 'invoicing' ),
-            'gateway_nicename'       => __( 'Gateway Nicename', 'invoicing' ),
-            'transaction_id'=> __( 'Transaction ID', 'invoicing' ),
-            'currency'      => __( 'Currency', 'invoicing' ),
-            'due_date'      => __( 'Due Date', 'invoicing' ),
+            'id'            => __('ID', 'invoicing'),
+            'number'        => __('Number', 'invoicing'),
+            'date'          => __('Date', 'invoicing'),
+            'amount'        => __('Amount', 'invoicing'),
+            'status_nicename'  => __('Status Nicename', 'invoicing'),
+            'status'        => __('Status', 'invoicing'),
+            'tax'           => __('Tax', 'invoicing'),
+            'discount'      => __('Discount', 'invoicing'),
+            'user_id'       => __('User ID', 'invoicing'),
+            'email'         => __('Email', 'invoicing'),
+            'first_name'    => __('First Name', 'invoicing'),
+            'last_name'     => __('Last Name', 'invoicing'),
+            'address'       => __('Address', 'invoicing'),
+            'city'          => __('City', 'invoicing'),
+            'state'         => __('State', 'invoicing'),
+            'country'       => __('Country', 'invoicing'),
+            'zip'           => __('Zipcode', 'invoicing'),
+            'phone'         => __('Phone', 'invoicing'),
+            'company'       => __('Company', 'invoicing'),
+            'vat_number'    => __('Vat Number', 'invoicing'),
+            'ip'            => __('IP', 'invoicing'),
+            'gateway'       => __('Gateway', 'invoicing'),
+            'gateway_nicename'       => __('Gateway Nicename', 'invoicing'),
+            'transaction_id'=> __('Transaction ID', 'invoicing'),
+            'currency'      => __('Currency', 'invoicing'),
+            'due_date'      => __('Due Date', 'invoicing'),
         );
 
         return $columns;
     }
         
-    public function get_invoices_data( $response = array() ) {
+    public function get_invoices_data($response = array()) {
         $args = array(
             'limit'    => $this->per_page,
             'page'     => $this->step,
@@ -415,35 +415,35 @@ 
             'orderby'  => 'date',
         );
         
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
         
         $data = array();
         
-        if ( !empty( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (!empty($invoices)) {
+            foreach ($invoices as $invoice) {
                 $row = array(
                     'id'            => $invoice->ID,
                     'number'        => $invoice->get_number(),
-                    'date'          => $invoice->get_invoice_date( false ),
-                    'amount'        => wpinv_round_amount( $invoice->get_total() ),
-                    'status_nicename' => $invoice->get_status( true ),
+                    'date'          => $invoice->get_invoice_date(false),
+                    'amount'        => wpinv_round_amount($invoice->get_total()),
+                    'status_nicename' => $invoice->get_status(true),
                     'status'        => $invoice->get_status(),
-                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount( $invoice->get_tax() ) : '',
-                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount( $invoice->get_discount() ) : '',
+                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount($invoice->get_tax()) : '',
+                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount($invoice->get_discount()) : '',
                     'user_id'       => $invoice->get_user_id(),
                     'email'         => $invoice->get_email(),
                     'first_name'    => $invoice->get_first_name(),
@@ -464,7 +464,7 @@ 
                     'due_date'      => $invoice->needs_payment() ? $invoice->get_due_date() : '',
                 );
                 
-                $data[] = apply_filters( 'wpinv_export_invoice_row', $row, $invoice );
+                $data[] = apply_filters('wpinv_export_invoice_row', $row, $invoice);
             }
 
             return $data;
@@ -480,29 +480,29 @@ 
             'return'   => 'ids',
         );
         
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices   = wpinv_get_invoices( $args );
-        $total      = !empty( $invoices ) ? count( $invoices ) : 0;
+        $invoices   = wpinv_get_invoices($args);
+        $total      = !empty($invoices) ? count($invoices) : 0;
         $status     = 100;
 
-        if ( $total > 0 ) {
-            $status = ( ( $this->per_page * $this->step ) / $total ) * 100;
+        if ($total > 0) {
+            $status = (($this->per_page * $this->step) / $total) * 100;
         }
 
-        if ( $status > 100 ) {
+        if ($status > 100) {
             $status = 100;
         }
 

includes/wpinv-email-functions.php

Spacing +507 added lines, -507 removed lines

@@ -7,12 +7,12 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_init_transactional_emails() {
-    $email_actions = apply_filters( 'wpinv_email_actions', array(
+    $email_actions = apply_filters('wpinv_email_actions', array(
         'wpinv_status_pending_to_processing',
         'wpinv_status_pending_to_publish',
         'wpinv_status_pending_to_cancelled',
@@ -28,79 +28,79 @@ 
         'wpinv_fully_refunded',
         'wpinv_partially_refunded',
         'wpinv_new_invoice_note'
-    ) );
+    ));
 
-    foreach ( $email_actions as $action ) {
-        add_action( $action, 'wpinv_send_transactional_email', 10, 10 );
+    foreach ($email_actions as $action) {
+        add_action($action, 'wpinv_send_transactional_email', 10, 10);
     }
 }
-add_action( 'init', 'wpinv_init_transactional_emails' );
+add_action('init', 'wpinv_init_transactional_emails');
 
 // New invoice email
-add_action( 'wpinv_status_pending_to_processing_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_pending_to_publish_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_pending_to_onhold_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_failed_to_processing_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_failed_to_publish_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_failed_to_onhold_notification', 'wpinv_new_invoice_notification' );
+add_action('wpinv_status_pending_to_processing_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_pending_to_publish_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_pending_to_onhold_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_failed_to_processing_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_failed_to_publish_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_failed_to_onhold_notification', 'wpinv_new_invoice_notification');
 
 // Cancelled invoice email
-add_action( 'wpinv_status_pending_to_cancelled_notification', 'wpinv_cancelled_invoice_notification' );
-add_action( 'wpinv_status_onhold_to_cancelled_notification', 'wpinv_cancelled_invoice_notification' );
+add_action('wpinv_status_pending_to_cancelled_notification', 'wpinv_cancelled_invoice_notification');
+add_action('wpinv_status_onhold_to_cancelled_notification', 'wpinv_cancelled_invoice_notification');
 
 // Failed invoice email
-add_action( 'wpinv_status_pending_to_failed_notification', 'wpinv_failed_invoice_notification' );
-add_action( 'wpinv_status_onhold_to_failed_notification', 'wpinv_failed_invoice_notification' );
+add_action('wpinv_status_pending_to_failed_notification', 'wpinv_failed_invoice_notification');
+add_action('wpinv_status_onhold_to_failed_notification', 'wpinv_failed_invoice_notification');
 
 // On hold invoice email
-add_action( 'wpinv_status_pending_to_onhold_notification', 'wpinv_onhold_invoice_notification' );
-add_action( 'wpinv_status_failed_to_onhold_notification', 'wpinv_onhold_invoice_notification' );
+add_action('wpinv_status_pending_to_onhold_notification', 'wpinv_onhold_invoice_notification');
+add_action('wpinv_status_failed_to_onhold_notification', 'wpinv_onhold_invoice_notification');
 
 // Processing invoice email
-add_action( 'wpinv_status_pending_to_processing_notification', 'wpinv_processing_invoice_notification' );
+add_action('wpinv_status_pending_to_processing_notification', 'wpinv_processing_invoice_notification');
 
 // Paid invoice email
-add_action( 'wpinv_status_publish_notification', 'wpinv_completed_invoice_notification' );
+add_action('wpinv_status_publish_notification', 'wpinv_completed_invoice_notification');
 
 // Refunded invoice email
-add_action( 'wpinv_fully_refunded_notification', 'wpinv_fully_refunded_notification' );
-add_action( 'wpinv_partially_refunded_notification', 'wpinv_partially_refunded_notification' );
+add_action('wpinv_fully_refunded_notification', 'wpinv_fully_refunded_notification');
+add_action('wpinv_partially_refunded_notification', 'wpinv_partially_refunded_notification');
 
 // Invoice note
-add_action( 'wpinv_new_invoice_note_notification', 'wpinv_new_invoice_note_notification' );
+add_action('wpinv_new_invoice_note_notification', 'wpinv_new_invoice_note_notification');
 
-add_action( 'wpinv_email_header', 'wpinv_email_header' );
-add_action( 'wpinv_email_footer', 'wpinv_email_footer' );
-add_action( 'wpinv_email_invoice_details', 'wpinv_email_invoice_details', 10, 3 );
-add_action( 'wpinv_email_invoice_items', 'wpinv_email_invoice_items', 10, 3 );
-add_action( 'wpinv_email_billing_details', 'wpinv_email_billing_details', 10, 3 );
-add_action( 'wpinv_email_before_note_details', 'wpinv_email_before_note_details', 10, 4 );
+add_action('wpinv_email_header', 'wpinv_email_header');
+add_action('wpinv_email_footer', 'wpinv_email_footer');
+add_action('wpinv_email_invoice_details', 'wpinv_email_invoice_details', 10, 3);
+add_action('wpinv_email_invoice_items', 'wpinv_email_invoice_items', 10, 3);
+add_action('wpinv_email_billing_details', 'wpinv_email_billing_details', 10, 3);
+add_action('wpinv_email_before_note_details', 'wpinv_email_before_note_details', 10, 4);
 
 function wpinv_send_transactional_email() {
     $args       = func_get_args();
     $function   = current_filter() . '_notification';
-    do_action_ref_array( $function, $args );
+    do_action_ref_array($function, $args);
 }
     
-function wpinv_new_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_new_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'new_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -117,41 +117,41 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_cancelled_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_cancelled_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'cancelled_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -168,41 +168,41 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_failed_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_failed_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'failed_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -219,41 +219,41 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_onhold_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_onhold_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'onhold_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -270,49 +270,49 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_processing_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_processing_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'processing_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -329,49 +329,49 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_completed_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_completed_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'completed_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -388,49 +388,49 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_fully_refunded_notification( $invoice_id, $new_status = '' ) {
+function wpinv_fully_refunded_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'refunded_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -447,50 +447,50 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'           => $invoice,
             'email_type'        => $email_type,
             'email_heading'     => $email_heading,
             'sent_to_admin'     => false,
             'plain_text'        => false,
             'partial_refund'    => false
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_partially_refunded_notification( $invoice_id, $new_status = '' ) {
+function wpinv_partially_refunded_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'refunded_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -507,53 +507,53 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'           => $invoice,
             'email_type'        => $email_type,
             'email_heading'     => $email_heading,
             'sent_to_admin'     => false,
             'plain_text'        => false,
             'partial_refund'    => true
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_new_invoice_note_notification( $invoice_id, $new_status = '' ) {
+function wpinv_new_invoice_note_notification($invoice_id, $new_status = '') {
 }
 
-function wpinv_user_invoice_notification( $invoice_id ) {
+function wpinv_user_invoice_notification($invoice_id) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'user_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -570,52 +570,52 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( $sent ) {
-        $note = __( 'Invoice has been emailed to the user.', 'invoicing' );
+    if ($sent) {
+        $note = __('Invoice has been emailed to the user.', 'invoicing');
     } else {
-        $note = __( 'Fail to send invoice to the user!', 'invoicing' );
+        $note = __('Fail to send invoice to the user!', 'invoicing');
     }
-    $invoice->add_note( $note ); // Add private note.
+    $invoice->add_note($note); // Add private note.
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_user_note_notification( $invoice_id, $args = array() ) {
+function wpinv_user_note_notification($invoice_id, $args = array()) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'user_note';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
     
@@ -623,7 +623,7 @@ 
         'user_note' => ''
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
         
     $search                     = array();
     $search['invoice_number']   = '{invoice_number}';
@@ -642,46 +642,46 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
             'customer_note' => $args['user_note']
-        ) );
+        ));
         
-    $content        = wpinv_email_format_text( $content );
+    $content = wpinv_email_format_text($content);
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
         
     return $sent;
 }
 
 function wpinv_mail_get_from_address() {
-    $from_address = apply_filters( 'wpinv_mail_from_address', wpinv_get_option( 'email_from' ) );
-    return sanitize_email( $from_address );
+    $from_address = apply_filters('wpinv_mail_from_address', wpinv_get_option('email_from'));
+    return sanitize_email($from_address);
 }
 
 function wpinv_mail_get_from_name() {
-    $from_name = apply_filters( 'wpinv_mail_from_name', wpinv_get_option( 'email_from_name' ) );
-    return wp_specialchars_decode( esc_html( $from_name ), ENT_QUOTES );
+    $from_name = apply_filters('wpinv_mail_from_name', wpinv_get_option('email_from_name'));
+    return wp_specialchars_decode(esc_html($from_name), ENT_QUOTES);
 }
 
-function wpinv_mail_admin_bcc_active( $mail_type = '' ) {
-    $active = apply_filters( 'wpinv_mail_admin_bcc_active', wpinv_get_option( 'email_' . $mail_type . '_admin_bcc' ) );
-    return ( $active ? true : false );
+function wpinv_mail_admin_bcc_active($mail_type = '') {
+    $active = apply_filters('wpinv_mail_admin_bcc_active', wpinv_get_option('email_' . $mail_type . '_admin_bcc'));
+    return ($active ? true : false);
 }
     
-function wpinv_mail_get_content_type(  $content_type = 'text/html', $email_type = 'html' ) {
-    $email_type = apply_filters( 'wpinv_mail_content_type', $email_type );
+function wpinv_mail_get_content_type($content_type = 'text/html', $email_type = 'html') {
+    $email_type = apply_filters('wpinv_mail_content_type', $email_type);
     
-    switch ( $email_type ) {
+    switch ($email_type) {
         case 'html' :
             $content_type = 'text/html';
             break;
@@ -696,35 +696,35 @@ 
     return $content_type;
 }
     
-function wpinv_mail_send( $to, $subject, $message, $headers, $attachments ) {
-    add_filter( 'wp_mail_from', 'wpinv_mail_get_from_address' );
-    add_filter( 'wp_mail_from_name', 'wpinv_mail_get_from_name' );
-    add_filter( 'wp_mail_content_type', 'wpinv_mail_get_content_type' );
+function wpinv_mail_send($to, $subject, $message, $headers, $attachments) {
+    add_filter('wp_mail_from', 'wpinv_mail_get_from_address');
+    add_filter('wp_mail_from_name', 'wpinv_mail_get_from_name');
+    add_filter('wp_mail_content_type', 'wpinv_mail_get_content_type');
 
-    $message = wpinv_email_style_body( $message );
-    $message = apply_filters( 'wpinv_mail_content', $message );
+    $message = wpinv_email_style_body($message);
+    $message = apply_filters('wpinv_mail_content', $message);
     
-    $sent  = wp_mail( $to, $subject, $message, $headers, $attachments );
+    $sent = wp_mail($to, $subject, $message, $headers, $attachments);
     
-    if ( !$sent ) {
-        $log_message = wp_sprintf( __( "\nTime: %s\nTo: %s\nSubject: %s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), ( is_array( $to ) ? implode( ', ', $to ) : $to ), $subject );
-        wpinv_error_log( $log_message, __( "Email from Invoicing plugin failed to send", 'invoicing' ), __FILE__, __LINE__ );
+    if (!$sent) {
+        $log_message = wp_sprintf(__("\nTime: %s\nTo: %s\nSubject: %s\n", 'invoicing'), date_i18n('F j Y H:i:s', current_time('timestamp')), (is_array($to) ? implode(', ', $to) : $to), $subject);
+        wpinv_error_log($log_message, __("Email from Invoicing plugin failed to send", 'invoicing'), __FILE__, __LINE__);
     }
 
-    remove_filter( 'wp_mail_from', 'wpinv_mail_get_from_address' );
-    remove_filter( 'wp_mail_from_name', 'wpinv_mail_get_from_name' );
-    remove_filter( 'wp_mail_content_type', 'wpinv_mail_get_content_type' );
+    remove_filter('wp_mail_from', 'wpinv_mail_get_from_address');
+    remove_filter('wp_mail_from_name', 'wpinv_mail_get_from_name');
+    remove_filter('wp_mail_content_type', 'wpinv_mail_get_content_type');
 
     return $sent;
 }
     
 function wpinv_get_emails() {
     $overdue_days_options       = array();
-    $overdue_days_options[0]    = __( 'On the Due Date', 'invoicing' );
-    $overdue_days_options[1]    = __( '1 day after Due Date', 'invoicing' );
+    $overdue_days_options[0]    = __('On the Due Date', 'invoicing');
+    $overdue_days_options[1]    = __('1 day after Due Date', 'invoicing');
     
-    for ( $i = 2; $i <= 10; $i++ ) {
-        $overdue_days_options[$i]   = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+    for ($i = 2; $i <= 10; $i++) {
+        $overdue_days_options[$i] = wp_sprintf(__('%d days after Due Date', 'invoicing'), $i);
     }
 
 	// Default, built-in gateways
@@ -732,130 +732,130 @@ 
             'new_invoice' => array(
             'email_new_invoice_header' => array(
                 'id'   => 'email_new_invoice_header',
-                'name' => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'New invoice emails are sent to admin when a new invoice is received.', 'invoicing' ),
+                'name' => '<h3>' . __('New Invoice', 'invoicing') . '</h3>',
+                'desc' => __('New invoice emails are sent to admin when a new invoice is received.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_new_invoice_active' => array(
                 'id'   => 'email_new_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_new_invoice_subject' => array(
                 'id'   => 'email_new_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] New payment invoice ({invoice_number}) - {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] New payment invoice ({invoice_number}) - {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_new_invoice_heading' => array(
                 'id'   => 'email_new_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'New payment invoice', 'invoicing' ),
+                'std'  => __('New payment invoice', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'cancelled_invoice' => array(
             'email_cancelled_invoice_header' => array(
                 'id'   => 'email_cancelled_invoice_header',
-                'name' => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Cancelled invoice emails are sent to admin when invoices have been marked cancelled.', 'invoicing' ),
+                'name' => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Cancelled invoice emails are sent to admin when invoices have been marked cancelled.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_cancelled_invoice_active' => array(
                 'id'   => 'email_cancelled_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_cancelled_invoice_subject' => array(
                 'id'   => 'email_cancelled_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Cancelled invoice ({invoice_number})', 'invoicing' ),
+                'std'  => __('[{site_title}] Cancelled invoice ({invoice_number})', 'invoicing'),
                 'size' => 'large'
             ),
             'email_cancelled_invoice_heading' => array(
                 'id'   => 'email_cancelled_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Cancelled invoice', 'invoicing' ),
+                'std'  => __('Cancelled invoice', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'failed_invoice' => array(
             'email_failed_invoice_header' => array(
                 'id'   => 'email_failed_invoice_header',
-                'name' => '<h3>' . __( 'Failed Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Failed invoice emails are sent to admin when invoices have been marked failed (if they were previously processing or on-hold).', 'invoicing' ),
+                'name' => '<h3>' . __('Failed Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Failed invoice emails are sent to admin when invoices have been marked failed (if they were previously processing or on-hold).', 'invoicing'),
                 'type' => 'header',
             ),
             'email_failed_invoice_active' => array(
                 'id'   => 'email_failed_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_failed_invoice_subject' => array(
                 'id'   => 'email_failed_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Failed invoice ({invoice_number})', 'invoicing' ),
+                'std'  => __('[{site_title}] Failed invoice ({invoice_number})', 'invoicing'),
                 'size' => 'large'
             ),
             'email_failed_invoice_heading' => array(
                 'id'   => 'email_failed_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Failed invoice', 'invoicing' ),
+                'std'  => __('Failed invoice', 'invoicing'),
                 'size' => 'large'
             )
         ),
         'onhold_invoice' => array(
             'email_onhold_invoice_header' => array(
                 'id'   => 'email_onhold_invoice_header',
-                'name' => '<h3>' . __( 'On Hold Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'This is an invoice notification sent to users containing invoice details after an invoice is placed on-hold.', 'invoicing' ),
+                'name' => '<h3>' . __('On Hold Invoice', 'invoicing') . '</h3>',
+                'desc' => __('This is an invoice notification sent to users containing invoice details after an invoice is placed on-hold.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_onhold_invoice_active' => array(
                 'id'   => 'email_onhold_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_onhold_invoice_subject' => array(
                 'id'   => 'email_onhold_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_onhold_invoice_heading' => array(
                 'id'   => 'email_onhold_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Thank you for your invoice', 'invoicing' ),
+                'std'  => __('Thank you for your invoice', 'invoicing'),
                 'size' => 'large'
             ),
             'email_onhold_invoice_admin_bcc' => array(
                 'id'   => 'email_onhold_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
@@ -863,37 +863,37 @@ 
         'processing_invoice' => array(
             'email_processing_invoice_header' => array(
                 'id'   => 'email_processing_invoice_header',
-                'name' => '<h3>' . __( 'Processing Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'This is an invoice notification sent to users containing invoice details after payment.', 'invoicing' ),
+                'name' => '<h3>' . __('Processing Invoice', 'invoicing') . '</h3>',
+                'desc' => __('This is an invoice notification sent to users containing invoice details after payment.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_processing_invoice_active' => array(
                 'id'   => 'email_processing_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_processing_invoice_subject' => array(
                 'id'   => 'email_processing_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_processing_invoice_heading' => array(
                 'id'   => 'email_processing_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Thank you for your invoice', 'invoicing' ),
+                'std'  => __('Thank you for your invoice', 'invoicing'),
                 'size' => 'large'
             ),
             'email_processing_invoice_admin_bcc' => array(
                 'id'   => 'email_processing_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
@@ -901,37 +901,37 @@ 
         'completed_invoice' => array(
             'email_completed_invoice_header' => array(
                 'id'   => 'email_completed_invoice_header',
-                'name' => '<h3>' . __( 'Paid Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Invoice paid emails are sent to users when their invoices are marked paid and usually indicate that their payment has been done.', 'invoicing' ),
+                'name' => '<h3>' . __('Paid Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Invoice paid emails are sent to users when their invoices are marked paid and usually indicate that their payment has been done.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_completed_invoice_active' => array(
                 'id'   => 'email_completed_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_completed_invoice_subject' => array(
                 'id'   => 'email_completed_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing'),
                 'size' => 'large'
             ),
             'email_completed_invoice_heading' => array(
                 'id'   => 'email_completed_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice has been paid', 'invoicing' ),
+                'std'  => __('Your invoice has been paid', 'invoicing'),
                 'size' => 'large'
             ),
             'email_completed_invoice_admin_bcc' => array(
                 'id'   => 'email_completed_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
             ),
             'std'  => 1
@@ -939,37 +939,37 @@ 
         'refunded_invoice' => array(
             'email_refunded_invoice_header' => array(
                 'id'   => 'email_refunded_invoice_header',
-                'name' => '<h3>' . __( 'Refunded Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Invoice refunded emails are sent to users when their invoices are marked refunded.', 'invoicing' ),
+                'name' => '<h3>' . __('Refunded Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Invoice refunded emails are sent to users when their invoices are marked refunded.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_refunded_invoice_active' => array(
                 'id'   => 'email_refunded_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_refunded_invoice_subject' => array(
                 'id'   => 'email_refunded_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing'),
                 'size' => 'large'
             ),
             'email_refunded_invoice_heading' => array(
                 'id'   => 'email_refunded_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice has been refunded', 'invoicing' ),
+                'std'  => __('Your invoice has been refunded', 'invoicing'),
                 'size' => 'large'
             ),
             'email_refunded_invoice_admin_bcc' => array(
                 'id'   => 'email_refunded_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
@@ -977,37 +977,37 @@ 
         'user_invoice' => array(
             'email_user_invoice_header' => array(
                 'id'   => 'email_user_invoice_header',
-                'name' => '<h3>' . __( 'Customer Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Customer invoice emails can be sent to customers containing their invoice information and payment links.', 'invoicing' ),
+                'name' => '<h3>' . __('Customer Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Customer invoice emails can be sent to customers containing their invoice information and payment links.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_user_invoice_active' => array(
                 'id'   => 'email_user_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_user_invoice_subject' => array(
                 'id'   => 'email_user_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_user_invoice_heading' => array(
                 'id'   => 'email_user_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice {invoice_number} details', 'invoicing' ),
+                'std'  => __('Your invoice {invoice_number} details', 'invoicing'),
                 'size' => 'large'
             ),
             'email_user_invoice_admin_bcc' => array(
                 'id'   => 'email_user_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
@@ -1015,177 +1015,177 @@ 
         'user_note' => array(
             'email_user_note_header' => array(
                 'id'   => 'email_user_note_header',
-                'name' => '<h3>' . __( 'Customer Note', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Customer note emails are sent when you add a note to an invoice.', 'invoicing' ),
+                'name' => '<h3>' . __('Customer Note', 'invoicing') . '</h3>',
+                'desc' => __('Customer note emails are sent when you add a note to an invoice.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_user_note_active' => array(
                 'id'   => 'email_user_note_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_user_note_subject' => array(
                 'id'   => 'email_user_note_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Note added to your invoice #{invoice_number} from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Note added to your invoice #{invoice_number} from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_user_note_heading' => array(
                 'id'   => 'email_user_note_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'A note has been added to your invoice', 'invoicing' ),
+                'std'  => __('A note has been added to your invoice', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'overdue' => array(
             'email_overdue_header' => array(
                 'id'   => 'email_overdue_header',
-                'name' => '<h3>' . __( 'Payment Reminder', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Payment reminder emails are sent to user automatically.', 'invoicing' ),
+                'name' => '<h3>' . __('Payment Reminder', 'invoicing') . '</h3>',
+                'desc' => __('Payment reminder emails are sent to user automatically.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_overdue_active' => array(
                 'id'   => 'email_overdue_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_due_reminder_days' => array(
                 'id'        => 'email_due_reminder_days',
-                'name'      => __( 'When to Send', 'sliced-invoices' ),
-                'desc'      => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+                'name'      => __('When to Send', 'sliced-invoices'),
+                'desc'      => __('Check when you would like payment reminders sent out.', 'invoicing'),
                 'default'   => '',
                 'type'      => 'multicheck',
                 'options'   => $overdue_days_options,
             ),
             'email_overdue_subject' => array(
                 'id'   => 'email_overdue_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Payment Reminder', 'invoicing' ),
+                'std'  => __('[{site_title}] Payment Reminder', 'invoicing'),
                 'size' => 'large'
             ),
             'email_overdue_heading' => array(
                 'id'   => 'email_overdue_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Payment reminder for your invoice', 'invoicing' ),
+                'std'  => __('Payment reminder for your invoice', 'invoicing'),
                 'size' => 'large'
             ),
             'email_overdue_body' => array(
                 'id'   => 'email_overdue_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email.', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email.', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To pay now for this invoice please use the following link: <a href="{invoice_pay_link}">Pay Now</a></p>', 'invoicing' ),
+                'std'  => __('<p>Hi {full_name},</p><p>This is just a friendly reminder your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To pay now for this invoice please use the following link: <a href="{invoice_pay_link}">Pay Now</a></p>', 'invoicing'),
                 'class' => 'large',
                 'size'  => 10,
             ),
         ),
     );
 
-    return apply_filters( 'wpinv_get_emails', $emails );
+    return apply_filters('wpinv_get_emails', $emails);
 }
 
-function wpinv_settings_emails( $settings = array() ) {
+function wpinv_settings_emails($settings = array()) {
     $emails = wpinv_get_emails();
     
-    if ( !empty( $emails ) ) {
-        foreach ( $emails as $key => $email ) {
+    if (!empty($emails)) {
+        foreach ($emails as $key => $email) {
             $settings[$key] = $email;
         }
     }
     
-    return apply_filters( 'wpinv_settings_get_emails', $settings );
+    return apply_filters('wpinv_settings_get_emails', $settings);
 }
-add_filter( 'wpinv_settings_emails', 'wpinv_settings_emails', 10, 1 );
+add_filter('wpinv_settings_emails', 'wpinv_settings_emails', 10, 1);
 
-function wpinv_settings_sections_emails( $settings ) {
+function wpinv_settings_sections_emails($settings) {
     $emails = wpinv_get_emails();
     
     if (!empty($emails)) {
-        foreach  ($emails as $key => $email) {
-            $settings[$key] = !empty( $email['email_' . $key . '_header']['name'] ) ? strip_tags( $email['email_' . $key . '_header']['name'] ) : $key;
+        foreach ($emails as $key => $email) {
+            $settings[$key] = !empty($email['email_' . $key . '_header']['name']) ? strip_tags($email['email_' . $key . '_header']['name']) : $key;
         }
     }
     
     return $settings;    
 }
-add_filter( 'wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1 );
+add_filter('wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1);
 
-function wpinv_email_is_enabled( $email_type ) {
+function wpinv_email_is_enabled($email_type) {
     $emails = wpinv_get_emails();
-    $enabled = isset( $emails[$email_type] ) && wpinv_get_option( $email_type . '_active', 1 ) ? true : false;
+    $enabled = isset($emails[$email_type]) && wpinv_get_option($email_type . '_active', 1) ? true : false;
 
-    return apply_filters( 'wpinv_email_is_enabled', $enabled, $email_type );
+    return apply_filters('wpinv_email_is_enabled', $enabled, $email_type);
 }
 
-function wpinv_email_get_recipient( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    switch ( $email_type ) {
+function wpinv_email_get_recipient($email_type = '', $invoice_id = 0, $invoice = array()) {
+    switch ($email_type) {
         case 'new_invoice':
         case 'cancelled_invoice':
         case 'failed_invoice':
             $recipient  = wpinv_get_admin_email();
         break;
         default:
-            $invoice    = !empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : NULL );
-            $recipient  = !empty( $invoice ) ? $invoice->get_email() : '';
+            $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : NULL);
+            $recipient  = !empty($invoice) ? $invoice->get_email() : '';
         break;
     }
     
-    return apply_filters( 'wpinv_email_recipient', $recipient, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_recipient', $recipient, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_subject( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $subject    = wpinv_get_option( 'email_' . $email_type . '_subject' );
+function wpinv_email_get_subject($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $subject    = wpinv_get_option('email_' . $email_type . '_subject');
     
-    $subject    = wpinv_email_format_text( $subject );
+    $subject    = wpinv_email_format_text($subject);
     
-    return apply_filters( 'wpinv_email_subject', $subject, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_subject', $subject, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_heading( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $email_heading = wpinv_get_option( 'email_' . $email_type . '_heading' );
+function wpinv_email_get_heading($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $email_heading = wpinv_get_option('email_' . $email_type . '_heading');
     
-    $email_heading = wpinv_email_format_text( $email_heading );
+    $email_heading = wpinv_email_format_text($email_heading);
     
-    return apply_filters( 'wpinv_email_heading', $email_heading, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_heading', $email_heading, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_content( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $content    = wpinv_get_option( 'email_' . $email_type . '_body' );
+function wpinv_email_get_content($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $content    = wpinv_get_option('email_' . $email_type . '_body');
     
-    $content    = wpinv_email_format_text( $content );
+    $content    = wpinv_email_format_text($content);
     
-    return apply_filters( 'wpinv_email_content', $content, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_content', $content, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_headers( $email_type = '', $invoice_id = 0, $invoice = array() ) {
+function wpinv_email_get_headers($email_type = '', $invoice_id = 0, $invoice = array()) {
     $from_name = wpinv_mail_get_from_address();
     $from_email = wpinv_mail_get_from_address();
     
-    $invoice    = !empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : NULL );
+    $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : NULL);
     
-    $headers    = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-    $headers    .= "Reply-To: ". $from_email . "\r\n";
+    $headers    = "From: " . stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8')) . " <$from_email>\r\n";
+    $headers    .= "Reply-To: " . $from_email . "\r\n";
     $headers    .= "Content-Type: " . wpinv_mail_get_content_type() . "\r\n";
     
-    return apply_filters( 'wpinv_email_headers', $headers, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_headers', $headers, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_attachments( $email_type = '', $invoice_id = 0, $invoice = array() ) {
+function wpinv_email_get_attachments($email_type = '', $invoice_id = 0, $invoice = array()) {
     $attachments = array();
     
-    return apply_filters( 'wpinv_email_attachments', $attachments, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_attachments', $attachments, $email_type, $invoice_id, $invoice);
 }
 
 function wpinv_email_global_vars() {
@@ -1202,73 +1202,73 @@ 
     $replace['sitename']    = $blogname;
     $replace['site-title']  = $blogname;
     
-    return apply_filters( 'wpinv_email_global_vars', array( $search, $replace ) );
+    return apply_filters('wpinv_email_global_vars', array($search, $replace));
 }
 
-function wpinv_email_format_text( $content ) {
+function wpinv_email_format_text($content) {
     global $wpinv_email_search, $wpinv_email_replace;
     
-    if ( empty( $wpinv_email_search ) ) {
+    if (empty($wpinv_email_search)) {
         $wpinv_email_search = array();
     }
     
-    if ( empty( $wpinv_email_replace ) ) {
+    if (empty($wpinv_email_replace)) {
         $wpinv_email_replace = array();
     }
     
-    $wpinv_email_search     = (array)apply_filters( 'wpinv_email_format_text_search', $wpinv_email_search );
-    $wpinv_email_replace    = (array)apply_filters( 'wpinv_email_format_text_replace', $wpinv_email_replace );
+    $wpinv_email_search     = (array)apply_filters('wpinv_email_format_text_search', $wpinv_email_search);
+    $wpinv_email_replace    = (array)apply_filters('wpinv_email_format_text_replace', $wpinv_email_replace);
     
     $global_vars    = wpinv_email_global_vars();
     
-    $search         = array_merge( $global_vars[0], $wpinv_email_search );
-    $replace        = array_merge( $global_vars[1], $wpinv_email_replace );
+    $search         = array_merge($global_vars[0], $wpinv_email_search);
+    $replace        = array_merge($global_vars[1], $wpinv_email_replace);
     
-    if ( empty( $search ) || empty( $replace ) || !is_array( $search ) || !is_array( $replace ) ) {
+    if (empty($search) || empty($replace) || !is_array($search) || !is_array($replace)) {
         return  $content;
     }
         
-    return str_replace( $search, $replace, $content );
+    return str_replace($search, $replace, $content);
 }
 
-function wpinv_email_style_body( $content ) {
+function wpinv_email_style_body($content) {
     // make sure we only inline CSS for html emails
-    if ( in_array( wpinv_mail_get_content_type(), array( 'text/html', 'multipart/alternative' ) ) && class_exists( 'DOMDocument' ) ) {
+    if (in_array(wpinv_mail_get_content_type(), array('text/html', 'multipart/alternative')) && class_exists('DOMDocument')) {
         ob_start();
-        wpinv_get_template( 'emails/wpinv-email-styles.php' );
-        $css = apply_filters( 'wpinv_email_styles', ob_get_clean() );
+        wpinv_get_template('emails/wpinv-email-styles.php');
+        $css = apply_filters('wpinv_email_styles', ob_get_clean());
         
         // apply CSS styles inline for picky email clients
         try {
-            $emogrifier = new Emogrifier( $content, $css );
+            $emogrifier = new Emogrifier($content, $css);
             $content    = $emogrifier->emogrify();
-        } catch ( Exception $e ) {
-            wpinv_error_log( $e->getMessage(), 'emogrifier' );
+        } catch (Exception $e) {
+            wpinv_error_log($e->getMessage(), 'emogrifier');
         }
     }
     return $content;
 }
 
-function wpinv_email_header( $email_heading = '', $invoice = array(), $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-header.php', array( 'email_heading' => $email_heading, 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_header($email_heading = '', $invoice = array(), $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-header.php', array('email_heading' => $email_heading, 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
 /**
  * Get the email footer.
  */
-function wpinv_email_footer( $invoice = array(), $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-footer.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_footer($invoice = array(), $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-footer.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_wrap_message( $message ) {
+function wpinv_email_wrap_message($message) {
     // Buffer
     ob_start();
 
-    do_action( 'wpinv_email_header' );
+    do_action('wpinv_email_header');
 
-    echo wpautop( wptexturize( $message ) );
+    echo wpautop(wptexturize($message));
 
-    do_action( 'wpinv_email_footer' );
+    do_action('wpinv_email_footer');
 
     // Get contents
     $message = ob_get_clean();
@@ -1276,86 +1276,86 @@ 
     return $message;
 }
 
-function wpinv_email_invoice_details( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-invoice-details.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_invoice_details($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-invoice-details.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_invoice_items( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-invoice-items.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_invoice_items($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-invoice-items.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_billing_details( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-billing-details.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_billing_details($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-billing-details.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_send_customer_invoice( $data = array() ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_customer_invoice($data = array()) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
 
-    if ( !current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to send invoice notification', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to send invoice notification', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
-    $sent = wpinv_user_invoice_notification( $invoice_id );
+    $sent = wpinv_user_invoice_notification($invoice_id);
     
     $status = $sent ? 'email_sent' : 'email_fail';
     
-    $redirect = add_query_arg( array( 'wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false ) );
-    wp_redirect( $redirect );
+    $redirect = add_query_arg(array('wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false));
+    wp_redirect($redirect);
     exit;
 }
-add_action( 'wpinv_send_invoice', 'wpinv_send_customer_invoice' );
+add_action('wpinv_send_invoice', 'wpinv_send_customer_invoice');
 
-function wpinv_send_overdue_reminder( $data = array() ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_overdue_reminder($data = array()) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
 
-    if ( !current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to send reminder notification', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to send reminder notification', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
-    $sent = wpinv_send_payment_reminder_notification( $invoice_id );
+    $sent = wpinv_send_payment_reminder_notification($invoice_id);
     
     $status = $sent ? 'email_sent' : 'email_fail';
     
-    $redirect = add_query_arg( array( 'wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false ) );
-    wp_redirect( $redirect );
+    $redirect = add_query_arg(array('wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false));
+    wp_redirect($redirect);
     exit;
 }
-add_action( 'wpinv_send_reminder', 'wpinv_send_overdue_reminder' );
+add_action('wpinv_send_reminder', 'wpinv_send_overdue_reminder');
 
-function wpinv_send_customer_note_email( $data ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_customer_note_email($data) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
     
-    $sent = wpinv_user_note_notification( $invoice_id, $data );
+    $sent = wpinv_user_note_notification($invoice_id, $data);
 }
-add_action( 'wpinv_new_customer_note', 'wpinv_send_customer_note_email', 10, 1 );
+add_action('wpinv_new_customer_note', 'wpinv_send_customer_note_email', 10, 1);
 
-function wpinv_add_notes_to_invoice_email( $invoice, $email_type, $sent_to_admin ) {
-    if ( !empty( $invoice ) && $email_type == 'user_invoice' && $invoice_notes = wpinv_get_invoice_notes( $invoice->ID, true ) ) {
-        $date_format = get_option( 'date_format' );
-        $time_format = get_option( 'time_format' );
+function wpinv_add_notes_to_invoice_email($invoice, $email_type, $sent_to_admin) {
+    if (!empty($invoice) && $email_type == 'user_invoice' && $invoice_notes = wpinv_get_invoice_notes($invoice->ID, true)) {
+        $date_format = get_option('date_format');
+        $time_format = get_option('time_format');
         ?>
         <div id="wpinv-email-notes">
-            <h3 class="wpinv-notes-t"><?php echo apply_filters( 'wpinv_email_invoice_notes_title', __( 'Invoice Notes', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-notes-t"><?php echo apply_filters('wpinv_email_invoice_notes_title', __('Invoice Notes', 'invoicing')); ?></h3>
             <ol class="wpinv-notes-lists">
         <?php
-        foreach ( $invoice_notes as $note ) {
-            $note_time = strtotime( $note->comment_date );
+        foreach ($invoice_notes as $note) {
+            $note_time = strtotime($note->comment_date);
             ?>
             <li class="comment wpinv-note">
-            <p class="wpinv-note-date meta"><?php printf( __( '%2$s at %3$s', 'invoicing' ), $note->comment_author, date_i18n( $date_format, $note_time ), date_i18n( $time_format, $note_time ), $note_time ); ?></p>
-            <div class="wpinv-note-desc description"><?php echo wpautop( wptexturize( $note->comment_content ) ); ?></div>
+            <p class="wpinv-note-date meta"><?php printf(__('%2$s at %3$s', 'invoicing'), $note->comment_author, date_i18n($date_format, $note_time), date_i18n($time_format, $note_time), $note_time); ?></p>
+            <div class="wpinv-note-desc description"><?php echo wpautop(wptexturize($note->comment_content)); ?></div>
             </li>
             <?php
         }
@@ -1364,21 +1364,21 @@ 
         <?php
     }
 }
-add_action( 'wpinv_email_billing_details', 'wpinv_add_notes_to_invoice_email', 10, 3 );
+add_action('wpinv_email_billing_details', 'wpinv_add_notes_to_invoice_email', 10, 3);
 
 function wpinv_email_payment_reminders() {    
     global $wpi_auto_reminder;
-    if ( !wpinv_get_option( 'email_overdue_active' ) ) {
+    if (!wpinv_get_option('email_overdue_active')) {
         return;
     }
     
-    if ( $reminder_days = wpinv_get_option( 'email_due_reminder_days' ) ) {
-        $reminder_days  = is_array( $reminder_days ) ? array_values( $reminder_days ) : '';
+    if ($reminder_days = wpinv_get_option('email_due_reminder_days')) {
+        $reminder_days  = is_array($reminder_days) ? array_values($reminder_days) : '';
         
-        if ( empty( $reminder_days ) ) {
+        if (empty($reminder_days)) {
             return;
         }
-        $reminder_days  = array_unique( array_map( 'absint', $reminder_days ) );
+        $reminder_days = array_unique(array_map('absint', $reminder_days));
         
         $args = array(
             'post_type'     => 'wpi_invoice',
@@ -1388,7 +1388,7 @@ 
             'meta_query'    => array(
                 array(
                     'key'       =>  '_wpinv_due_date',
-                    'value'     =>  array( '', 'none' ),
+                    'value'     =>  array('', 'none'),
                     'compare'   =>  'NOT IN',
                 )
             ),
@@ -1397,64 +1397,64 @@ 
             'order'         => 'ASC',
         );
         
-        $invoices = get_posts( $args );
+        $invoices = get_posts($args);
         
-        if ( empty( $invoices ) ) {
+        if (empty($invoices)) {
             return;
         }
         
-        $date_to_send   = array();
+        $date_to_send = array();
         
-        foreach ( $invoices as $id ) {
-            $due_date = get_post_meta( $id, '_wpinv_due_date', true );
+        foreach ($invoices as $id) {
+            $due_date = get_post_meta($id, '_wpinv_due_date', true);
             
-            foreach ( $reminder_days as $key => $days ) {
-                if ( $days !== '' ) {
-                    $date_to_send[$id][] = date_i18n( 'Y-m-d', strtotime( $due_date ) + ( $days * DAY_IN_SECONDS ) );
+            foreach ($reminder_days as $key => $days) {
+                if ($days !== '') {
+                    $date_to_send[$id][] = date_i18n('Y-m-d', strtotime($due_date) + ($days * DAY_IN_SECONDS));
                 }
             }
         }
 
-        $today              = date_i18n( 'Y-m-d' );
+        $today              = date_i18n('Y-m-d');
         $wpi_auto_reminder  = true;
 
-        foreach ( $date_to_send as $id => $values ) {
-            if ( in_array( $today, $values ) ) {
-                $sent = get_post_meta( $id, '_wpinv_reminder_sent', true );
+        foreach ($date_to_send as $id => $values) {
+            if (in_array($today, $values)) {
+                $sent = get_post_meta($id, '_wpinv_reminder_sent', true);
 
-                if ( isset( $sent ) && !empty( $sent ) ) {
-                    if ( !in_array( $today, $sent ) ) {
-                        do_action( 'wpinv_send_payment_reminder_notification', $id );
+                if (isset($sent) && !empty($sent)) {
+                    if (!in_array($today, $sent)) {
+                        do_action('wpinv_send_payment_reminder_notification', $id);
                     }
                 } else {
-                    do_action( 'wpinv_send_payment_reminder_notification', $id );
+                    do_action('wpinv_send_payment_reminder_notification', $id);
                 }
             }
         }
         
-        $wpi_auto_reminder  = false;
+        $wpi_auto_reminder = false;
     }
 }
 
-function wpinv_send_payment_reminder_notification( $invoice_id ) {
+function wpinv_send_payment_reminder_notification($invoice_id) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'overdue';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice    = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !$invoice->needs_payment() ) {
+    if (!$invoice->needs_payment()) {
         return false;
     }
     
-    $recipient  = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -1470,70 +1470,70 @@ 
     $replace                    = array();
     $replace['full_name']       = $invoice->get_user_full_name();
     $replace['invoice_number']  = $invoice->get_number();
-    $replace['invoice_due_date']= $invoice->get_due_date( true );
-    $replace['invoice_total']   = $invoice->get_total( true );
-    $replace['invoice_link']    = $invoice->get_view_url( true );
-    $replace['invoice_pay_link']= $invoice->get_checkout_payment_url( false, true );
-    $replace['is_was']          = strtotime( $invoice->get_due_date() ) < strtotime( date_i18n( 'Y-m-d' ) ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' );
+    $replace['invoice_due_date'] = $invoice->get_due_date(true);
+    $replace['invoice_total']   = $invoice->get_total(true);
+    $replace['invoice_link']    = $invoice->get_view_url(true);
+    $replace['invoice_pay_link'] = $invoice->get_checkout_payment_url(false, true);
+    $replace['is_was']          = strtotime($invoice->get_due_date()) < strtotime(date_i18n('Y-m-d')) ? __('was', 'invoicing') : __('is', 'invoicing');
 
     $wpinv_email_search         = $search;
     $wpinv_email_replace        = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $message_body   = wpinv_email_get_content( $email_type, $invoice_id, $invoice );
+    $message_body   = wpinv_email_get_content($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
             'message_body'  => $message_body
-        ) );
+        ));
         
-    $content        = wpinv_email_format_text( $content );
+    $content = wpinv_email_format_text($content);
 
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
-    if ( $sent ) {
-        do_action( 'wpinv_payment_reminder_sent', $invoice_id, $invoice );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
+    if ($sent) {
+        do_action('wpinv_payment_reminder_sent', $invoice_id, $invoice);
     }
         
     return $sent;
 }
-add_action( 'wpinv_send_payment_reminder_notification', 'wpinv_send_payment_reminder_notification', 10, 1 );
+add_action('wpinv_send_payment_reminder_notification', 'wpinv_send_payment_reminder_notification', 10, 1);
 
-function wpinv_payment_reminder_sent( $invoice_id, $invoice ) {
+function wpinv_payment_reminder_sent($invoice_id, $invoice) {
     global $wpi_auto_reminder;
     
-    $sent = get_post_meta( $invoice_id, '_wpinv_reminder_sent', true );
+    $sent = get_post_meta($invoice_id, '_wpinv_reminder_sent', true);
     
-    if ( empty( $sent ) ) {
+    if (empty($sent)) {
         $sent = array();
     }
-    $sent[] = date_i18n( 'Y-m-d' );
+    $sent[] = date_i18n('Y-m-d');
     
-    update_post_meta( $invoice_id, '_wpinv_reminder_sent', $sent );
+    update_post_meta($invoice_id, '_wpinv_reminder_sent', $sent);
     
-    if ( $wpi_auto_reminder ) { // Auto reminder note.
-        $note = __( 'Manual reminder sent to the user.', 'invoicing' );
-        $invoice->add_note( $note, false, false, true );
+    if ($wpi_auto_reminder) { // Auto reminder note.
+        $note = __('Manual reminder sent to the user.', 'invoicing');
+        $invoice->add_note($note, false, false, true);
     } else { // Menual reminder note.
-        $note = __( 'Manual reminder sent to the user.', 'invoicing' );
-        $invoice->add_note( $note );
+        $note = __('Manual reminder sent to the user.', 'invoicing');
+        $invoice->add_note($note);
     }
 }
-add_action( 'wpinv_payment_reminder_sent', 'wpinv_payment_reminder_sent', 10, 2 );
+add_action('wpinv_payment_reminder_sent', 'wpinv_payment_reminder_sent', 10, 2);
 
-function wpinv_email_before_note_details( $invoice, $email_type, $sent_to_admin, $customer_note ) {
-    if("wpi_invoice" === $invoice->post_type && !empty($customer_note)){
+function wpinv_email_before_note_details($invoice, $email_type, $sent_to_admin, $customer_note) {
+    if ("wpi_invoice" === $invoice->post_type && !empty($customer_note)) {
         $before_note = '';
-        $before_note .= __( 'Hello, a note has just been added to your invoice:', 'invoicing' );
-        $before_note .= '<blockquote class="wpinv-note">'.wpautop( wptexturize( $customer_note ) ).'</blockquote>';
-        $before_note .= __( 'For your reference, your invoice details are shown below.', 'invoicing' );
+        $before_note .= __('Hello, a note has just been added to your invoice:', 'invoicing');
+        $before_note .= '<blockquote class="wpinv-note">' . wpautop(wptexturize($customer_note)) . '</blockquote>';
+        $before_note .= __('For your reference, your invoice details are shown below.', 'invoicing');
         echo $before_note;
     }
 }
\ No newline at end of file

includes/wpinv-discount-functions.php

Spacing +469 added lines, -469 removed lines

@@ -7,90 +7,90 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_get_discount_types() {
     $discount_types = array(
-                        'percent'   => __( 'Percentage', 'invoicing' ),
-                        'flat'     => __( 'Flat Amount', 'invoicing' ),
+                        'percent'   => __('Percentage', 'invoicing'),
+                        'flat'     => __('Flat Amount', 'invoicing'),
                     );
-    return (array)apply_filters( 'wpinv_discount_types', $discount_types );
+    return (array)apply_filters('wpinv_discount_types', $discount_types);
 }
 
-function wpinv_get_discount_type_name( $type = '' ) {
+function wpinv_get_discount_type_name($type = '') {
     $types = wpinv_get_discount_types();
-    return isset( $types[ $type ] ) ? $types[ $type ] : '';
+    return isset($types[$type]) ? $types[$type] : '';
 }
 
-function wpinv_delete_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_delete_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to delete discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to delete discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     $discount_id = $data['discount'];
-    wpinv_remove_discount( $discount_id );
+    wpinv_remove_discount($discount_id);
 }
-add_action( 'wpinv_delete_discount', 'wpinv_delete_discount' );
+add_action('wpinv_delete_discount', 'wpinv_delete_discount');
 
-function wpinv_activate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_activate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to edit discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to edit discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'publish' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'publish');
 }
-add_action( 'wpinv_activate_discount', 'wpinv_activate_discount' );
+add_action('wpinv_activate_discount', 'wpinv_activate_discount');
 
-function wpinv_deactivate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_deactivate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to create discount codes', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to create discount codes', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'pending' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'pending');
 }
-add_action( 'wpinv_deactivate_discount', 'wpinv_deactivate_discount' );
+add_action('wpinv_deactivate_discount', 'wpinv_deactivate_discount');
 
-function wpinv_get_discounts( $args = array() ) {
+function wpinv_get_discounts($args = array()) {
     $defaults = array(
         'post_type'      => 'wpi_discount',
         'posts_per_page' => 20,
         'paged'          => null,
-        'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+        'post_status'    => array('publish', 'pending', 'draft', 'expired')
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $discounts = get_posts( $args );
+    $discounts = get_posts($args);
 
-    if ( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
-    if( ! $discounts && ! empty( $args['s'] ) ) {
+    if (!$discounts && !empty($args['s'])) {
         $args['meta_key']     = 'gd_discount_code';
         $args['meta_value']   = $args['s'];
         $args['meta_compare'] = 'LIKE';
-        unset( $args['s'] );
-        $discounts = get_posts( $args );
+        unset($args['s']);
+        $discounts = get_posts($args);
     }
 
-    if( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
@@ -102,9 +102,9 @@ 
 
     $discounts  = wpinv_get_discounts();
 
-    if ( $discounts) {
-        foreach ( $discounts as $discount ) {
-            if ( wpinv_is_discount_active( $discount->ID ) ) {
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            if (wpinv_is_discount_active($discount->ID)) {
                 $has_active = true;
                 break;
             }
@@ -113,38 +113,38 @@ 
     return $has_active;
 }
 
-function wpinv_get_discount( $discount_id = 0 ) {
-    if( empty( $discount_id ) ) {
+function wpinv_get_discount($discount_id = 0) {
+    if (empty($discount_id)) {
         return false;
     }
     
-    if ( get_post_type( $discount_id ) != 'wpi_discount' ) {
+    if (get_post_type($discount_id) != 'wpi_discount') {
         return false;
     }
 
-    $discount = get_post( $discount_id );
+    $discount = get_post($discount_id);
 
     return $discount;
 }
 
-function wpinv_get_discount_by_code( $code = '' ) {
-    if( empty( $code ) || ! is_string( $code ) ) {
+function wpinv_get_discount_by_code($code = '') {
+    if (empty($code) || !is_string($code)) {
         return false;
     }
 
-    return wpinv_get_discount_by( 'code', $code );
+    return wpinv_get_discount_by('code', $code);
 }
 
-function wpinv_get_discount_by( $field = '', $value = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_discount_by($field = '', $value = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
 
-    if( ! is_string( $field ) ) {
+    if (!is_string($field)) {
         return false;
     }
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
 
         case 'code':
             $meta_query     = array();
@@ -154,32 +154,32 @@ 
                 'compare' => '='
             );
             
-            $discount = wpinv_get_discounts( array(
+            $discount = wpinv_get_discounts(array(
                 'posts_per_page' => 1,
                 'post_status'    => 'any',
                 'meta_query'     => $meta_query,
-            ) );
+            ));
             
-            if( $discount ) {
+            if ($discount) {
                 $discount = $discount[0];
             }
 
             break;
 
         case 'id':
-            $discount = wpinv_get_discount( $value );
+            $discount = wpinv_get_discount($value);
 
             break;
 
         case 'name':
-            $discount = get_posts( array(
+            $discount = get_posts(array(
                 'post_type'      => 'wpi_discount',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
-            if( $discount ) {
+            if ($discount) {
                 $discount = $discount[0];
             }
 
@@ -189,99 +189,99 @@ 
             return false;
     }
 
-    if( ! empty( $discount ) ) {
+    if (!empty($discount)) {
         return $discount;
     }
 
     return false;
 }
 
-function wpinv_store_discount( $post_id, $data, $post, $update = false ) {
+function wpinv_store_discount($post_id, $data, $post, $update = false) {
     $meta = array(
-        'code'              => isset( $data['code'] )             ? sanitize_text_field( $data['code'] )              : '',
-        'type'              => isset( $data['type'] )             ? sanitize_text_field( $data['type'] )              : 'percent',
-        'amount'            => isset( $data['amount'] )           ? wpinv_sanitize_amount( $data['amount'] )          : '',
-        'start'             => isset( $data['start'] )            ? sanitize_text_field( $data['start'] )             : '',
-        'expiration'        => isset( $data['expiration'] )       ? sanitize_text_field( $data['expiration'] )        : '',
-        'min_total'         => isset( $data['min_total'] )        ? wpinv_sanitize_amount( $data['min_total'] )       : '',
-        'max_total'         => isset( $data['max_total'] )        ? wpinv_sanitize_amount( $data['max_total'] )       : '',
-        'max_uses'          => isset( $data['max_uses'] )         ? absint( $data['max_uses'] )                       : '',
-        'items'             => isset( $data['items'] )            ? $data['items']                                    : array(),
-        'excluded_items'    => isset( $data['excluded_items'] )   ? $data['excluded_items']                           : array(),
-        'is_recurring'      => isset( $data['recurring'] )        ? (bool)$data['recurring']                          : false,
-        'is_single_use'     => isset( $data['single_use'] )       ? (bool)$data['single_use']                         : false,
-        'uses'              => isset( $data['uses'] )             ? (int)$data['uses']                                : false,
+        'code'              => isset($data['code']) ? sanitize_text_field($data['code']) : '',
+        'type'              => isset($data['type']) ? sanitize_text_field($data['type']) : 'percent',
+        'amount'            => isset($data['amount']) ? wpinv_sanitize_amount($data['amount']) : '',
+        'start'             => isset($data['start']) ? sanitize_text_field($data['start']) : '',
+        'expiration'        => isset($data['expiration']) ? sanitize_text_field($data['expiration']) : '',
+        'min_total'         => isset($data['min_total']) ? wpinv_sanitize_amount($data['min_total']) : '',
+        'max_total'         => isset($data['max_total']) ? wpinv_sanitize_amount($data['max_total']) : '',
+        'max_uses'          => isset($data['max_uses']) ? absint($data['max_uses']) : '',
+        'items'             => isset($data['items']) ? $data['items'] : array(),
+        'excluded_items'    => isset($data['excluded_items']) ? $data['excluded_items'] : array(),
+        'is_recurring'      => isset($data['recurring']) ? (bool)$data['recurring'] : false,
+        'is_single_use'     => isset($data['single_use']) ? (bool)$data['single_use'] : false,
+        'uses'              => isset($data['uses']) ? (int)$data['uses'] : false,
     );
     
-    $start_timestamp        = strtotime( $meta['start'] );
+    $start_timestamp        = strtotime($meta['start']);
 
-    if ( !empty( $meta['start'] ) ) {
-        $meta['start']      = date( 'Y-m-d H:i:s', $start_timestamp );
+    if (!empty($meta['start'])) {
+        $meta['start']      = date('Y-m-d H:i:s', $start_timestamp);
     }
         
-    if ( $meta['type'] == 'percent' && (float)$meta['amount'] > 100 ) {
+    if ($meta['type'] == 'percent' && (float)$meta['amount'] > 100) {
         $meta['amount'] = 100;
     }
 
-    if ( !empty( $meta['expiration'] ) ) {
-        $meta['expiration'] = date( 'Y-m-d H:i:s', strtotime( date( 'Y-m-d', strtotime( $meta['expiration'] ) ) . ' 23:59:59' ) );
-        $end_timestamp      = strtotime( $meta['expiration'] );
+    if (!empty($meta['expiration'])) {
+        $meta['expiration'] = date('Y-m-d H:i:s', strtotime(date('Y-m-d', strtotime($meta['expiration'])) . ' 23:59:59'));
+        $end_timestamp      = strtotime($meta['expiration']);
 
-        if ( !empty( $meta['start'] ) && $start_timestamp > $end_timestamp ) {
+        if (!empty($meta['start']) && $start_timestamp > $end_timestamp) {
             $meta['expiration'] = $meta['start']; // Set the expiration date to the start date if start is later than expiration date.
         }
     }
     
-    if ( $meta['uses'] === false ) {
-        unset( $meta['uses'] );
+    if ($meta['uses'] === false) {
+        unset($meta['uses']);
     }
     
-    if ( ! empty( $meta['items'] ) ) {
-        foreach ( $meta['items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['items'][ $key ] );
+    if (!empty($meta['items'])) {
+        foreach ($meta['items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['items'][$key]);
             }
         }
     }
     
-    if ( ! empty( $meta['excluded_items'] ) ) {
-        foreach ( $meta['excluded_items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['excluded_items'][ $key ] );
+    if (!empty($meta['excluded_items'])) {
+        foreach ($meta['excluded_items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['excluded_items'][$key]);
             }
         }
     }
     
-    $meta = apply_filters( 'wpinv_update_discount', $meta, $post_id, $post );
+    $meta = apply_filters('wpinv_update_discount', $meta, $post_id, $post);
     
-    do_action( 'wpinv_pre_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_pre_update_discount', $meta, $post_id, $post);
     
-    foreach( $meta as $key => $value ) {
-        update_post_meta( $post_id, '_wpi_discount_' . $key, $value );
+    foreach ($meta as $key => $value) {
+        update_post_meta($post_id, '_wpi_discount_' . $key, $value);
     }
     
-    do_action( 'wpinv_post_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_post_update_discount', $meta, $post_id, $post);
     
     return $post_id;
 }
 
-function wpinv_remove_discount( $discount_id = 0 ) {
-    do_action( 'wpinv_pre_delete_discount', $discount_id );
+function wpinv_remove_discount($discount_id = 0) {
+    do_action('wpinv_pre_delete_discount', $discount_id);
 
-    wp_delete_post( $discount_id, true );
+    wp_delete_post($discount_id, true);
 
-    do_action( 'wpinv_post_delete_discount', $discount_id );
+    do_action('wpinv_post_delete_discount', $discount_id);
 }
 
-function wpinv_update_discount_status( $code_id = 0, $new_status = 'publish' ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_update_discount_status($code_id = 0, $new_status = 'publish') {
+    $discount = wpinv_get_discount($code_id);
 
-    if ( $discount ) {
-        do_action( 'wpinv_pre_update_discount_status', $code_id, $new_status, $discount->post_status );
+    if ($discount) {
+        do_action('wpinv_pre_update_discount_status', $code_id, $new_status, $discount->post_status);
 
-        wp_update_post( array( 'ID' => $code_id, 'post_status' => $new_status ) );
+        wp_update_post(array('ID' => $code_id, 'post_status' => $new_status));
 
-        do_action( 'wpinv_post_update_discount_status', $code_id, $new_status, $discount->post_status );
+        do_action('wpinv_post_update_discount_status', $code_id, $new_status, $discount->post_status);
 
         return true;
     }
@@ -289,173 +289,173 @@ 
     return false;
 }
 
-function wpinv_discount_exists( $code_id ) {
-    if ( wpinv_get_discount(  $code_id ) ) {
+function wpinv_discount_exists($code_id) {
+    if (wpinv_get_discount($code_id)) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_is_discount_active( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_active($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        if ( wpinv_is_discount_expired( $code_id ) ) {
-            if( defined( 'DOING_AJAX' ) ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is expired.', 'invoicing' ) );
+    if ($discount) {
+        if (wpinv_is_discount_expired($code_id)) {
+            if (defined('DOING_AJAX')) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is expired.', 'invoicing'));
             }
-        } elseif ( $discount->post_status == 'publish' ) {
+        } elseif ($discount->post_status == 'publish') {
             $return = true;
         } else {
-            if( defined( 'DOING_AJAX' ) ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active.', 'invoicing' ) );
+            if (defined('DOING_AJAX')) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active.', 'invoicing'));
             }
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_active', $return, $code_id );
+    return apply_filters('wpinv_is_discount_active', $return, $code_id);
 }
 
-function wpinv_get_discount_code( $code_id = null ) {
-    $code = get_post_meta( $code_id, '_wpi_discount_code', true );
+function wpinv_get_discount_code($code_id = null) {
+    $code = get_post_meta($code_id, '_wpi_discount_code', true);
 
-    return apply_filters( 'wpinv_get_discount_code', $code, $code_id );
+    return apply_filters('wpinv_get_discount_code', $code, $code_id);
 }
 
-function wpinv_get_discount_start_date( $code_id = null ) {
-    $start_date = get_post_meta( $code_id, '_wpi_discount_start', true );
+function wpinv_get_discount_start_date($code_id = null) {
+    $start_date = get_post_meta($code_id, '_wpi_discount_start', true);
 
-    return apply_filters( 'wpinv_get_discount_start_date', $start_date, $code_id );
+    return apply_filters('wpinv_get_discount_start_date', $start_date, $code_id);
 }
 
-function wpinv_get_discount_expiration( $code_id = null ) {
-    $expiration = get_post_meta( $code_id, '_wpi_discount_expiration', true );
+function wpinv_get_discount_expiration($code_id = null) {
+    $expiration = get_post_meta($code_id, '_wpi_discount_expiration', true);
 
-    return apply_filters( 'wpinv_get_discount_expiration', $expiration, $code_id );
+    return apply_filters('wpinv_get_discount_expiration', $expiration, $code_id);
 }
 
-function wpinv_get_discount_max_uses( $code_id = null ) {
-    $max_uses = get_post_meta( $code_id, '_wpi_discount_max_uses', true );
+function wpinv_get_discount_max_uses($code_id = null) {
+    $max_uses = get_post_meta($code_id, '_wpi_discount_max_uses', true);
 
-    return (int) apply_filters( 'wpinv_get_discount_max_uses', $max_uses, $code_id );
+    return (int)apply_filters('wpinv_get_discount_max_uses', $max_uses, $code_id);
 }
 
-function wpinv_get_discount_uses( $code_id = null ) {
-    $uses = get_post_meta( $code_id, '_wpi_discount_uses', true );
+function wpinv_get_discount_uses($code_id = null) {
+    $uses = get_post_meta($code_id, '_wpi_discount_uses', true);
 
-    return (int) apply_filters( 'wpinv_get_discount_uses', $uses, $code_id );
+    return (int)apply_filters('wpinv_get_discount_uses', $uses, $code_id);
 }
 
-function wpinv_get_discount_min_total( $code_id = null ) {
-    $min_total = get_post_meta( $code_id, '_wpi_discount_min_total', true );
+function wpinv_get_discount_min_total($code_id = null) {
+    $min_total = get_post_meta($code_id, '_wpi_discount_min_total', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_min_total', $min_total, $code_id );
+    return (float)apply_filters('wpinv_get_discount_min_total', $min_total, $code_id);
 }
 
-function wpinv_get_discount_max_total( $code_id = null ) {
-    $max_total = get_post_meta( $code_id, '_wpi_discount_max_total', true );
+function wpinv_get_discount_max_total($code_id = null) {
+    $max_total = get_post_meta($code_id, '_wpi_discount_max_total', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_max_total', $max_total, $code_id );
+    return (float)apply_filters('wpinv_get_discount_max_total', $max_total, $code_id);
 }
 
-function wpinv_get_discount_amount( $code_id = null ) {
-    $amount = get_post_meta( $code_id, '_wpi_discount_amount', true );
+function wpinv_get_discount_amount($code_id = null) {
+    $amount = get_post_meta($code_id, '_wpi_discount_amount', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_amount', $amount, $code_id );
+    return (float)apply_filters('wpinv_get_discount_amount', $amount, $code_id);
 }
 
-function wpinv_get_discount_type( $code_id = null, $name = false ) {
-    $type = strtolower( get_post_meta( $code_id, '_wpi_discount_type', true ) );
+function wpinv_get_discount_type($code_id = null, $name = false) {
+    $type = strtolower(get_post_meta($code_id, '_wpi_discount_type', true));
     
-    if ( $name ) {
-        $name = wpinv_get_discount_type_name( $type );
+    if ($name) {
+        $name = wpinv_get_discount_type_name($type);
         
-        return apply_filters( 'wpinv_get_discount_type_name', $name, $code_id );
+        return apply_filters('wpinv_get_discount_type_name', $name, $code_id);
     }
 
-    return apply_filters( 'wpinv_get_discount_type', $type, $code_id );
+    return apply_filters('wpinv_get_discount_type', $type, $code_id);
 }
 
-function wpinv_discount_status( $status ) {
-    switch( $status ){
+function wpinv_discount_status($status) {
+    switch ($status) {
         case 'expired' :
-            $name = __( 'Expired', 'invoicing' );
+            $name = __('Expired', 'invoicing');
             break;
         case 'publish' :
         case 'active' :
-            $name = __( 'Active', 'invoicing' );
+            $name = __('Active', 'invoicing');
             break;
         default :
-            $name = __( 'Inactive', 'invoicing' );
+            $name = __('Inactive', 'invoicing');
             break;
     }
     return $name;
 }
 
-function wpinv_get_discount_excluded_items( $code_id = null ) {
-    $excluded_items = get_post_meta( $code_id, '_wpi_discount_excluded_items', true );
+function wpinv_get_discount_excluded_items($code_id = null) {
+    $excluded_items = get_post_meta($code_id, '_wpi_discount_excluded_items', true);
 
-    if ( empty( $excluded_items ) || ! is_array( $excluded_items ) ) {
+    if (empty($excluded_items) || !is_array($excluded_items)) {
         $excluded_items = array();
     }
 
-    return (array) apply_filters( 'wpinv_get_discount_excluded_items', $excluded_items, $code_id );
+    return (array)apply_filters('wpinv_get_discount_excluded_items', $excluded_items, $code_id);
 }
 
-function wpinv_get_discount_item_reqs( $code_id = null ) {
-    $item_reqs = get_post_meta( $code_id, '_wpi_discount_items', true );
+function wpinv_get_discount_item_reqs($code_id = null) {
+    $item_reqs = get_post_meta($code_id, '_wpi_discount_items', true);
 
-    if ( empty( $item_reqs ) || ! is_array( $item_reqs ) ) {
+    if (empty($item_reqs) || !is_array($item_reqs)) {
         $item_reqs = array();
     }
 
-    return (array) apply_filters( 'wpinv_get_discount_item_reqs', $item_reqs, $code_id );
+    return (array)apply_filters('wpinv_get_discount_item_reqs', $item_reqs, $code_id);
 }
 
-function wpinv_get_discount_item_condition( $code_id = 0 ) {
-    return get_post_meta( $code_id, '_wpi_discount_item_condition', true );
+function wpinv_get_discount_item_condition($code_id = 0) {
+    return get_post_meta($code_id, '_wpi_discount_item_condition', true);
 }
 
-function wpinv_is_discount_not_global( $code_id = 0 ) {
-    return (bool) get_post_meta( $code_id, '_wpi_discount_is_not_global', true );
+function wpinv_is_discount_not_global($code_id = 0) {
+    return (bool)get_post_meta($code_id, '_wpi_discount_is_not_global', true);
 }
 
-function wpinv_is_discount_expired( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_expired($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $expiration = wpinv_get_discount_expiration( $code_id );
-        if ( $expiration ) {
-            $expiration = strtotime( $expiration );
-            if ( $expiration < current_time( 'timestamp' ) ) {
+    if ($discount) {
+        $expiration = wpinv_get_discount_expiration($code_id);
+        if ($expiration) {
+            $expiration = strtotime($expiration);
+            if ($expiration < current_time('timestamp')) {
                 // Discount is expired
-                wpinv_update_discount_status( $code_id, 'pending' );
+                wpinv_update_discount_status($code_id, 'pending');
                 $return = true;
             }
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_expired', $return, $code_id );
+    return apply_filters('wpinv_is_discount_expired', $return, $code_id);
 }
 
-function wpinv_is_discount_started( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_started($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $start_date = wpinv_get_discount_start_date( $code_id );
+    if ($discount) {
+        $start_date = wpinv_get_discount_start_date($code_id);
 
-        if ( $start_date ) {
-            $start_date = strtotime( $start_date );
+        if ($start_date) {
+            $start_date = strtotime($start_date);
 
-            if ( $start_date < current_time( 'timestamp' ) ) {
+            if ($start_date < current_time('timestamp')) {
                 // Discount has past the start date
                 $return = true;
             } else {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active yet.', 'invoicing' ) );
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active yet.', 'invoicing'));
             }
         } else {
             // No start date for this discount, so has to be true
@@ -463,159 +463,159 @@ 
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_started', $return, $code_id );
+    return apply_filters('wpinv_is_discount_started', $return, $code_id);
 }
 
-function wpinv_check_discount_dates( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_check_discount_dates($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $start_date = wpinv_get_discount_start_date( $code_id );
+    if ($discount) {
+        $start_date = wpinv_get_discount_start_date($code_id);
 
-        if ( $start_date ) {
-            $start_date = strtotime( $start_date );
+        if ($start_date) {
+            $start_date = strtotime($start_date);
 
-            if ( $start_date < current_time( 'timestamp' ) ) {
+            if ($start_date < current_time('timestamp')) {
                 // Discount has past the start date
                 $return = true;
             } else {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active yet.', 'invoicing' ) );
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active yet.', 'invoicing'));
             }
         } else {
             // No start date for this discount, so has to be true
             $return = true;
         }
         
-        if ( $return ) {
-            $expiration = wpinv_get_discount_expiration( $code_id );
+        if ($return) {
+            $expiration = wpinv_get_discount_expiration($code_id);
             
-            if ( $expiration ) {
-                $expiration = strtotime( $expiration );
-                if ( $expiration < current_time( 'timestamp' ) ) {
+            if ($expiration) {
+                $expiration = strtotime($expiration);
+                if ($expiration < current_time('timestamp')) {
                     // Discount is expired
-                    wpinv_update_discount_status( $code_id, 'pending' );
+                    wpinv_update_discount_status($code_id, 'pending');
                     $return = true;
                 }
             }
         }
     }
     
-    return apply_filters( 'wpinv_check_discount_dates', $return, $code_id );
+    return apply_filters('wpinv_check_discount_dates', $return, $code_id);
 }
 
-function wpinv_is_discount_maxed_out( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_maxed_out($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $uses = wpinv_get_discount_uses( $code_id );
+    if ($discount) {
+        $uses = wpinv_get_discount_uses($code_id);
         // Large number that will never be reached
-        $max_uses = wpinv_get_discount_max_uses( $code_id );
+        $max_uses = wpinv_get_discount_max_uses($code_id);
         // Should never be greater than, but just in case
-        if ( $uses >= $max_uses && ! empty( $max_uses ) ) {
+        if ($uses >= $max_uses && !empty($max_uses)) {
             // Discount is maxed out
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount has reached its maximum usage.', 'invoicing' ) );
+            wpinv_set_error('wpinv-discount-error', __('This discount has reached its maximum usage.', 'invoicing'));
             $return = true;
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_maxed_out', $return, $code_id );
+    return apply_filters('wpinv_is_discount_maxed_out', $return, $code_id);
 }
 
-function wpinv_discount_is_min_met( $code_id = null ) {
-    $discount = wpinv_get_discount( $code_id );
+function wpinv_discount_is_min_met($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $min         = (float)wpinv_get_discount_min_total( $code_id );
-        $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $code_id );
+    if ($discount) {
+        $min         = (float)wpinv_get_discount_min_total($code_id);
+        $cart_amount = (float)wpinv_get_cart_discountable_subtotal($code_id);
 
-        if ( !$min > 0 || $cart_amount >= $min ) {
+        if (!$min > 0 || $cart_amount >= $min) {
             // Minimum has been met
             $return = true;
         } else {
-            wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Minimum invoice of %s not met.', 'invoicing' ), wpinv_price( wpinv_format_amount( $min ) ) ) );
+            wpinv_set_error('wpinv-discount-error', sprintf(__('Minimum invoice of %s not met.', 'invoicing'), wpinv_price(wpinv_format_amount($min))));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_min_met', $return, $code_id );
+    return apply_filters('wpinv_is_discount_min_met', $return, $code_id);
 }
 
-function wpinv_discount_is_max_met( $code_id = null ) {
-    $discount = wpinv_get_discount( $code_id );
+function wpinv_discount_is_max_met($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $max         = (float)wpinv_get_discount_max_total( $code_id );
-        $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $code_id );
+    if ($discount) {
+        $max         = (float)wpinv_get_discount_max_total($code_id);
+        $cart_amount = (float)wpinv_get_cart_discountable_subtotal($code_id);
 
-        if ( !$max > 0 || $cart_amount <= $max ) {
+        if (!$max > 0 || $cart_amount <= $max) {
             // Minimum has been met
             $return = true;
         } else {
-            wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Maximum invoice of %s not met.', 'invoicing' ), wpinv_price( wpinv_format_amount( $max ) ) ) );
+            wpinv_set_error('wpinv-discount-error', sprintf(__('Maximum invoice of %s not met.', 'invoicing'), wpinv_price(wpinv_format_amount($max))));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_max_met', $return, $code_id );
+    return apply_filters('wpinv_is_discount_max_met', $return, $code_id);
 }
 
-function wpinv_discount_is_single_use( $code_id = 0 ) {
-    $single_use = get_post_meta( $code_id, '_wpi_discount_is_single_use', true );
-    return (bool) apply_filters( 'wpinv_is_discount_single_use', $single_use, $code_id );
+function wpinv_discount_is_single_use($code_id = 0) {
+    $single_use = get_post_meta($code_id, '_wpi_discount_is_single_use', true);
+    return (bool)apply_filters('wpinv_is_discount_single_use', $single_use, $code_id);
 }
 
-function wpinv_discount_is_recurring( $code_id = 0, $code = false ) {
-    if ( $code ) {
-        $discount = wpinv_get_discount_by_code( $code_id );
+function wpinv_discount_is_recurring($code_id = 0, $code = false) {
+    if ($code) {
+        $discount = wpinv_get_discount_by_code($code_id);
         
-        if ( !empty( $discount ) ) {
+        if (!empty($discount)) {
             $code_id = $discount->ID;
         }
     }
     
-    $recurring = get_post_meta( $code_id, '_wpi_discount_is_recurring', true );
+    $recurring = get_post_meta($code_id, '_wpi_discount_is_recurring', true);
     
-    return (bool) apply_filters( 'wpinv_is_discount_recurring', $recurring, $code_id, $code );
+    return (bool)apply_filters('wpinv_is_discount_recurring', $recurring, $code_id, $code);
 }
 
-function wpinv_discount_item_reqs_met( $code_id = null ) {
-    $item_reqs    = wpinv_get_discount_item_reqs( $code_id );
-    $condition    = wpinv_get_discount_item_condition( $code_id );
-    $excluded_ps  = wpinv_get_discount_excluded_items( $code_id );
+function wpinv_discount_item_reqs_met($code_id = null) {
+    $item_reqs    = wpinv_get_discount_item_reqs($code_id);
+    $condition    = wpinv_get_discount_item_condition($code_id);
+    $excluded_ps  = wpinv_get_discount_excluded_items($code_id);
     $cart_items   = wpinv_get_cart_contents();
-    $cart_ids     = $cart_items ? wp_list_pluck( $cart_items, 'id' ) : null;
+    $cart_ids     = $cart_items ? wp_list_pluck($cart_items, 'id') : null;
     $ret          = false;
 
-    if ( empty( $item_reqs ) && empty( $excluded_ps ) ) {
+    if (empty($item_reqs) && empty($excluded_ps)) {
         $ret = true;
     }
 
     // Normalize our data for item requirements, exclusions and cart data
     // First absint the items, then sort, and reset the array keys
-    $item_reqs = array_map( 'absint', $item_reqs );
-    asort( $item_reqs );
-    $item_reqs = array_values( $item_reqs );
+    $item_reqs = array_map('absint', $item_reqs);
+    asort($item_reqs);
+    $item_reqs = array_values($item_reqs);
 
-    $excluded_ps  = array_map( 'absint', $excluded_ps );
-    asort( $excluded_ps );
-    $excluded_ps  = array_values( $excluded_ps );
+    $excluded_ps  = array_map('absint', $excluded_ps);
+    asort($excluded_ps);
+    $excluded_ps  = array_values($excluded_ps);
 
-    $cart_ids     = array_map( 'absint', $cart_ids );
-    asort( $cart_ids );
-    $cart_ids     = array_values( $cart_ids );
+    $cart_ids     = array_map('absint', $cart_ids);
+    asort($cart_ids);
+    $cart_ids     = array_values($cart_ids);
 
     // Ensure we have requirements before proceeding
-    if ( !$ret && ! empty( $item_reqs ) ) {
-        switch( $condition ) {
+    if (!$ret && !empty($item_reqs)) {
+        switch ($condition) {
             case 'all' :
                 // Default back to true
                 $ret = true;
 
-                foreach ( $item_reqs as $item_id ) {
-                    if ( !wpinv_item_in_cart( $item_id ) ) {
-                        wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                foreach ($item_reqs as $item_id) {
+                    if (!wpinv_item_in_cart($item_id)) {
+                        wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                         $ret = false;
                         break;
                     }
@@ -624,15 +624,15 @@ 
                 break;
 
             default : // Any
-                foreach ( $item_reqs as $item_id ) {
-                    if ( wpinv_item_in_cart( $item_id ) ) {
+                foreach ($item_reqs as $item_id) {
+                    if (wpinv_item_in_cart($item_id)) {
                         $ret = true;
                         break;
                     }
                 }
 
-                if( ! $ret ) {
-                    wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                if (!$ret) {
+                    wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                 }
 
                 break;
@@ -641,68 +641,68 @@ 
         $ret = true;
     }
 
-    if( ! empty( $excluded_ps ) ) {
+    if (!empty($excluded_ps)) {
         // Check that there are items other than excluded ones in the cart
-        if( $cart_ids == $excluded_ps ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not valid for the cart contents.', 'invoicing' ) );
+        if ($cart_ids == $excluded_ps) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is not valid for the cart contents.', 'invoicing'));
             $ret = false;
         }
     }
 
-    return (bool) apply_filters( 'wpinv_is_discount_item_req_met', $ret, $code_id, $condition );
+    return (bool)apply_filters('wpinv_is_discount_item_req_met', $ret, $code_id, $condition);
 }
 
-function wpinv_is_discount_used( $code = null, $user = '', $code_id = 0 ) {
+function wpinv_is_discount_used($code = null, $user = '', $code_id = 0) {
     global $wpi_checkout_id;
     
     $return = false;
 
-    if ( empty( $code_id ) ) {
-        $code_id = wpinv_get_discount_id_by_code( $code );
+    if (empty($code_id)) {
+        $code_id = wpinv_get_discount_id_by_code($code);
         
-        if( empty( $code_id ) ) {
+        if (empty($code_id)) {
             return false; // No discount was found
         }
     }
 
-    if ( wpinv_discount_is_single_use( $code_id ) ) {
+    if (wpinv_discount_is_single_use($code_id)) {
         $payments = array();
 
         $user_id = 0;
-        if ( is_int( $user ) ) {
+        if (is_int($user)) {
             $user_id = $user;
-        } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
+        } else if (is_email($user) && $user_data = get_user_by('email', $user)) {
             $user_id = $user_data->ID;
-        } else if ( $user_data = get_user_by( 'login', $user ) ) {
+        } else if ($user_data = get_user_by('login', $user)) {
             $user_id = $user_data->ID;
         }
 
-        if ( !$user_id ) {
-            $query    = array( 'user' => $user_id, 'limit' => false );
-            $payments = wpinv_get_invoices( $query ); // Get all payments with matching email
+        if (!$user_id) {
+            $query    = array('user' => $user_id, 'limit' => false);
+            $payments = wpinv_get_invoices($query); // Get all payments with matching email
         }
 
-        if ( $payments ) {
-            foreach ( $payments as $payment ) {
-                if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
+        if ($payments) {
+            foreach ($payments as $payment) {
+                if ($payment->has_status(array('wpi-cancelled', 'wpi-failed'))) {
                     continue;
                 }
 
                 // Don't count discount used for current invoice chekcout.
-                if ( !empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
+                if (!empty($wpi_checkout_id) && $wpi_checkout_id == $payment->ID) {
                     continue;
                 }
 
-                $discounts = $payment->get_discounts( true );
-                if ( empty( $discounts ) ) {
+                $discounts = $payment->get_discounts(true);
+                if (empty($discounts)) {
                     continue;
                 }
 
-                $discounts = $discounts && !is_array( $discounts ) ? explode( ',', $discounts ) : $discounts;
+                $discounts = $discounts && !is_array($discounts) ? explode(',', $discounts) : $discounts;
 
-                if ( !empty( $discounts ) && is_array( $discounts ) ) {
-                    if ( in_array( strtolower( $code ), array_map( 'strtolower', $discounts ) ) ) {
-                        wpinv_set_error( 'wpinv-discount-error', __( 'This discount has already been redeemed.', 'invoicing' ) );
+                if (!empty($discounts) && is_array($discounts)) {
+                    if (in_array(strtolower($code), array_map('strtolower', $discounts))) {
+                        wpinv_set_error('wpinv-discount-error', __('This discount has already been redeemed.', 'invoicing'));
                         $return = true;
                         break;
                     }
@@ -711,61 +711,61 @@ 
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_used', $return, $code, $user );
+    return apply_filters('wpinv_is_discount_used', $return, $code, $user);
 }
 
-function wpinv_is_discount_valid( $code = '', $user = '', $set_error = true ) {
+function wpinv_is_discount_valid($code = '', $user = '', $set_error = true) {
     $return      = false;
-    $discount_id = wpinv_get_discount_id_by_code( $code );
-    $user        = trim( $user );
+    $discount_id = wpinv_get_discount_id_by_code($code);
+    $user        = trim($user);
 
-    if ( wpinv_get_cart_contents() ) {
-        if ( $discount_id ) {
+    if (wpinv_get_cart_contents()) {
+        if ($discount_id) {
             if (
-                wpinv_is_discount_active( $discount_id ) &&
-                wpinv_check_discount_dates( $discount_id ) &&
-                !wpinv_is_discount_maxed_out( $discount_id ) &&
-                !wpinv_is_discount_used( $code, $user, $discount_id ) &&
-                wpinv_discount_is_min_met( $discount_id ) &&
-                wpinv_discount_is_max_met( $discount_id ) &&
-                wpinv_discount_item_reqs_met( $discount_id )
+                wpinv_is_discount_active($discount_id) &&
+                wpinv_check_discount_dates($discount_id) &&
+                !wpinv_is_discount_maxed_out($discount_id) &&
+                !wpinv_is_discount_used($code, $user, $discount_id) &&
+                wpinv_discount_is_min_met($discount_id) &&
+                wpinv_discount_is_max_met($discount_id) &&
+                wpinv_discount_item_reqs_met($discount_id)
             ) {
                 $return = true;
             }
-        } elseif( $set_error ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is invalid.', 'invoicing' ) );
+        } elseif ($set_error) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is invalid.', 'invoicing'));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_valid', $return, $discount_id, $code, $user );
+    return apply_filters('wpinv_is_discount_valid', $return, $discount_id, $code, $user);
 }
 
-function wpinv_get_discount_id_by_code( $code ) {
-    $discount = wpinv_get_discount_by_code( $code );
-    if( $discount ) {
+function wpinv_get_discount_id_by_code($code) {
+    $discount = wpinv_get_discount_by_code($code);
+    if ($discount) {
         return $discount->ID;
     }
     return false;
 }
 
-function wpinv_get_discounted_amount( $code, $base_price ) {
+function wpinv_get_discounted_amount($code, $base_price) {
     $amount      = $base_price;
-    $discount_id = wpinv_get_discount_id_by_code( $code );
+    $discount_id = wpinv_get_discount_id_by_code($code);
 
-    if( $discount_id ) {
-        $type        = wpinv_get_discount_type( $discount_id );
-        $rate        = wpinv_get_discount_amount( $discount_id );
+    if ($discount_id) {
+        $type        = wpinv_get_discount_type($discount_id);
+        $rate        = wpinv_get_discount_amount($discount_id);
 
-        if ( $type == 'flat' ) {
+        if ($type == 'flat') {
             // Set amount
             $amount = $base_price - $rate;
-            if ( $amount < 0 ) {
+            if ($amount < 0) {
                 $amount = 0;
             }
 
         } else {
             // Percentage discount
-            $amount = $base_price - ( $base_price * ( $rate / 100 ) );
+            $amount = $base_price - ($base_price * ($rate / 100));
         }
 
     } else {
@@ -774,108 +774,108 @@ 
 
     }
 
-    return apply_filters( 'wpinv_discounted_amount', $amount );
+    return apply_filters('wpinv_discounted_amount', $amount);
 }
 
-function wpinv_increase_discount_usage( $code ) {
+function wpinv_increase_discount_usage($code) {
 
-    $id   = wpinv_get_discount_id_by_code( $code );
-    $uses = wpinv_get_discount_uses( $id );
+    $id   = wpinv_get_discount_id_by_code($code);
+    $uses = wpinv_get_discount_uses($id);
 
-    if ( $uses ) {
+    if ($uses) {
         $uses++;
     } else {
         $uses = 1;
     }
 
-    update_post_meta( $id, '_wpi_discount_uses', $uses );
+    update_post_meta($id, '_wpi_discount_uses', $uses);
 
-    do_action( 'wpinv_discount_increase_use_count', $uses, $id, $code );
+    do_action('wpinv_discount_increase_use_count', $uses, $id, $code);
 
     return $uses;
 
 }
 
-function wpinv_decrease_discount_usage( $code ) {
+function wpinv_decrease_discount_usage($code) {
 
-    $id   = wpinv_get_discount_id_by_code( $code );
-    $uses = wpinv_get_discount_uses( $id );
+    $id   = wpinv_get_discount_id_by_code($code);
+    $uses = wpinv_get_discount_uses($id);
 
-    if ( $uses ) {
+    if ($uses) {
         $uses--;
     }
 
-    if ( $uses < 0 ) {
+    if ($uses < 0) {
         $uses = 0;
     }
 
-    update_post_meta( $id, '_wpi_discount_uses', $uses );
+    update_post_meta($id, '_wpi_discount_uses', $uses);
 
-    do_action( 'wpinv_discount_decrease_use_count', $uses, $id, $code );
+    do_action('wpinv_discount_decrease_use_count', $uses, $id, $code);
 
     return $uses;
 
 }
 
-function wpinv_format_discount_rate( $type, $amount ) {
-    if ( $type == 'flat' ) {
-        return wpinv_price( wpinv_format_amount( $amount ) );
+function wpinv_format_discount_rate($type, $amount) {
+    if ($type == 'flat') {
+        return wpinv_price(wpinv_format_amount($amount));
     } else {
         return $amount . '%';
     }
 }
 
-function wpinv_set_cart_discount( $code = '' ) {    
-    if ( wpinv_multiple_discounts_allowed() ) {
+function wpinv_set_cart_discount($code = '') {    
+    if (wpinv_multiple_discounts_allowed()) {
         // Get all active cart discounts
         $discounts = wpinv_get_cart_discounts();
     } else {
         $discounts = false; // Only one discount allowed per purchase, so override any existing
     }
 
-    if ( $discounts ) {
-        $key = array_search( strtolower( $code ), array_map( 'strtolower', $discounts ) );
-        if( false !== $key ) {
-            unset( $discounts[ $key ] ); // Can't set the same discount more than once
+    if ($discounts) {
+        $key = array_search(strtolower($code), array_map('strtolower', $discounts));
+        if (false !== $key) {
+            unset($discounts[$key]); // Can't set the same discount more than once
         }
         $discounts[] = $code;
     } else {
         $discounts = array();
         $discounts[] = $code;
     }
-    $discounts = array_values( $discounts );
+    $discounts = array_values($discounts);
     
     $data = wpinv_get_checkout_session();
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         $data = array();
     } else {
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'] ) ) {
-            $payment_meta['user_info']['discount']  = implode( ',', $discounts );
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'])) {
+            $payment_meta['user_info']['discount'] = implode(',', $discounts);
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
     }
     $data['cart_discounts'] = $discounts;
     
-    wpinv_set_checkout_session( $data );
+    wpinv_set_checkout_session($data);
     
     return $discounts;
 }
 
-function wpinv_unset_cart_discount( $code = '' ) {    
+function wpinv_unset_cart_discount($code = '') {    
     $discounts = wpinv_get_cart_discounts();
 
-    if ( $code && !empty( $discounts ) && in_array( $code, $discounts ) ) {
-        $key = array_search( $code, $discounts );
-        unset( $discounts[ $key ] );
+    if ($code && !empty($discounts) && in_array($code, $discounts)) {
+        $key = array_search($code, $discounts);
+        unset($discounts[$key]);
             
         $data = wpinv_get_checkout_session();
         $data['cart_discounts'] = $discounts;
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'] ) ) {
-            $payment_meta['user_info']['discount']  = !empty( $discounts ) ? implode( ',', $discounts ) : '';
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'])) {
+            $payment_meta['user_info']['discount'] = !empty($discounts) ? implode(',', $discounts) : '';
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
     }
 
     return $discounts;
@@ -884,27 +884,27 @@ 
 function wpinv_unset_all_cart_discounts() {
     $data = wpinv_get_checkout_session();
     
-    if ( !empty( $data ) && isset( $data['cart_discounts'] ) ) {
-        unset( $data['cart_discounts'] );
+    if (!empty($data) && isset($data['cart_discounts'])) {
+        unset($data['cart_discounts']);
         
-         wpinv_set_checkout_session( $data );
+         wpinv_set_checkout_session($data);
          return true;
     }
     
     return false;
 }
 
-function wpinv_get_cart_discounts( $items = array() ) {
+function wpinv_get_cart_discounts($items = array()) {
     $session = wpinv_get_checkout_session();
     
-    $discounts = !empty( $session['cart_discounts'] ) ? $session['cart_discounts'] : false;
+    $discounts = !empty($session['cart_discounts']) ? $session['cart_discounts'] : false;
     return $discounts;
 }
 
-function wpinv_cart_has_discounts( $items = array() ) {
+function wpinv_cart_has_discounts($items = array()) {
     $ret = false;
 
-    if ( wpinv_get_cart_discounts( $items ) ) {
+    if (wpinv_get_cart_discounts($items)) {
         $ret = true;
     }
     
@@ -915,131 +915,131 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_cart_has_discounts', $ret );
+    return apply_filters('wpinv_cart_has_discounts', $ret);
 }
 
-function wpinv_get_cart_discounted_amount( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounted_amount($items = array(), $discounts = false) {
     $amount = 0.00;
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items  = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( $items ) {
-        $discounts = wp_list_pluck( $items, 'discount' );
+    if ($items) {
+        $discounts = wp_list_pluck($items, 'discount');
 
-        if ( is_array( $discounts ) ) {
-            $discounts = array_map( 'floatval', $discounts );
-            $amount    = array_sum( $discounts );
+        if (is_array($discounts)) {
+            $discounts = array_map('floatval', $discounts);
+            $amount    = array_sum($discounts);
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_discounted_amount', $amount );
+    return apply_filters('wpinv_get_cart_discounted_amount', $amount);
 }
 
-function wpinv_get_cart_items_discount_amount( $items = array(), $discount = false ) {
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+function wpinv_get_cart_items_discount_amount($items = array(), $discount = false) {
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
     
-    if ( empty( $discount ) || empty( $items ) ) {
+    if (empty($discount) || empty($items)) {
         return 0;
     }
 
     $amount = 0;
     
-    foreach ( $items as $item ) {
-        $amount += wpinv_get_cart_item_discount_amount( $item, $discount );
+    foreach ($items as $item) {
+        $amount += wpinv_get_cart_item_discount_amount($item, $discount);
     }
     
-    $amount = wpinv_round_amount( $amount );
+    $amount = wpinv_round_amount($amount);
 
     return $amount;
 }
 
-function wpinv_get_cart_item_discount_amount( $item = array(), $discount = false ) {
+function wpinv_get_cart_item_discount_amount($item = array(), $discount = false) {
     global $wpinv_is_last_cart_item, $wpinv_flat_discount_total;
     
     $amount = 0;
 
-    if ( empty( $item ) || empty( $item['id'] ) ) {
+    if (empty($item) || empty($item['id'])) {
         return $amount;
     }
 
-    if ( empty( $item['quantity'] ) ) {
+    if (empty($item['quantity'])) {
         return $amount;
     }
 
-    if ( empty( $item['options'] ) ) {
+    if (empty($item['options'])) {
         $item['options'] = array();
     }
 
-    $price            = wpinv_get_cart_item_price( $item['id'], $item, $item['options'] );
+    $price            = wpinv_get_cart_item_price($item['id'], $item, $item['options']);
     $discounted_price = $price;
 
     $discounts = false === $discount ? wpinv_get_cart_discounts() : $discount;
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return $amount;
     }
 
-    if ( $discounts ) {
-        if ( is_array( $discounts ) ) {
-            $discounts = array_values( $discounts );
+    if ($discounts) {
+        if (is_array($discounts)) {
+            $discounts = array_values($discounts);
         } else {
-            $discounts = explode( ',', $discounts );
+            $discounts = explode(',', $discounts);
         }
     }
 
-    if( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $code_id = wpinv_get_discount_id_by_code( $discount );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $code_id = wpinv_get_discount_id_by_code($discount);
 
             // Check discount exists
-            if( ! $code_id ) {
+            if (!$code_id) {
                 continue;
             }
 
-            $reqs           = wpinv_get_discount_item_reqs( $code_id );
-            $excluded_items = wpinv_get_discount_excluded_items( $code_id );
+            $reqs           = wpinv_get_discount_item_reqs($code_id);
+            $excluded_items = wpinv_get_discount_excluded_items($code_id);
 
             // Make sure requirements are set and that this discount shouldn't apply to the whole cart
-            if ( !empty( $reqs ) && wpinv_is_discount_not_global( $code_id ) ) {
-                foreach ( $reqs as $item_id ) {
-                    if ( $item_id == $item['id'] && ! in_array( $item['id'], $excluded_items ) ) {
-                        $discounted_price -= $price - wpinv_get_discounted_amount( $discount, $price );
+            if (!empty($reqs) && wpinv_is_discount_not_global($code_id)) {
+                foreach ($reqs as $item_id) {
+                    if ($item_id == $item['id'] && !in_array($item['id'], $excluded_items)) {
+                        $discounted_price -= $price - wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             } else {
                 // This is a global cart discount
-                if ( !in_array( $item['id'], $excluded_items ) ) {
-                    if ( 'flat' === wpinv_get_discount_type( $code_id ) ) {
+                if (!in_array($item['id'], $excluded_items)) {
+                    if ('flat' === wpinv_get_discount_type($code_id)) {
                         $items_subtotal    = 0.00;
                         $cart_items        = wpinv_get_cart_contents();
                         
-                        foreach ( $cart_items as $cart_item ) {
-                            if ( ! in_array( $cart_item['id'], $excluded_items ) ) {
-                                $options = !empty( $cart_item['options'] ) ? $cart_item['options'] : array();
-                                $item_price      = wpinv_get_cart_item_price( $cart_item['id'], $cart_item, $options );
+                        foreach ($cart_items as $cart_item) {
+                            if (!in_array($cart_item['id'], $excluded_items)) {
+                                $options = !empty($cart_item['options']) ? $cart_item['options'] : array();
+                                $item_price      = wpinv_get_cart_item_price($cart_item['id'], $cart_item, $options);
                                 $items_subtotal += $item_price * $cart_item['quantity'];
                             }
                         }
 
-                        $subtotal_percent  = ( ( $price * $item['quantity'] ) / $items_subtotal );
-                        $code_amount       = wpinv_get_discount_amount( $code_id );
+                        $subtotal_percent  = (($price * $item['quantity']) / $items_subtotal);
+                        $code_amount       = wpinv_get_discount_amount($code_id);
                         $discounted_amount = $code_amount * $subtotal_percent;
                         $discounted_price -= $discounted_amount;
 
-                        $wpinv_flat_discount_total += round( $discounted_amount, wpinv_currency_decimal_filter() );
+                        $wpinv_flat_discount_total += round($discounted_amount, wpinv_currency_decimal_filter());
 
-                        if ( $wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount ) {
+                        if ($wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount) {
                             $adjustment = $code_amount - $wpinv_flat_discount_total;
                             $discounted_price -= $adjustment;
                         }
                     } else {
-                        $discounted_price -= $price - wpinv_get_discounted_amount( $discount, $price );
+                        $discounted_price -= $price - wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             }
         }
 
-        $amount = ( $price - apply_filters( 'wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price ) );
+        $amount = ($price - apply_filters('wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price));
 
-        if ( 'flat' !== wpinv_get_discount_type( $code_id ) ) {
+        if ('flat' !== wpinv_get_discount_type($code_id)) {
             $amount = $amount * $item['quantity'];
         }
     }
@@ -1047,59 +1047,59 @@ 
     return $amount;
 }
 
-function wpinv_cart_discounts_html( $items = array() ) {
-    echo wpinv_get_cart_discounts_html( $items );
+function wpinv_cart_discounts_html($items = array()) {
+    echo wpinv_get_cart_discounts_html($items);
 }
 
-function wpinv_get_cart_discounts_html( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounts_html($items = array(), $discounts = false) {
     global $wpi_cart_columns;
     
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
     
-    if ( !$discounts ) {
-        $discounts = wpinv_get_cart_discounts( $items );
+    if (!$discounts) {
+        $discounts = wpinv_get_cart_discounts($items);
     }
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
     
-    $discounts = is_array( $discounts ) ? $discounts : array( $discounts );
+    $discounts = is_array($discounts) ? $discounts : array($discounts);
     
     $html = '';
 
-    foreach ( $discounts as $discount ) {
-        $discount_id    = wpinv_get_discount_id_by_code( $discount );
-        $discount_value = wpinv_get_discount_amount( $discount_id );
-        $rate           = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), $discount_value );
-        $amount         = wpinv_get_cart_items_discount_amount( $items, $discount );
-        $remove_btn     = '<a title="' . esc_attr__( 'Remove discount', 'invoicing' ) . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
+    foreach ($discounts as $discount) {
+        $discount_id    = wpinv_get_discount_id_by_code($discount);
+        $discount_value = wpinv_get_discount_amount($discount_id);
+        $rate           = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), $discount_value);
+        $amount         = wpinv_get_cart_items_discount_amount($items, $discount);
+        $remove_btn     = '<a title="' . esc_attr__('Remove discount', 'invoicing') . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
         
         $html .= '<tr class="wpinv_cart_footer_row wpinv_cart_discount_row">';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_first', $items );
+        do_action('wpinv_checkout_table_discount_first', $items);
         $html .= ob_get_clean();
-        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label( $discount, $rate, false ) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price( wpinv_format_amount( $amount ) ) . '</span></td>';
+        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label($discount, $rate, false) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price(wpinv_format_amount($amount)) . '</span></td>';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_last', $items );
+        do_action('wpinv_checkout_table_discount_last', $items);
         $html .= ob_get_clean();
         $html .= '</tr>';
     }
 
-    return apply_filters( 'wpinv_get_cart_discounts_html', $html, $discounts, $rate );
+    return apply_filters('wpinv_get_cart_discounts_html', $html, $discounts, $rate);
 }
 
-function wpinv_display_cart_discount( $formatted = false, $echo = false ) {
+function wpinv_display_cart_discount($formatted = false, $echo = false) {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return false;
     }
 
-    $discount_id  = wpinv_get_discount_id_by_code( $discounts[0] );
-    $amount       = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), wpinv_get_discount_amount( $discount_id ) );
+    $discount_id  = wpinv_get_discount_id_by_code($discounts[0]);
+    $amount       = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), wpinv_get_discount_amount($discount_id));
 
-    if ( $echo ) {
+    if ($echo) {
         echo $amount;
     }
 
@@ -1107,133 +1107,133 @@ 
 }
 
 function wpinv_remove_cart_discount() {
-    if ( !isset( $_GET['discount_id'] ) || ! isset( $_GET['discount_code'] ) ) {
+    if (!isset($_GET['discount_id']) || !isset($_GET['discount_code'])) {
         return;
     }
 
-    do_action( 'wpinv_pre_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_pre_remove_cart_discount', absint($_GET['discount_id']));
 
-    wpinv_unset_cart_discount( urldecode( $_GET['discount_code'] ) );
+    wpinv_unset_cart_discount(urldecode($_GET['discount_code']));
 
-    do_action( 'wpinv_post_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_post_remove_cart_discount', absint($_GET['discount_id']));
 
-    wp_redirect( wpinv_get_checkout_uri() ); wpinv_die();
+    wp_redirect(wpinv_get_checkout_uri()); wpinv_die();
 }
-add_action( 'wpinv_remove_cart_discount', 'wpinv_remove_cart_discount' );
+add_action('wpinv_remove_cart_discount', 'wpinv_remove_cart_discount');
 
-function wpinv_maybe_remove_cart_discount( $cart_key = 0 ) {
+function wpinv_maybe_remove_cart_discount($cart_key = 0) {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
 
-    foreach ( $discounts as $discount ) {
-        if ( !wpinv_is_discount_valid( $discount ) ) {
-            wpinv_unset_cart_discount( $discount );
+    foreach ($discounts as $discount) {
+        if (!wpinv_is_discount_valid($discount)) {
+            wpinv_unset_cart_discount($discount);
         }
     }
 }
-add_action( 'wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount' );
+add_action('wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount');
 
 function wpinv_multiple_discounts_allowed() {
-    $ret = wpinv_get_option( 'allow_multiple_discounts', false );
-    return (bool) apply_filters( 'wpinv_multiple_discounts_allowed', $ret );
+    $ret = wpinv_get_option('allow_multiple_discounts', false);
+    return (bool)apply_filters('wpinv_multiple_discounts_allowed', $ret);
 }
 
 function wpinv_listen_for_cart_discount() {
     global $wpi_session;
     
-    if ( empty( $_REQUEST['discount'] ) || is_array( $_REQUEST['discount'] ) ) {
+    if (empty($_REQUEST['discount']) || is_array($_REQUEST['discount'])) {
         return;
     }
 
-    $code = preg_replace('/[^a-zA-Z0-9-_]+/', '', $_REQUEST['discount'] );
+    $code = preg_replace('/[^a-zA-Z0-9-_]+/', '', $_REQUEST['discount']);
 
-    $wpi_session->set( 'preset_discount', $code );
+    $wpi_session->set('preset_discount', $code);
 }
 //add_action( 'init', 'wpinv_listen_for_cart_discount', 0 );
 
 function wpinv_apply_preset_discount() {
     global $wpi_session;
     
-    $code = $wpi_session->get( 'preset_discount' );
+    $code = $wpi_session->get('preset_discount');
 
-    if ( !$code ) {
+    if (!$code) {
         return;
     }
 
-    if ( !wpinv_is_discount_valid( $code, '', false ) ) {
+    if (!wpinv_is_discount_valid($code, '', false)) {
         return;
     }
     
-    $code = apply_filters( 'wpinv_apply_preset_discount', $code );
+    $code = apply_filters('wpinv_apply_preset_discount', $code);
 
-    wpinv_set_cart_discount( $code );
+    wpinv_set_cart_discount($code);
 
-    $wpi_session->set( 'preset_discount', null );
+    $wpi_session->set('preset_discount', null);
 }
 //add_action( 'init', 'wpinv_apply_preset_discount', 999 );
 
-function wpinv_get_discount_label( $code, $echo = true ) {
-    $label = wp_sprintf( __( 'Discount%1$s', 'invoicing' ), ( $code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)': '' ) );
-    $label = apply_filters( 'wpinv_get_discount_label', $label, $code );
+function wpinv_get_discount_label($code, $echo = true) {
+    $label = wp_sprintf(__('Discount%1$s', 'invoicing'), ($code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)' : ''));
+    $label = apply_filters('wpinv_get_discount_label', $label, $code);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_cart_discount_label( $code, $rate, $echo = true ) {
-    $label = wp_sprintf( __( '%1$s Discount: %2$s', 'invoicing' ), $rate, $code );
-    $label = apply_filters( 'wpinv_cart_discount_label', $label, $code, $rate );
+function wpinv_cart_discount_label($code, $rate, $echo = true) {
+    $label = wp_sprintf(__('%1$s Discount: %2$s', 'invoicing'), $rate, $code);
+    $label = apply_filters('wpinv_cart_discount_label', $label, $code, $rate);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_check_delete_discount( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_discount' && wpinv_get_discount_uses( $post->ID ) > 0 ) {
+function wpinv_check_delete_discount($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_discount' && wpinv_get_discount_uses($post->ID) > 0) {
         return true;
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_discount', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_discount', 10, 3);
 
 function wpinv_checkout_form_validate_discounts() {
     $discounts = wpinv_get_cart_discounts();
     
-    if ( !empty( $discounts ) ) {
+    if (!empty($discounts)) {
         $invalid = false;
         
-        foreach ( $discounts as $key => $code ) {
-            if ( !wpinv_is_discount_valid( $code, get_current_user_id() ) ) {
+        foreach ($discounts as $key => $code) {
+            if (!wpinv_is_discount_valid($code, get_current_user_id())) {
                 $invalid = true;
                 
-                wpinv_unset_cart_discount( $code );
+                wpinv_unset_cart_discount($code);
             }
         }
         
-        if ( $invalid ) {
+        if ($invalid) {
             $errors = wpinv_get_errors();
-            $error  = !empty( $errors['wpinv-discount-error'] ) ? $errors['wpinv-discount-error'] . ' ' : '';
-            $error  .= __( 'The discount has been removed from cart.', 'invoicing' );
-            wpinv_set_error( 'wpinv-discount-error', $error );
+            $error  = !empty($errors['wpinv-discount-error']) ? $errors['wpinv-discount-error'] . ' ' : '';
+            $error .= __('The discount has been removed from cart.', 'invoicing');
+            wpinv_set_error('wpinv-discount-error', $error);
             
-            wpinv_recalculate_tax( true );
+            wpinv_recalculate_tax(true);
         }
     }
 }
-add_action( 'wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10 );
+add_action('wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10);
 
 function wpinv_discount_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_discount_amount', $output );
+    return apply_filters('wpinv_discount_amount', $output);
 }
\ No newline at end of file

includes/wpinv-template-functions.php

Spacing +682 added lines, -682 removed lines

@@ -7,109 +7,109 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-if ( !is_admin() ) {
-    add_filter( 'template_include', 'wpinv_template', 10, 1 );
-    add_action( 'wpinv_invoice_print_body_start', 'wpinv_display_invoice_top_bar' );
-    add_action( 'wpinv_invoice_top_bar_left', 'wpinv_invoice_display_left_actions' );
-    add_action( 'wpinv_invoice_top_bar_right', 'wpinv_invoice_display_right_actions' );
+if (!is_admin()) {
+    add_filter('template_include', 'wpinv_template', 10, 1);
+    add_action('wpinv_invoice_print_body_start', 'wpinv_display_invoice_top_bar');
+    add_action('wpinv_invoice_top_bar_left', 'wpinv_invoice_display_left_actions');
+    add_action('wpinv_invoice_top_bar_right', 'wpinv_invoice_display_right_actions');
 }
 
 function wpinv_template_path() {
-    return apply_filters( 'wpinv_template_path', 'invoicing/' );
+    return apply_filters('wpinv_template_path', 'invoicing/');
 }
 
-function wpinv_post_class( $classes, $class, $post_id ) {
+function wpinv_post_class($classes, $class, $post_id) {
     global $pagenow, $typenow;
 
-    if ( $pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type( $post_id ) == $typenow && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' ) {
+    if ($pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type($post_id) == $typenow && get_post_meta($post_id, '_wpinv_type', true) == 'package') {
         $classes[] = 'wpi-gd-package';
     }
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_post_class', 10, 3 );
+add_filter('post_class', 'wpinv_post_class', 10, 3);
 
-function wpinv_display_invoice_top_bar( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_display_invoice_top_bar($invoice) {
+    if (empty($invoice)) {
         return;
     }
     ?>
     <div class="row wpinv-top-bar no-print">
         <div class="container">
             <div class="col-xs-6">
-                <?php do_action( 'wpinv_invoice_top_bar_left', $invoice );?>
+                <?php do_action('wpinv_invoice_top_bar_left', $invoice); ?>
             </div>
             <div class="col-xs-6 text-right">
-                <?php do_action( 'wpinv_invoice_top_bar_right', $invoice );?>
+                <?php do_action('wpinv_invoice_top_bar_right', $invoice); ?>
             </div>
         </div>
     </div>
     <?php
 }
 
-function wpinv_invoice_display_left_actions( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_display_left_actions($invoice) {
+    if (empty($invoice)) {
         return;
     }
     
-    if($invoice->post_type == 'wpi_invoice'){
+    if ($invoice->post_type == 'wpi_invoice') {
     
         $user_id = (int)$invoice->get_user_id();
         $current_user_id = (int)get_current_user_id();
 
-        if ( $user_id > 0 && $user_id == $current_user_id && $invoice->needs_payment() ) {
+        if ($user_id > 0 && $user_id == $current_user_id && $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>
+            <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 ) ) return; //Exit if invoice is not set.
+function wpinv_invoice_display_right_actions($invoice) {
+    if (empty($invoice)) return; //Exit if invoice is not set.
     
-    if($invoice->post_type == 'wpi_invoice'){
+    if ($invoice->post_type == 'wpi_invoice') {
         $user_id = (int)$invoice->get_user_id();
         $current_user_id = (int)get_current_user_id();
 
-        if ( $user_id > 0 && $user_id == $current_user_id ) {
+        if ($user_id > 0 && $user_id == $current_user_id) {
         ?>
-            <a class="btn btn-primary btn-sm" onclick="window.print();" href="javascript:void(0)"><?php _e( 'Print Invoice', 'invoicing' ); ?></a> &nbsp;
-            <a class="btn btn-warning btn-sm" href="<?php echo esc_url( wpinv_get_history_page_uri() ); ?>"><?php _e( 'Invoice History', 'invoicing' ); ?></a>
+            <a class="btn btn-primary btn-sm" onclick="window.print();" href="javascript:void(0)"><?php _e('Print Invoice', 'invoicing'); ?></a> &nbsp;
+            <a class="btn btn-warning btn-sm" href="<?php echo esc_url(wpinv_get_history_page_uri()); ?>"><?php _e('Invoice History', 'invoicing'); ?></a>
         <?php } 
     }
     do_action('wpinv_invoice_display_right_actions', $invoice);
 }
 
-function wpinv_before_invoice_content( $content ) {
+function wpinv_before_invoice_content($content) {
     global $post;
 
-    if ( $post && $post->post_type == 'wpi_invoice' && is_singular( 'wpi_invoice' ) && is_main_query() ) {
+    if ($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 ( $post && $post->post_type == 'wpi_invoice' && is_singular( 'wpi_invoice' ) && is_main_query() ) {
+    if ($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';
@@ -119,105 +119,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;
 }
@@ -226,143 +226,143 @@ 
 	$template_dir = wpinv_get_theme_template_dir_name();
 
 	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
+		1 => trailingslashit(get_stylesheet_directory()) . $template_dir,
+		10 => trailingslashit(get_template_directory()) . $template_dir,
 		100 => wpinv_get_templates_dir()
 	);
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+	$file_paths = apply_filters('wpinv_template_paths', $file_paths);
 
 	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+	ksort($file_paths, SORT_NUMERIC);
 
-	return array_map( 'trailingslashit', $file_paths );
+	return array_map('trailingslashit', $file_paths);
 }
 
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'wpinv_templates' ) );
+	return trailingslashit(apply_filters('wpinv_templates_dir', 'wpinv_templates'));
 }
 
 function wpinv_checkout_meta_tags() {
 
 	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
+	$pages[] = wpinv_get_option('success_page');
+	$pages[] = wpinv_get_option('failure_page');
+	$pages[] = wpinv_get_option('invoice_history_page');
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+	if (!wpinv_is_checkout() && !is_page($pages)) {
 		return;
 	}
 
 	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
-add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
+add_action('wp_head', 'wpinv_checkout_meta_tags');
 
-function wpinv_add_body_classes( $class ) {
+function wpinv_add_body_classes($class) {
 	$classes = (array)$class;
 
-	if( wpinv_is_checkout() ) {
+	if (wpinv_is_checkout()) {
 		$classes[] = 'wpinv-checkout';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_success_page() ) {
+	if (wpinv_is_success_page()) {
 		$classes[] = 'wpinv-success';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_failed_transaction_page() ) {
+	if (wpinv_is_failed_transaction_page()) {
 		$classes[] = 'wpinv-failed-transaction';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_invoice_history_page() ) {
+	if (wpinv_is_invoice_history_page()) {
 		$classes[] = 'wpinv-history';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_test_mode() ) {
+	if (wpinv_is_test_mode()) {
 		$classes[] = 'wpinv-test-mode';
 		$classes[] = 'wpinv-page';
 	}
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
-add_filter( 'body_class', 'wpinv_add_body_classes' );
+add_filter('body_class', 'wpinv_add_body_classes');
 
-function wpinv_html_dropdown( $name = 'wpinv_discounts', $selected = 0, $status = '' ) {
-    $args = array( 'nopaging' => true );
+function wpinv_html_dropdown($name = 'wpinv_discounts', $selected = 0, $status = '') {
+    $args = array('nopaging' => true);
 
-    if ( ! empty( $status ) )
+    if (!empty($status))
         $args['post_status'] = $status;
 
-    $discounts = wpinv_get_discounts( $args );
+    $discounts = wpinv_get_discounts($args);
     $options   = array();
 
-    if ( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $options[ absint( $discount->ID ) ] = esc_html( get_the_title( $discount->ID ) );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $options[absint($discount->ID)] = esc_html(get_the_title($discount->ID));
         }
     } else {
-        $options[0] = __( 'No discounts found', 'invoicing' );
+        $options[0] = __('No discounts found', 'invoicing');
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false,
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_year_dropdown( $name = 'year', $selected = 0, $years_before = 5, $years_after = 0 ) {
-    $current     = date( 'Y' );
-    $start_year  = $current - absint( $years_before );
-    $end_year    = $current + absint( $years_after );
-    $selected    = empty( $selected ) ? date( 'Y' ) : $selected;
+function wpinv_html_year_dropdown($name = 'year', $selected = 0, $years_before = 5, $years_after = 0) {
+    $current     = date('Y');
+    $start_year  = $current - absint($years_before);
+    $end_year    = $current + absint($years_after);
+    $selected    = empty($selected) ? date('Y') : $selected;
     $options     = array();
 
-    while ( $start_year <= $end_year ) {
-        $options[ absint( $start_year ) ] = $start_year;
+    while ($start_year <= $end_year) {
+        $options[absint($start_year)] = $start_year;
         $start_year++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_month_dropdown( $name = 'month', $selected = 0 ) {
+function wpinv_html_month_dropdown($name = 'month', $selected = 0) {
     $month   = 1;
     $options = array();
-    $selected = empty( $selected ) ? date( 'n' ) : $selected;
+    $selected = empty($selected) ? date('n') : $selected;
 
-    while ( $month <= 12 ) {
-        $options[ absint( $month ) ] = wpinv_month_num_to_name( $month );
+    while ($month <= 12) {
+        $options[absint($month)] = wpinv_month_num_to_name($month);
         $month++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_select( $args = array() ) {
+function wpinv_html_select($args = array()) {
     $defaults = array(
         'options'          => array(),
         'name'             => null,
@@ -372,8 +372,8 @@ 
         'chosen'           => false,
         'placeholder'      => null,
         'multiple'         => false,
-        'show_option_all'  => _x( 'All', 'all dropdown items', 'invoicing' ),
-        'show_option_none' => _x( 'None', 'no dropdown items', 'invoicing' ),
+        'show_option_all'  => _x('All', 'all dropdown items', 'invoicing'),
+        'show_option_none' => _x('None', 'no dropdown items', 'invoicing'),
         'data'             => array(),
         'onchange'         => null,
         'required'         => false,
@@ -381,78 +381,78 @@ 
         'readonly'         => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $data_elements = '';
-    foreach ( $args['data'] as $key => $value ) {
-        $data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+    foreach ($args['data'] as $key => $value) {
+        $data_elements .= ' data-' . esc_attr($key) . '="' . esc_attr($value) . '"';
     }
 
-    if( $args['multiple'] ) {
+    if ($args['multiple']) {
         $multiple = ' MULTIPLE';
     } else {
         $multiple = '';
     }
 
-    if( $args['chosen'] ) {
+    if ($args['chosen']) {
         $args['class'] .= ' wpinv-select-chosen';
     }
 
-    if( $args['placeholder'] ) {
+    if ($args['placeholder']) {
         $placeholder = $args['placeholder'];
     } else {
         $placeholder = '';
     }
     
     $options = '';
-    if( !empty( $args['onchange'] ) ) {
-        $options .= ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $options .= ' onchange="' . esc_attr($args['onchange']) . '"';
     }
     
-    if( !empty( $args['required'] ) ) {
+    if (!empty($args['required'])) {
         $options .= ' required="required"';
     }
     
-    if( !empty( $args['disabled'] ) ) {
+    if (!empty($args['disabled'])) {
         $options .= ' disabled';
     }
     
-    if( !empty( $args['readonly'] ) ) {
+    if (!empty($args['readonly'])) {
         $options .= ' readonly';
     }
 
-    $class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-    $output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim( $options ) . $data_elements . '>';
+    $class  = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
+    $output = '<select name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim($options) . $data_elements . '>';
 
-    if ( $args['show_option_all'] ) {
-        if( $args['multiple'] ) {
-            $selected = selected( true, in_array( 0, $args['selected'] ), false );
+    if ($args['show_option_all']) {
+        if ($args['multiple']) {
+            $selected = selected(true, in_array(0, $args['selected']), false);
         } else {
-            $selected = selected( $args['selected'], 0, false );
+            $selected = selected($args['selected'], 0, false);
         }
-        $output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+        $output .= '<option value="all"' . $selected . '>' . esc_html($args['show_option_all']) . '</option>';
     }
 
-    if ( !empty( $args['options'] ) ) {
+    if (!empty($args['options'])) {
 
-        if ( $args['show_option_none'] ) {
-            if( $args['multiple'] ) {
-                $selected = selected( true, in_array( "", $args['selected'] ), false );
+        if ($args['show_option_none']) {
+            if ($args['multiple']) {
+                $selected = selected(true, in_array("", $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'] === "", true, false );
+                $selected = selected($args['selected'] === "", true, false);
             }
-            $output .= '<option value=""' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+            $output .= '<option value=""' . $selected . '>' . esc_html($args['show_option_none']) . '</option>';
         }
 
-        foreach( $args['options'] as $key => $option ) {
+        foreach ($args['options'] as $key => $option) {
 
-            if( $args['multiple'] && is_array( $args['selected'] ) ) {
-                $selected = selected( true, (bool)in_array( $key, $args['selected'] ), false );
+            if ($args['multiple'] && is_array($args['selected'])) {
+                $selected = selected(true, (bool)in_array($key, $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'], $key, false );
+                $selected = selected($args['selected'], $key, false);
             }
 
-            $output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+            $output .= '<option value="' . esc_attr($key) . '"' . $selected . '>' . esc_html($option) . '</option>';
         }
     }
 
@@ -461,7 +461,7 @@ 
     return $output;
 }
 
-function wpinv_item_dropdown( $args = array() ) {
+function wpinv_item_dropdown($args = array()) {
     $defaults = array(
         'name'              => 'wpi_item',
         'id'                => 'wpi_item',
@@ -470,15 +470,15 @@ 
         'selected'          => 0,
         'chosen'            => false,
         'number'            => 100,
-        'placeholder'       => __( 'Choose a item', 'invoicing' ),
-        'data'              => array( 'search-type' => 'item' ),
+        'placeholder'       => __('Choose a item', 'invoicing'),
+        'data'              => array('search-type' => 'item'),
         'show_option_all'   => false,
         'show_option_none'  => false,
         'with_packages'     => true,
         'show_recurring'    => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $item_args = array(
         'post_type'      => 'wpi_item',
@@ -487,7 +487,7 @@ 
         'posts_per_page' => $args['number']
     );
     
-    if ( !$args['with_packages'] ) {
+    if (!$args['with_packages']) {
         $item_args['meta_query'] = array(
             array(
                 'key'       => '_wpinv_type',
@@ -497,42 +497,42 @@ 
         );
     }
 
-    $items      = get_posts( $item_args );
+    $items      = get_posts($item_args);
     $options    = array();
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            $title = esc_html( $item->post_title );
+    if ($items) {
+        foreach ($items as $item) {
+            $title = esc_html($item->post_title);
             
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $item->ID, false );
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($item->ID, false);
             }
             
-            $options[ absint( $item->ID ) ] = $title;
+            $options[absint($item->ID)] = $title;
         }
     }
 
     // This ensures that any selected items are included in the drop down
-    if( is_array( $args['selected'] ) ) {
-        foreach( $args['selected'] as $item ) {
-            if( ! in_array( $item, $options ) ) {
-                $title = get_the_title( $item );
-                if ( !empty( $args['show_recurring'] ) ) {
-                    $title .= wpinv_get_item_suffix( $item, false );
+    if (is_array($args['selected'])) {
+        foreach ($args['selected'] as $item) {
+            if (!in_array($item, $options)) {
+                $title = get_the_title($item);
+                if (!empty($args['show_recurring'])) {
+                    $title .= wpinv_get_item_suffix($item, false);
                 }
                 $options[$item] = $title;
             }
         }
-    } elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-        if ( ! in_array( $args['selected'], $options ) ) {
-            $title = get_the_title( $args['selected'] );
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $args['selected'], false );
+    } elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+        if (!in_array($args['selected'], $options)) {
+            $title = get_the_title($args['selected']);
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($args['selected'], false);
             }
-            $options[$args['selected']] = get_the_title( $args['selected'] );
+            $options[$args['selected']] = get_the_title($args['selected']);
         }
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $args['name'],
         'selected'         => $args['selected'],
         'id'               => $args['id'],
@@ -544,12 +544,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,
@@ -560,38 +560,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,
@@ -601,51 +601,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,
@@ -655,31 +655,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'       => '',
@@ -688,13 +688,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;
@@ -703,7 +703,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    = '';
@@ -714,69 +714,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>
@@ -784,31 +784,31 @@ 
 <?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_print_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_print_invoice($post->ID)) {
+            $template = wpinv_get_template_part('wpinv-invoice-print', false, false);
         } else {
-            if ( !is_user_logged_in() && !empty( $_REQUEST['_wpipay'] ) && $invoice = wpinv_get_invoice( $post->ID ) ) {
+            if (!is_user_logged_in() && !empty($_REQUEST['_wpipay']) && $invoice = wpinv_get_invoice($post->ID)) {
                 $user_id = $invoice->get_user_id();
-                $secret = sanitize_text_field( $_GET['_wpipay'] );
+                $secret = sanitize_text_field($_GET['_wpipay']);
 
-                if ( $secret === md5( $user_id . '::' . $invoice->get_email() . '::' . $invoice->get_key() ) ) { // valid invoice link
-                    $redirect_to = remove_query_arg( '_wpipay', get_permalink() );
+                if ($secret === md5($user_id . '::' . $invoice->get_email() . '::' . $invoice->get_key())) { // valid invoice link
+                    $redirect_to = remove_query_arg('_wpipay', get_permalink());
 
-                    wpinv_guest_redirect( $redirect_to, $user_id );
+                    wpinv_guest_redirect($redirect_to, $user_id);
                     wpinv_die();
                 }
             }
-            $redirect_to = is_user_logged_in() ? wpinv_get_history_page_uri() : wp_login_url( get_permalink() );
+            $redirect_to = is_user_logged_in() ? wpinv_get_history_page_uri() : wp_login_url(get_permalink());
 
-            wp_redirect( $redirect_to );
+            wp_redirect($redirect_to);
             wpinv_die();
         }
     }
@@ -818,7 +818,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();
@@ -842,7 +842,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() {
@@ -852,185 +852,185 @@ 
     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' ), $email_from );?></div>
+        <?php if ($email_from = wpinv_mail_get_from_address()) { ?>
+        <div class="email_from"><?php echo wp_sprintf(__('Email: %s'), $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->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);
     
-    if($invoice->post_type == 'wpi_invoice') $type = 'Invoice';
-    elseif($invoice->post_type == 'wpi_quote') $type = 'Quote';
+    if ($invoice->post_type == 'wpi_invoice') $type = 'Invoice';
+    elseif ($invoice->post_type == 'wpi_quote') $type = 'Quote';
     ?>
     <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 sprintf(__( '%s Number', 'invoicing' ), $type); ?></th>
-                <td><?php echo esc_html( $invoice_number ); ?></td>
+                <th><?php echo sprintf(__('%s Number', 'invoicing'), $type); ?></th>
+                <td><?php echo esc_html($invoice_number); ?></td>
             </tr>
         <?php } ?>
         <tr class="wpi-row-status">
-            <th><?php echo wp_sprintf(__( '%s Status', 'invoicing' ), $type); ?></th>
-            <td><?php echo wpinv_invoice_status_label( $invoice_status, wpinv_get_invoice_status( $invoice_id, true ) ); ?></td>
+            <th><?php echo wp_sprintf(__('%s Status', 'invoicing'), $type); ?></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 wp_sprintf(__( 'Parent %s', 'invoicing' ), $type); ?></th>
-            <td><?php echo wpinv_invoice_link( $invoice->parent_invoice ); ?></td>
+            <th><?php echo wp_sprintf(__('Parent %s', 'invoicing'), $type); ?></th>
+            <td><?php echo wpinv_invoice_link($invoice->parent_invoice); ?></td>
         </tr>
         <?php } ?>
         <tr class="wpi-row-gateway">
-            <th><?php _e( 'Payment Method', 'invoicing' ); ?></th>
-            <td><?php echo wpinv_get_payment_gateway_name( $invoice_id ); ?></td>
+            <th><?php _e('Payment Method', 'invoicing'); ?></th>
+            <td><?php echo wpinv_get_payment_gateway_name($invoice_id); ?></td>
         </tr>
-        <?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 wp_sprintf(__( '%s Date', 'invoicing' ), $type); ?></th>
+                <th><?php echo wp_sprintf(__('%s Date', 'invoicing'), $type); ?></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 _e( 'Due Date', 'invoicing' ); ?></th>
+                <th><?php _e('Due Date', 'invoicing'); ?></th>
                 <td><?php echo $due_date; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $owner_vat_number = $wpinv_euvat->get_vat_number() ) { ?>
+        <?php if ($owner_vat_number = $wpinv_euvat->get_vat_number()) { ?>
             <tr class="wpi-row-ovatno">
-                <th><?php echo wp_sprintf( __( 'Owner %s Number', 'invoicing' ), $vat_name ); ?></th>
+                <th><?php echo wp_sprintf(__('Owner %s Number', 'invoicing'), $vat_name); ?></th>
                 <td><?php echo $owner_vat_number; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $use_taxes && $user_vat_number = wpinv_get_invoice_vat_number( $invoice_id ) ) { ?>
+        <?php if ($use_taxes && $user_vat_number = wpinv_get_invoice_vat_number($invoice_id)) { ?>
             <tr class="wpi-row-uvatno">
-                <th><?php echo wp_sprintf( __( 'Your %s Number', 'invoicing' ), $vat_name ); ?></th>
+                <th><?php echo wp_sprintf(__('Your %s Number', 'invoicing'), $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' ), esc_html( $phone ) ) . '</div>';
+    if ($phone = $invoice->get_phone()) {
+        $output .= '<div class="phone">' . wp_sprintf(__('Phone: %s'), esc_html($phone)) . '</div>';
     }
-    if ( $email = $invoice->get_email() ) {
-        $output .= '<div class="email">' . wp_sprintf( __( 'Email: %s' ), esc_html( $email ) ) . '</div>';
+    if ($email = $invoice->get_email()) {
+        $output .= '<div class="email">' . wp_sprintf(__('Email: %s'), esc_html($email)) . '</div>';
     }
     
     ob_start();
-    do_action( 'wpinv_display_to_address_bottom', $invoice );
+    do_action('wpinv_display_to_address_bottom', $invoice);
     $output .= ob_get_clean();
     
     $output .= '</div>';
-    $output = apply_filters( 'wpinv_display_to_address', $output, $invoice );
+    $output = apply_filters('wpinv_display_to_address', $output, $invoice);
 
     echo $output;
 }
 
-function wpinv_display_line_items( $invoice_id = 0 ) {
+function wpinv_display_line_items($invoice_id = 0) {
     global $wpinv_euvat, $ajax_cart_details;
-    $invoice            = wpinv_get_invoice( $invoice_id );
+    $invoice            = wpinv_get_invoice($invoice_id);
     $quantities_enabled = wpinv_item_quantities_enabled();
     $use_taxes          = wpinv_use_taxes();
     $zero_tax           = !(float)$invoice->get_tax() > 0 ? true : false;
-    $tax_label           = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __( 'Tax', 'invoicing' );
-    $tax_title          = !$zero_tax && $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+    $tax_label = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __('Tax', 'invoicing');
+    $tax_title          = !$zero_tax && $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
     
     $cart_details       = $invoice->get_cart_details();
     $ajax_cart_details  = $cart_details;
@@ -1039,68 +1039,68 @@ 
     <table class="table table-sm table-bordered table-responsive">
         <thead>
             <tr>
-                <th class="name"><strong><?php _e( "Item Name", "invoicing" );?></strong></th>
-                <th class="rate"><strong><?php _e( "Price", "invoicing" );?></strong></th>
+                <th class="name"><strong><?php _e("Item Name", "invoicing"); ?></strong></th>
+                <th class="rate"><strong><?php _e("Price", "invoicing"); ?></strong></th>
                 <?php if ($quantities_enabled) { ?>
-                    <th class="qty"><strong><?php _e( "Qty", "invoicing" );?></strong></th>
+                    <th class="qty"><strong><?php _e("Qty", "invoicing"); ?></strong></th>
                 <?php } ?>
                 <?php if ($use_taxes && !$zero_tax) { ?>
                     <th class="tax"><strong><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></strong></th>
                 <?php } ?>
-                <th class="total"><strong><?php echo __( "Item Total", "invoicing" ) . ' <span class="normal small">' . $tax_title . '<span>';?></strong></th>
+                <th class="total"><strong><?php echo __("Item Total", "invoicing") . ' <span class="normal small">' . $tax_title . '<span>'; ?></strong></th>
             </tr>
         </thead>
         <tbody>
         <?php 
-            if ( !empty( $cart_details ) ) {
-                do_action( 'wpinv_display_line_items_start', $invoice );
+            if (!empty($cart_details)) {
+                do_action('wpinv_display_line_items_start', $invoice);
                 
                 $count = 0;
                 $cols  = 3;
-                foreach ( $cart_details as $key => $cart_item ) {
-                    $item_id    = !empty($cart_item['id']) ? absint( $cart_item['id'] ) : '';
-                    $item_price = isset($cart_item["item_price"]) ? wpinv_round_amount( $cart_item["item_price"] ) : 0;
-                    $line_total = isset($cart_item["subtotal"]) ? wpinv_round_amount( $cart_item["subtotal"] ) : 0;
-                    $quantity   = !empty($cart_item['quantity']) && (int)$cart_item['quantity'] > 0 ? absint( $cart_item['quantity'] ) : 1;
+                foreach ($cart_details as $key => $cart_item) {
+                    $item_id    = !empty($cart_item['id']) ? absint($cart_item['id']) : '';
+                    $item_price = isset($cart_item["item_price"]) ? wpinv_round_amount($cart_item["item_price"]) : 0;
+                    $line_total = isset($cart_item["subtotal"]) ? wpinv_round_amount($cart_item["subtotal"]) : 0;
+                    $quantity   = !empty($cart_item['quantity']) && (int)$cart_item['quantity'] > 0 ? absint($cart_item['quantity']) : 1;
                     
-                    $item       = $item_id ? new WPInv_Item( $item_id ) : NULL;
+                    $item       = $item_id ? new WPInv_Item($item_id) : NULL;
                     $summary    = '';
                     $cols       = 3;
-                    if ( !empty($item) ) {
+                    if (!empty($item)) {
                         $item_name  = $item->get_name();
                         $summary    = $item->get_summary();
                     }
-                    $item_name  = !empty($cart_item['name']) ? $cart_item['name'] : $item_name;
+                    $item_name = !empty($cart_item['name']) ? $cart_item['name'] : $item_name;
                     
                     if (!empty($item) && $item->is_package() && !empty($cart_item['meta']['post_id'])) {
-                        $post_link = '<a href="' . get_edit_post_link( $cart_item['meta']['post_id'] ) .'" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title( $cart_item['meta']['post_id']) ) . '</a>';
-                        $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $item->get_custom_singular_name(), $post_link );
+                        $post_link = '<a href="' . get_edit_post_link($cart_item['meta']['post_id']) . '" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title($cart_item['meta']['post_id'])) . '</a>';
+                        $summary = wp_sprintf(__('%s: %s', 'invoicing'), $item->get_custom_singular_name(), $post_link);
                     }
-                    $summary = apply_filters( 'wpinv_print_invoice_line_item_summary', $summary, $cart_item, $item, $invoice );
+                    $summary = apply_filters('wpinv_print_invoice_line_item_summary', $summary, $cart_item, $item, $invoice);
                     
                     $item_tax       = '';
                     $tax_rate       = '';
-                    if ( $use_taxes && $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0 ) {
-                        $item_tax = wpinv_price( wpinv_format_amount( $cart_item['tax'] ) );
-                        $tax_rate = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : ( $cart_item['tax'] / $cart_item['subtotal'] ) * 100;
-                        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+                    if ($use_taxes && $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0) {
+                        $item_tax = wpinv_price(wpinv_format_amount($cart_item['tax']));
+                        $tax_rate = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : ($cart_item['tax'] / $cart_item['subtotal']) * 100;
+                        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount($tax_rate, 4) : '';
                         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate">(' . $tax_rate . '%)</small>' : '';
                     }
                     
                     $line_item_tax = $item_tax . $tax_rate;
                     
-                    if ( $line_item_tax === '' ) {
+                    if ($line_item_tax === '') {
                         $line_item_tax = 0; // Zero tax
                     }
                     
-                    $line_item = '<tr class="row-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . ' wpinv-item">';
-                        $line_item .= '<td class="name">' . esc_html__( $item_name, 'invoicing' ) . wpinv_get_item_suffix( $item );
-                        if ( $summary !== '' ) {
-                            $line_item .= '<br/><small class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</small>';
+                    $line_item = '<tr class="row-' . (($count % 2 == 0) ? 'even' : 'odd') . ' wpinv-item">';
+                        $line_item .= '<td class="name">' . esc_html__($item_name, 'invoicing') . wpinv_get_item_suffix($item);
+                        if ($summary !== '') {
+                            $line_item .= '<br/><small class="meta">' . wpautop(wp_kses_post($summary)) . '</small>';
                         }
                         $line_item .= '</td>';
                         
-                        $line_item .= '<td class="rate">' . esc_html__( wpinv_price( wpinv_format_amount( $item_price ), $invoice->get_currency() ) ) . '</td>';
+                        $line_item .= '<td class="rate">' . esc_html__(wpinv_price(wpinv_format_amount($item_price), $invoice->get_currency())) . '</td>';
                         if ($quantities_enabled) {
                             $cols++;
                             $line_item .= '<td class="qty">' . $quantity . '</td>';
@@ -1109,55 +1109,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>
@@ -1166,35 +1166,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>
@@ -1202,72 +1202,72 @@ 
                 <?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() ) {
+    do_action('wpinv_before_display_payments_info', $invoice_id);
+    if (($gateway_title = $invoice->get_gateway_title()) || $invoice->is_paid()) {
         ?>
         <div class="wpi-payment-info">
-            <p class="wpi-payment-gateway"><?php echo wp_sprintf( __( 'Payment via %s', 'invoicing' ), $gateway_title ? $gateway_title : __( 'Manually', 'invoicing' ) ); ?></p>
-            <?php if ( $gateway_title ) { ?>
-            <p class="wpi-payment-transid"><?php echo wp_sprintf( __( 'Transaction ID: %s', 'invoicing' ), $invoice->get_transaction_id() ); ?></p>
+            <p class="wpi-payment-gateway"><?php echo wp_sprintf(__('Payment via %s', 'invoicing'), $gateway_title ? $gateway_title : __('Manually', 'invoicing')); ?></p>
+            <?php if ($gateway_title) { ?>
+            <p class="wpi-payment-transid"><?php echo wp_sprintf(__('Transaction ID: %s', 'invoicing'), $invoice->get_transaction_id()); ?></p>
             <?php } ?>
         </div>
         <?php
     }
-    do_action( 'wpinv_after_display_payments_info', $invoice_id );
+    do_action('wpinv_after_display_payments_info', $invoice_id);
     $outout = ob_get_clean();
     
-    if ( $echo ) {
+    if ($echo) {
         echo $outout;
     } else {
         return $outout;
     }
 }
 
-function wpinv_display_style( $invoice ) {
-    wp_register_style( 'wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), WPINV_VERSION );
+function wpinv_display_style($invoice) {
+    wp_register_style('wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), WPINV_VERSION);
     
-    wp_print_styles( 'open-sans' );
-    wp_print_styles( 'wpinv-single-style' );
+    wp_print_styles('open-sans');
+    wp_print_styles('wpinv-single-style');
 }
-add_action( 'wpinv_invoice_print_head', 'wpinv_display_style' );
+add_action('wpinv_invoice_print_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'];
@@ -1283,103 +1283,103 @@ 
         'address'
     );
     
-    foreach ( $address_fields as $field ) {
-        if ( empty( $user_info[$field] ) ) {
+    foreach ($address_fields as $field) {
+        if (empty($user_info[$field])) {
             $user_info[$field] = $address_info[$field];
         }
     }
     
-    return apply_filters( 'wpinv_checkout_billing_details', $user_info, $invoice );
+    return apply_filters('wpinv_checkout_billing_details', $user_info, $invoice);
 }
 
 function wpinv_admin_get_line_items($invoice = array()) {
     $item_quantities    = wpinv_item_quantities_enabled();
     $use_taxes          = wpinv_use_taxes();
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $cart_items = $invoice->get_cart_details();
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return NULL;
     }
     ob_start();
     
-    do_action( 'wpinv_admin_before_line_items', $cart_items, $invoice );
+    do_action('wpinv_admin_before_line_items', $cart_items, $invoice);
     
     $count = 0;
-    foreach ( $cart_items as $key => $cart_item ) {
+    foreach ($cart_items as $key => $cart_item) {
         $item_id    = $cart_item['id'];
-        $wpi_item   = $item_id > 0 ? new WPInv_Item( $item_id ) : NULL;
+        $wpi_item   = $item_id > 0 ? new WPInv_Item($item_id) : NULL;
         
         if (empty($wpi_item)) {
             continue;
         }
         
-        $item_price     = wpinv_price( wpinv_format_amount( $cart_item['item_price'] ) );
-        $quantity       = !empty( $cart_item['quantity'] ) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
-        $item_subtotal  = wpinv_price( wpinv_format_amount( $cart_item['subtotal'] ) );
+        $item_price     = wpinv_price(wpinv_format_amount($cart_item['item_price']));
+        $quantity       = !empty($cart_item['quantity']) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
+        $item_subtotal  = wpinv_price(wpinv_format_amount($cart_item['subtotal']));
         $can_remove     = true;
         
         $summary = '';
         if ($wpi_item->is_package() && !empty($cart_item['meta']['post_id'])) {
-            $post_link = '<a href="' . get_edit_post_link( $cart_item['meta']['post_id'] ) .'" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title( $cart_item['meta']['post_id']) ) . '</a>';
-            $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $wpi_item->get_custom_singular_name(), $post_link );
+            $post_link = '<a href="' . get_edit_post_link($cart_item['meta']['post_id']) . '" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title($cart_item['meta']['post_id'])) . '</a>';
+            $summary = wp_sprintf(__('%s: %s', 'invoicing'), $wpi_item->get_custom_singular_name(), $post_link);
         }
-        $summary = apply_filters( 'wpinv_admin_invoice_line_item_summary', $summary, $cart_item, $wpi_item, $invoice );
+        $summary = apply_filters('wpinv_admin_invoice_line_item_summary', $summary, $cart_item, $wpi_item, $invoice);
         
         $item_tax       = '';
         $tax_rate       = '';
-        if ( $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0 ) {
-            $item_tax = wpinv_price( wpinv_format_amount( $cart_item['tax'] ) );
-            $tax_rate = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : ( $cart_item['tax'] / $cart_item['subtotal'] ) * 100;
-            $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+        if ($cart_item['tax'] > 0 && $cart_item['subtotal'] > 0) {
+            $item_tax = wpinv_price(wpinv_format_amount($cart_item['tax']));
+            $tax_rate = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : ($cart_item['tax'] / $cart_item['subtotal']) * 100;
+            $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount($tax_rate, 4) : '';
             $tax_rate = $tax_rate != '' ? ' <span class="tax-rate">(' . $tax_rate . '%)</span>' : '';
         }
         $line_item_tax = $item_tax . $tax_rate;
         
-        if ( $line_item_tax === '' ) {
+        if ($line_item_tax === '') {
             $line_item_tax = 0; // Zero tax
         }
 
-        $line_item = '<tr class="item item-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . '" data-item-id="' . $item_id . '">';
+        $line_item = '<tr class="item item-' . (($count % 2 == 0) ? 'even' : 'odd') . '" data-item-id="' . $item_id . '">';
             $line_item .= '<td class="id">' . $item_id . '</td>';
-            $line_item .= '<td class="title"><a href="' . get_edit_post_link( $item_id ) . '" target="_blank">' . $cart_item['name'] . '</a>' . wpinv_get_item_suffix( $wpi_item );
-            if ( $summary !== '' ) {
-                $line_item .= '<span class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</span>';
+            $line_item .= '<td class="title"><a href="' . get_edit_post_link($item_id) . '" target="_blank">' . $cart_item['name'] . '</a>' . wpinv_get_item_suffix($wpi_item);
+            if ($summary !== '') {
+                $line_item .= '<span class="meta">' . wpautop(wp_kses_post($summary)) . '</span>';
             }
             $line_item .= '</td>';
             $line_item .= '<td class="price">' . $item_price . '</td>';
             
-            if ( $item_quantities ) {
-                if ( count( $cart_items ) == 1 && $quantity <= 1 ) {
+            if ($item_quantities) {
+                if (count($cart_items) == 1 && $quantity <= 1) {
                     $can_remove = false;
                 }
                 $line_item .= '<td class="qty" data-quantity="' . $quantity . '">&nbsp;&times;&nbsp;' . $quantity . '</td>';
             } else {
-                if ( count( $cart_items ) == 1 ) {
+                if (count($cart_items) == 1) {
                     $can_remove = false;
                 }
             }
             $line_item .= '<td class="total">' . $item_subtotal . '</td>';
             
-            if ( $use_taxes ) {
+            if ($use_taxes) {
                 $line_item .= '<td class="tax">' . $line_item_tax . '</td>';
             }
             $line_item .= '<td class="action">';
-            if ( !$invoice->is_paid() && $can_remove ) {
+            if (!$invoice->is_paid() && $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();
 }
@@ -1390,35 +1390,35 @@ 
     // Set current invoice id.
     $wpi_checkout_id = wpinv_get_invoice_cart_id();
     
-    $form_action  = esc_url( wpinv_get_checkout_uri() );
+    $form_action = esc_url(wpinv_get_checkout_uri());
 
     ob_start();
         echo '<div id="wpinv_checkout_wrap">';
         
-        if ( wpinv_get_cart_contents() || wpinv_cart_has_fees() ) {
+        if (wpinv_get_cart_contents() || wpinv_cart_has_fees()) {
             ?>
             <div id="wpinv_checkout_form_wrap" class="wpinv_clearfix table-responsive">
-                <?php do_action( 'wpinv_before_checkout_form' ); ?>
+                <?php do_action('wpinv_before_checkout_form'); ?>
                 <form id="wpinv_checkout_form" class="wpi-form" action="<?php echo $form_action; ?>" method="POST">
                     <?php
-                    do_action( 'wpinv_checkout_form_top' );
-                    do_action( 'wpinv_checkout_billing_info' );
-                    do_action( 'wpinv_checkout_cart' );
-                    do_action( 'wpinv_payment_mode_select'  );
-                    do_action( 'wpinv_checkout_form_bottom' )
+                    do_action('wpinv_checkout_form_top');
+                    do_action('wpinv_checkout_billing_info');
+                    do_action('wpinv_checkout_cart');
+                    do_action('wpinv_payment_mode_select');
+                    do_action('wpinv_checkout_form_bottom')
                     ?>
                 </form>
-                <?php do_action( 'wpinv_after_purchase_form' ); ?>
+                <?php do_action('wpinv_after_purchase_form'); ?>
             </div><!--end #wpinv_checkout_form_wrap-->
         <?php
         } else {
-            do_action( 'wpinv_cart_empty' );
+            do_action('wpinv_cart_empty');
         }
         echo '</div><!--end #wpinv_checkout_wrap-->';
     return ob_get_clean();
 }
 
-function wpinv_checkout_cart( $cart_details = array(), $echo = true ) {
+function wpinv_checkout_cart($cart_details = array(), $echo = true) {
     global $ajax_cart_details;
     $ajax_cart_details = $cart_details;
     /*
@@ -1433,25 +1433,25 @@ 
     }
     */
     ob_start();
-    do_action( 'wpinv_before_checkout_cart' );
+    do_action('wpinv_before_checkout_cart');
     echo '<div id="wpinv_checkout_cart_form" method="post">';
         echo '<div id="wpinv_checkout_cart_wrap">';
-            wpinv_get_template_part( 'wpinv-checkout-cart' );
+            wpinv_get_template_part('wpinv-checkout-cart');
         echo '</div>';
     echo '</div>';
-    do_action( 'wpinv_after_checkout_cart' );
+    do_action('wpinv_after_checkout_cart');
     $content = ob_get_clean();
     
-    if ( $echo ) {
+    if ($echo) {
         echo $content;
     } else {
         return $content;
     }
 }
-add_action( 'wpinv_checkout_cart', 'wpinv_checkout_cart', 10 );
+add_action('wpinv_checkout_cart', 'wpinv_checkout_cart', 10);
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+	return apply_filters('wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __('Your cart is empty.', 'invoicing') . '</span>');
 }
 
 /**
@@ -1463,91 +1463,91 @@ 
 function wpinv_empty_checkout_cart() {
 	echo wpinv_empty_cart_message();
 }
-add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
+add_action('wpinv_cart_empty', 'wpinv_empty_checkout_cart');
 
 function wpinv_save_cart_button() {
-    if ( wpinv_is_cart_saving_disabled() )
+    if (wpinv_is_cart_saving_disabled())
         return;
 ?>
-    <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url( add_query_arg( 'wpi_action', 'save_cart' ) ); ?>"><?php _e( 'Save Cart', 'invoicing' ); ?></a>
+    <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url(add_query_arg('wpi_action', 'save_cart')); ?>"><?php _e('Save Cart', 'invoicing'); ?></a>
 <?php
 }
 
 function wpinv_update_cart_button() {
-    if ( !wpinv_item_quantities_enabled() )
+    if (!wpinv_item_quantities_enabled())
         return;
 ?>
-    <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e( 'Update Cart', 'invoicing' ); ?>"/>
+    <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e('Update Cart', 'invoicing'); ?>"/>
     <input type="hidden" name="wpi_action" value="update_cart"/>
 <?php
 }
 
 function wpinv_checkout_cart_columns() {
     $default = 3;
-    if ( wpinv_item_quantities_enabled() ) {
+    if (wpinv_item_quantities_enabled()) {
         $default++;
     }
     
-    if ( wpinv_use_taxes() ) {
+    if (wpinv_use_taxes()) {
         $default++;
     }
 
-    return apply_filters( 'wpinv_checkout_cart_columns', $default );
+    return apply_filters('wpinv_checkout_cart_columns', $default);
 }
 
 function wpinv_display_cart_messages() {
     global $wpi_session;
 
-    $messages = $wpi_session->get( 'wpinv_cart_messages' );
+    $messages = $wpi_session->get('wpinv_cart_messages');
 
-    if ( $messages ) {
-        foreach ( $messages as $message_id => $message ) {
+    if ($messages) {
+        foreach ($messages as $message_id => $message) {
             // Try and detect what type of message this is
-            if ( strpos( strtolower( $message ), 'error' ) ) {
+            if (strpos(strtolower($message), 'error')) {
                 $type = 'error';
-            } elseif ( strpos( strtolower( $message ), 'success' ) ) {
+            } elseif (strpos(strtolower($message), 'success')) {
                 $type = 'success';
             } else {
                 $type = 'info';
             }
 
-            $classes = apply_filters( 'wpinv_' . $type . '_class', array( 'wpinv_errors', 'wpinv-alert', 'wpinv-alert-' . $type ) );
+            $classes = apply_filters('wpinv_' . $type . '_class', array('wpinv_errors', 'wpinv-alert', 'wpinv-alert-' . $type));
 
-            echo '<div class="' . implode( ' ', $classes ) . '">';
+            echo '<div class="' . implode(' ', $classes) . '">';
                 // Loop message codes and display messages
                     echo '<p class="wpinv_error" id="wpinv_msg_' . $message_id . '">' . $message . '</p>';
             echo '</div>';
         }
 
         // Remove all of the cart saving messages
-        $wpi_session->set( 'wpinv_cart_messages', null );
+        $wpi_session->set('wpinv_cart_messages', null);
     }
 }
-add_action( 'wpinv_before_checkout_cart', 'wpinv_display_cart_messages' );
+add_action('wpinv_before_checkout_cart', 'wpinv_display_cart_messages');
 
 function wpinv_discount_field() {
-    if ( isset( $_GET['wpi-gateway'] ) && wpinv_is_ajax_disabled() ) {
+    if (isset($_GET['wpi-gateway']) && wpinv_is_ajax_disabled()) {
         return; // Only show before a payment method has been selected if ajax is disabled
     }
 
-    if ( !wpinv_is_checkout() ) {
+    if (!wpinv_is_checkout()) {
         return;
     }
 
-    if ( wpinv_has_active_discounts() && wpinv_get_cart_total() ) {
+    if (wpinv_has_active_discounts() && wpinv_get_cart_total()) {
     ?>
     <div id="wpinv-discount-field" class="panel panel-default">
         <div class="panel-body">
             <p>
-                <label class="wpinv-label" for="wpinv_discount_code"><strong><?php _e( 'Discount', 'invoicing' ); ?></strong></label>
-                <span class="wpinv-description"><?php _e( 'Enter a discount code if you have one.', 'invoicing' ); ?></span>
+                <label class="wpinv-label" for="wpinv_discount_code"><strong><?php _e('Discount', 'invoicing'); ?></strong></label>
+                <span class="wpinv-description"><?php _e('Enter a discount code if you have one.', 'invoicing'); ?></span>
             </p>
             <div class="form-group row">
                 <div class="col-sm-4">
-                    <input class="wpinv-input form-control" type="text" id="wpinv_discount_code" name="wpinv_discount_code" placeholder="<?php _e( 'Enter discount code', 'invoicing' ); ?>"/>
+                    <input class="wpinv-input form-control" type="text" id="wpinv_discount_code" name="wpinv_discount_code" placeholder="<?php _e('Enter discount code', 'invoicing'); ?>"/>
                 </div>
                 <div class="col-sm-3">
-                    <button id="wpi-apply-discount" type="button" class="btn btn-success btn-sm"><?php _e( 'Apply Discount', 'invoicing' ); ?></button>
+                    <button id="wpi-apply-discount" type="button" class="btn btn-success btn-sm"><?php _e('Apply Discount', 'invoicing'); ?></button>
                 </div>
                 <div class="col-sm-12 wpinv-discount-msg">
                     <div class="alert alert-success"><i class="fa fa-check-circle"></i><span class="wpi-msg"></span></div>
@@ -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,126 +1577,126 @@ 
 <?php
     }
 }
-add_action( 'wpinv_checkout_form_top', 'wpinv_agree_to_terms_js' );
+add_action('wpinv_checkout_form_top', 'wpinv_agree_to_terms_js');
 
 function wpinv_payment_mode_select() {
-    $gateways = wpinv_get_enabled_payment_gateways( true );
-    $gateways = apply_filters( 'wpinv_payment_gateways_on_cart', $gateways );
+    $gateways = wpinv_get_enabled_payment_gateways(true);
+    $gateways = apply_filters('wpinv_payment_gateways_on_cart', $gateways);
     $page_URL = wpinv_get_current_page_url();
-    $invoice = wpinv_get_invoice( 0, true );
+    $invoice = wpinv_get_invoice(0, true);
     
     do_action('wpinv_payment_mode_top');
     $invoice_id = (int)$invoice->ID;
-    $chosen_gateway = wpinv_get_chosen_gateway( $invoice_id );
+    $chosen_gateway = wpinv_get_chosen_gateway($invoice_id);
     ?>
-    <div id="wpinv_payment_mode_select" data-gateway="<?php echo $chosen_gateway; ?>" <?php echo ( $invoice->is_free() ? 'style="display:none;"' : '' ); ?>>
-            <?php do_action( 'wpinv_payment_mode_before_gateways_wrap' ); ?>
+    <div id="wpinv_payment_mode_select" data-gateway="<?php echo $chosen_gateway; ?>" <?php echo ($invoice->is_free() ? 'style="display:none;"' : ''); ?>>
+            <?php do_action('wpinv_payment_mode_before_gateways_wrap'); ?>
             <div id="wpinv-payment-mode-wrap" class="panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Select Payment Method', 'invoicing' ); ?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php _e('Select Payment Method', 'invoicing'); ?></h3></div>
                 <div class="panel-body list-group wpi-payment_methods">
                     <?php
-                    do_action( 'wpinv_payment_mode_before_gateways' );
+                    do_action('wpinv_payment_mode_before_gateways');
                     
-                    if(!empty($gateways)){
-	                    foreach ( $gateways as $gateway_id => $gateway ) {
-		                    $checked = checked( $gateway_id, $chosen_gateway, false );
-		                    $button_label = wpinv_get_gateway_button_label( $gateway_id );
-		                    $description = wpinv_get_gateway_description( $gateway_id );
+                    if (!empty($gateways)) {
+	                    foreach ($gateways as $gateway_id => $gateway) {
+		                    $checked = checked($gateway_id, $chosen_gateway, false);
+		                    $button_label = wpinv_get_gateway_button_label($gateway_id);
+		                    $description = wpinv_get_gateway_description($gateway_id);
 		                    ?>
 		                    <div class="list-group-item">
 			                    <div class="radio">
-				                    <label><input type="radio" data-button-text="<?php echo esc_attr( $button_label );?>" value="<?php echo esc_attr( $gateway_id ) ;?>" <?php echo $checked ;?> id="wpi_gateway_<?php echo esc_attr( $gateway_id );?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html( $gateway['checkout_label'] ); ?></label>
+				                    <label><input type="radio" data-button-text="<?php echo esc_attr($button_label); ?>" value="<?php echo esc_attr($gateway_id); ?>" <?php echo $checked; ?> id="wpi_gateway_<?php echo esc_attr($gateway_id); ?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html($gateway['checkout_label']); ?></label>
 			                    </div>
-			                    <div style="display:none;" class="payment_box wpi_gateway_<?php echo esc_attr( $gateway_id );?>" role="alert">
-				                    <?php if ( !empty( $description ) ) { ?>
-					                    <div class="wpi-gateway-desc alert alert-info"><?php echo $description;?></div>
+			                    <div style="display:none;" class="payment_box wpi_gateway_<?php echo esc_attr($gateway_id); ?>" role="alert">
+				                    <?php if (!empty($description)) { ?>
+					                    <div class="wpi-gateway-desc alert alert-info"><?php echo $description; ?></div>
 				                    <?php } ?>
-				                    <?php do_action( 'wpinv_' . $gateway_id . '_cc_form', $invoice_id ) ;?>
+				                    <?php do_action('wpinv_' . $gateway_id . '_cc_form', $invoice_id); ?>
 			                    </div>
 		                    </div>
 		                    <?php
 	                    }
-                    }else{
-	                    echo '<div class="alert alert-warning">'. __('No payment gateway active','invoicing') .'</div>';
+                    } else {
+	                    echo '<div class="alert alert-warning">' . __('No payment gateway active', 'invoicing') . '</div>';
                     }
 
-                    do_action( 'wpinv_payment_mode_after_gateways' );
+                    do_action('wpinv_payment_mode_after_gateways');
                     ?>
                 </div>
             </div>
-            <?php do_action( 'wpinv_payment_mode_after_gateways_wrap' ); ?>
+            <?php do_action('wpinv_payment_mode_after_gateways_wrap'); ?>
     </div>
     <?php
     do_action('wpinv_payment_mode_bottom');
 }
-add_action( 'wpinv_payment_mode_select', 'wpinv_payment_mode_select' );
+add_action('wpinv_payment_mode_select', 'wpinv_payment_mode_select');
 
 function wpinv_checkout_billing_info() {    
-    if ( wpinv_is_checkout() ) {
+    if (wpinv_is_checkout()) {
         $logged_in          = is_user_logged_in();
         $billing_details    = wpinv_checkout_billing_details();
-        $selected_country   = !empty( $billing_details['country'] ) ? $billing_details['country'] : wpinv_default_billing_country();
+        $selected_country   = !empty($billing_details['country']) ? $billing_details['country'] : wpinv_default_billing_country();
         ?>
         <div id="wpinv-fields" class="clearfix">
             <div id="wpi-billing" class="wpi-billing clearfix panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Billing Details', 'invoicing' );?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php _e('Billing Details', 'invoicing'); ?></h3></div>
                 <div id="wpinv-fields-box" class="panel-body">
-                    <?php do_action( 'wpinv_checkout_billing_fields_first', $billing_details ); ?>
+                    <?php do_action('wpinv_checkout_billing_fields_first', $billing_details); ?>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_first_name" class="wpi-label"><?php _e( 'First Name', 'invoicing' );?><?php if ( wpinv_get_option( 'fname_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_first_name" class="wpi-label"><?php _e('First Name', 'invoicing'); ?><?php if (wpinv_get_option('fname_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_first_name',
                                 'name'          => 'wpinv_first_name',
                                 'value'         => $billing_details['first_name'],
                                 'class'         => 'wpi-input form-control required',
-                                '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 required',
-                                '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 required',
-                                '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',
@@ -1704,16 +1704,16 @@ 
                             'show_option_all'  => false,
                             'show_option_none' => false,
                             'class'            => 'wpi-input form-control required',
-                            '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',
@@ -1721,61 +1721,61 @@ 
                                 'show_option_all'  => false,
                                 'show_option_none' => false,
                                 'class'            => 'wpi-input form-control required',
-                                '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 required',
-                                '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" />
@@ -1785,9 +1785,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() {
@@ -1796,96 +1796,96 @@ 
 <div id="wpinv_checkout_total" class="panel panel-info">
     <div class="panel-body">
     <?php
-    do_action( 'wpinv_purchase_form_before_checkout_total' );
+    do_action('wpinv_purchase_form_before_checkout_total');
     ?>
-    <strong><?php _e( 'Invoice Total:', 'invoicing' ) ?></strong> <span class="wpinv-chdeckout-total"><?php echo $cart_total;?></span>
+    <strong><?php _e('Invoice Total:', 'invoicing') ?></strong> <span class="wpinv-chdeckout-total"><?php echo $cart_total; ?></span>
     <?php
-    do_action( 'wpinv_purchase_form_after_checkout_total' );
+    do_action('wpinv_purchase_form_after_checkout_total');
     ?>
     </div>
 </div>
 <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_total', 9998 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_total', 9998);
 
 function wpinv_checkout_submit() {
 ?>
 <div id="wpinv_purchase_submit" class="panel panel-success">
     <div class="panel-body text-center">
     <?php
-    do_action( 'wpinv_purchase_form_before_submit' );
+    do_action('wpinv_purchase_form_before_submit');
     wpinv_checkout_hidden_fields();
     echo wpinv_checkout_button_purchase();
-    do_action( 'wpinv_purchase_form_after_submit' );
+    do_action('wpinv_purchase_form_after_submit');
     ?>
     </div>
 </div>
 <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_submit', 9999 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_submit', 9999);
 
-function wpinv_receipt_billing_address( $invoice_id = 0 ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_receipt_billing_address($invoice_id = 0) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $billing_details = $invoice->get_user_info();
     $address_row = '';
-    if ( $address = $billing_details['address'] ) {
-        $address_row .= wpautop( wp_kses_post( $address ) );
+    if ($address = $billing_details['address']) {
+        $address_row .= wpautop(wp_kses_post($address));
     }
     
     $address_fields = array();
-    if ( !empty( $billing_details['city'] ) ) {
+    if (!empty($billing_details['city'])) {
         $address_fields[] = $billing_details['city'];
     }
     
-    $billing_country = !empty( $billing_details['country'] ) ? $billing_details['country'] : '';
-    if ( !empty( $billing_details['state'] ) ) {
-        $address_fields[] = wpinv_state_name( $billing_details['state'], $billing_country );
+    $billing_country = !empty($billing_details['country']) ? $billing_details['country'] : '';
+    if (!empty($billing_details['state'])) {
+        $address_fields[] = wpinv_state_name($billing_details['state'], $billing_country);
     }
     
-    if ( !empty( $billing_country ) ) {
-        $address_fields[] = wpinv_country_name( $billing_country );
+    if (!empty($billing_country)) {
+        $address_fields[] = wpinv_country_name($billing_country);
     }
     
-    if ( !empty( $address_fields ) ) {
-        $address_fields = implode( ", ", $address_fields );
+    if (!empty($address_fields)) {
+        $address_fields = implode(", ", $address_fields);
         
-        if ( !empty( $billing_details['zip'] ) ) {
+        if (!empty($billing_details['zip'])) {
             $address_fields .= ' ' . $billing_details['zip'];
         }
         
-        $address_row .= wpautop( wp_kses_post( $address_fields ) );
+        $address_row .= wpautop(wp_kses_post($address_fields));
     }
     ob_start();
     ?>
     <table class="table table-bordered table-sm wpi-billing-details">
         <tbody>
             <tr class="wpi-receipt-name">
-                <th class="text-left"><?php _e( 'Name', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( trim( $billing_details['first_name'] . ' ' . $billing_details['last_name'] ) ) ;?></td>
+                <th class="text-left"><?php _e('Name', 'invoicing'); ?></th>
+                <td><?php echo esc_html(trim($billing_details['first_name'] . ' ' . $billing_details['last_name'])); ?></td>
             </tr>
             <tr class="wpi-receipt-email">
-                <th class="text-left"><?php _e( 'Email', 'invoicing' ); ?></th>
-                <td><?php echo $billing_details['email'] ;?></td>
+                <th class="text-left"><?php _e('Email', 'invoicing'); ?></th>
+                <td><?php echo $billing_details['email']; ?></td>
             </tr>
-            <?php if ( $billing_details['company'] ) { ?>
+            <?php if ($billing_details['company']) { ?>
             <tr class="wpi-receipt-company">
-                <th class="text-left"><?php _e( 'Company', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $billing_details['company'] ) ;?></td>
+                <th class="text-left"><?php _e('Company', 'invoicing'); ?></th>
+                <td><?php echo esc_html($billing_details['company']); ?></td>
             </tr>
             <?php } ?>
             <tr class="wpi-receipt-address">
-                <th class="text-left"><?php _e( 'Address', 'invoicing' ); ?></th>
-                <td><?php echo $address_row ;?></td>
+                <th class="text-left"><?php _e('Address', 'invoicing'); ?></th>
+                <td><?php echo $address_row; ?></td>
             </tr>
-            <?php if ( $billing_details['phone'] ) { ?>
+            <?php if ($billing_details['phone']) { ?>
             <tr class="wpi-receipt-phone">
-                <th class="text-left"><?php _e( 'Phone', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $billing_details['phone'] ) ;?></td>
+                <th class="text-left"><?php _e('Phone', 'invoicing'); ?></th>
+                <td><?php echo esc_html($billing_details['phone']); ?></td>
             </tr>
             <?php } ?>
         </tbody>
@@ -1893,98 +1893,98 @@ 
     <?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(
             'print'   => array(
                 'url'  => $invoice->get_view_url(),
-                'name' => __( 'Print Invoice', 'invoicing' ),
+                'name' => __('Print Invoice', 'invoicing'),
                 'class' => 'btn-primary',
             ),
             'history'   => array(
                 'url'  => wpinv_get_history_page_uri(),
-                'name' => __( 'Invoice History', 'invoicing' ),
+                'name' => __('Invoice History', 'invoicing'),
                 'class' => 'btn-warning',
             )
         );
 
-        $actions = apply_filters( 'wpinv_invoice_receipt_actions', $actions, $invoice );
+        $actions = apply_filters('wpinv_invoice_receipt_actions', $actions, $invoice);
         
-        if ( !empty( $actions ) ) {
+        if (!empty($actions)) {
         ?>
         <div class="wpinv-receipt-actions text-right">
-            <?php foreach ( $actions as $key => $action ) { $class = !empty($action['class']) ? sanitize_html_class( $action['class'] ) : ''; ?>
-            <a href="<?php echo esc_url( $action['url'] );?>" class="btn btn-sm <?php echo $class . ' ' . sanitize_html_class( $key );?>" <?php echo ( !empty($action['attrs']) ? $action['attrs'] : '' ) ;?>><?php echo esc_html( $action['name'] );?></a>
+            <?php foreach ($actions as $key => $action) { $class = !empty($action['class']) ? sanitize_html_class($action['class']) : ''; ?>
+            <a href="<?php echo esc_url($action['url']); ?>" class="btn btn-sm <?php echo $class . ' ' . sanitize_html_class($key); ?>" <?php echo (!empty($action['attrs']) ? $action['attrs'] : ''); ?>><?php echo esc_html($action['name']); ?></a>
             <?php } ?>
         </div>
         <?php
         }
     }
 }
-add_action( 'wpinv_receipt_start', 'wpinv_receipt_actions', -10, 1 );
+add_action('wpinv_receipt_start', 'wpinv_receipt_actions', -10, 1);
 
-function wpinv_invoice_link( $invoice_id ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_invoice_link($invoice_id) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
-    $invoice_link = '<a href="' . esc_url( $invoice->get_view_url() ) . '">' . $invoice->get_number() . '</a>';
+    $invoice_link = '<a href="' . esc_url($invoice->get_view_url()) . '">' . $invoice->get_number() . '</a>';
     
-    return apply_filters( 'wpinv_get_invoice_link', $invoice_link, $invoice );
+    return apply_filters('wpinv_get_invoice_link', $invoice_link, $invoice);
 }
 
-function wpinv_invoice_subscription_details( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->is_recurring() && !wpinv_is_subscription_payment( $invoice ) ) {
+function wpinv_invoice_subscription_details($invoice) {
+    if (!empty($invoice) && $invoice->is_recurring() && !wpinv_is_subscription_payment($invoice)) {
         $total_payments = (int)$invoice->get_total_payments();
         $payments       = $invoice->get_child_payments();
         
         $subscription   = $invoice->get_subscription_data();
         
-        if ( !( !empty( $subscription ) && !empty( $subscription['item_id'] ) ) ) {
+        if (!(!empty($subscription) && !empty($subscription['item_id']))) {
             return;
         }
         
-        $billing_cycle  = wpinv_get_billing_cycle( $subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency() );
-        $times_billed   = $total_payments . ' / ' . ( ( (int)$subscription['bill_times'] == 0 ) ? __( 'Until cancelled', 'invoicing' ) : $subscription['bill_times'] );
+        $billing_cycle  = wpinv_get_billing_cycle($subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency());
+        $times_billed   = $total_payments . ' / ' . (((int)$subscription['bill_times'] == 0) ? __('Until cancelled', 'invoicing') : $subscription['bill_times']);
         
         $subscription_status = $invoice->get_subscription_status();
         
         $status_desc = '';
-        if ( $subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date() ) {
-            $status_desc = wp_sprintf( __( 'Until: %s', 'invoicing' ), $trial_end_date );
-        } else if ( $subscription_status == 'cancelled' && $cancelled_date = $invoice->get_cancelled_date() ) {
-            $status_desc = wp_sprintf( __( 'On: %s', 'invoicing' ), $cancelled_date );
+        if ($subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date()) {
+            $status_desc = wp_sprintf(__('Until: %s', 'invoicing'), $trial_end_date);
+        } else if ($subscription_status == 'cancelled' && $cancelled_date = $invoice->get_cancelled_date()) {
+            $status_desc = wp_sprintf(__('On: %s', 'invoicing'), $cancelled_date);
         }
         $status_desc = $status_desc != '' ? '<span class="meta">' . $status_desc . '</span>' : '';
         ?>
         <div class="wpinv-subscriptions-details">
-            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters( 'wpinv_subscription_details_title', __( 'Subscription Details', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters('wpinv_subscription_details_title', __('Subscription Details', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
-                        <th><?php _e( 'Billing Cycle', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Start Date', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Expiration Date', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Times Billed', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Status', 'invoicing' ) ;?></th>
+                        <th><?php _e('Billing Cycle', 'invoicing'); ?></th>
+                        <th><?php _e('Start Date', 'invoicing'); ?></th>
+                        <th><?php _e('Expiration Date', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Times Billed', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Status', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -1993,32 +1993,32 @@ 
                         <td><?php echo $invoice->get_subscription_start(); ?></td>
                         <td><?php echo $invoice->get_subscription_end(); ?></td>
                         <td class="text-center"><?php echo $times_billed; ?></td>
-                        <td class="text-center wpi-sub-status"><?php echo $invoice->get_subscription_status_label() ;?>
+                        <td class="text-center wpi-sub-status"><?php echo $invoice->get_subscription_status_label(); ?>
                         <?php echo $status_desc; ?>
                         </td>
                     </tr>
                 </tbody>
             </table>
         </div>
-        <?php if ( !empty( $payments ) ) { ?>
+        <?php if (!empty($payments)) { ?>
         <div class="wpinv-renewal-payments">
-            <h3 class="wpinv-renewals-t"><?php echo apply_filters( 'wpinv_renewal_payments_title', __( 'Renewal Payments', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-renewals-t"><?php echo apply_filters('wpinv_renewal_payments_title', __('Renewal Payments', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
                         <th>#</th>
-                        <th><?php _e( 'Invoice', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Date', 'invoicing' ) ;?></th>
-                        <th class="text-right"><?php _e( 'Amount', 'invoicing' ) ;?></th>
+                        <th><?php _e('Invoice', 'invoicing'); ?></th>
+                        <th><?php _e('Date', 'invoicing'); ?></th>
+                        <th class="text-right"><?php _e('Amount', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ( $payments as $key => $invoice_id ) { ?>
+                    <?php foreach ($payments as $key => $invoice_id) { ?>
                     <tr>
-                        <th scope="row"><?php echo ( $key + 1 );?></th>
-                        <td><?php echo wpinv_invoice_link( $invoice_id ) ;?></td>
-                        <td><?php echo wpinv_get_invoice_date( $invoice_id ); ?></td>
-                        <td class="text-right"><?php echo wpinv_payment_total( $invoice_id, true ); ?></td>
+                        <th scope="row"><?php echo ($key + 1); ?></th>
+                        <td><?php echo wpinv_invoice_link($invoice_id); ?></td>
+                        <td><?php echo wpinv_get_invoice_date($invoice_id); ?></td>
+                        <td class="text-right"><?php echo wpinv_payment_total($invoice_id, true); ?></td>
                     </tr>
                     <?php } ?>
                     <tr><td colspan="4" style="padding:0"></td></tr>
@@ -2030,52 +2030,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">
@@ -2087,43 +2087,43 @@ 
 }
 // add_action( 'wpinv_invoice_print_after_line_items', 'wpinv_invoice_print_payment_info', 10, 1 );
 
-function wpinv_get_invoice_note_line_item( $note, $echo = true ) {
-    if ( empty( $note ) ) {
+function wpinv_get_invoice_note_line_item($note, $echo = true) {
+    if (empty($note)) {
         return NULL;
     }
     
-    if ( is_int( $note ) ) {
-        $note = get_comment( $note );
+    if (is_int($note)) {
+        $note = get_comment($note);
     }
     
-    if ( !( is_object( $note ) && is_a( $note, 'WP_Comment' ) ) ) {
+    if (!(is_object($note) && is_a($note, 'WP_Comment'))) {
         return NULL;
     }
     
-    $note_classes   = array( 'note' );
-    $note_classes[] = get_comment_meta( $note->comment_ID, '_wpi_customer_note', true ) ? 'customer-note' : '';
-    $note_classes[] = $note->comment_author === __( 'System', 'invoicing' ) ? 'system-note' : '';
-    $note_classes   = apply_filters( 'wpinv_invoice_note_class', array_filter( $note_classes ), $note );
-    $note_classes   = !empty( $note_classes ) ? implode( ' ', $note_classes ) : '';
+    $note_classes   = array('note');
+    $note_classes[] = get_comment_meta($note->comment_ID, '_wpi_customer_note', true) ? 'customer-note' : '';
+    $note_classes[] = $note->comment_author === __('System', 'invoicing') ? 'system-note' : '';
+    $note_classes   = apply_filters('wpinv_invoice_note_class', array_filter($note_classes), $note);
+    $note_classes   = !empty($note_classes) ? implode(' ', $note_classes) : '';
     
     ob_start();
     ?>
-    <li rel="<?php echo absint( $note->comment_ID ) ; ?>" class="<?php echo esc_attr( $note_classes ); ?>">
+    <li rel="<?php echo absint($note->comment_ID); ?>" class="<?php echo esc_attr($note_classes); ?>">
         <div class="note_content">
-            <?php echo wpautop( wptexturize( wp_kses_post( $note->comment_content ) ) ); ?>
+            <?php echo wpautop(wptexturize(wp_kses_post($note->comment_content))); ?>
         </div>
         <p class="meta">
-            <abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf( __( '%1$s - %2$s at %3$s', 'invoicing' ), $note->comment_author, date_i18n( get_option( 'date_format' ), strtotime( $note->comment_date ) ), date_i18n( get_option( 'time_format' ), strtotime( $note->comment_date ) ) ); ?></abbr>&nbsp;&nbsp;
-            <?php if($note->comment_author !== 'System') {?>
-                <a href="#" class="delete_note"><?php _e( 'Delete note', 'invoicing' ); ?></a>
+            <abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf(__('%1$s - %2$s at %3$s', 'invoicing'), $note->comment_author, date_i18n(get_option('date_format'), strtotime($note->comment_date)), date_i18n(get_option('time_format'), strtotime($note->comment_date))); ?></abbr>&nbsp;&nbsp;
+            <?php if ($note->comment_author !== 'System') {?>
+                <a href="#" class="delete_note"><?php _e('Delete note', 'invoicing'); ?></a>
             <?php } ?>
         </p>
     </li>
     <?php
     $note_content = ob_get_clean();
-    $note_content = apply_filters( 'wpinv_get_invoice_note_line_item', $note_content, $note, $echo );
+    $note_content = apply_filters('wpinv_get_invoice_note_line_item', $note_content, $note, $echo);
     
-    if ( $echo ) {
+    if ($echo) {
         echo $note_content;
     } else {
         return $note_content;

includes/wpinv-item-functions.php

Spacing +245 added lines, -245 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_item_by($field = '', $value = '', $type = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
     
     $posts = array();
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
         case 'id':
-            $item = get_post( $value );
+            $item = get_post($value);
 
-            if( get_post_type( $item ) != 'wpi_item' ) {
+            if (get_post_type($item) != 'wpi_item') {
                 return false;
             }
 
@@ -21,16 +21,16 @@ 
 
         case 'slug':
         case 'name':
-            $posts = get_posts( array(
+            $posts = get_posts(array(
                 'post_type'      => 'wpi_item',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
             break;
         case 'custom_id':
-            if ( empty( $value ) || empty( $type ) ) {
+            if (empty($value) || empty($type)) {
                 return false;
             }
             
@@ -50,10 +50,10 @@ 
                 'post_status'    => 'any',
                 'orderby'        => 'ID',
                 'order'          => 'ASC',
-                'meta_query'     => array( $meta_query )
+                'meta_query'     => array($meta_query)
             );
             
-            $posts = get_posts( $args );
+            $posts = get_posts($args);
 
             break;
 
@@ -61,17 +61,17 @@ 
             return false;
     }
     
-    if ( !empty( $posts[0] ) ) {
-        return new WPInv_Item( $posts[0]->ID );
+    if (!empty($posts[0])) {
+        return new WPInv_Item($posts[0]->ID);
     }
 
     return false;
 }
 
-function wpinv_get_item( $item = 0 ) {
-    if ( is_numeric( $item ) ) {
-        $item = get_post( $item );
-        if ( ! $item || 'wpi_item' !== $item->post_type )
+function wpinv_get_item($item = 0) {
+    if (is_numeric($item)) {
+        $item = get_post($item);
+        if (!$item || 'wpi_item' !== $item->post_type)
             return null;
         return $item;
     }
@@ -84,136 +84,136 @@ 
 
     $item = get_posts($args);
 
-    if ( $item ) {
+    if ($item) {
         return $item[0];
     }
 
     return null;
 }
 
-function wpinv_is_free_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_free_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_free();
 }
 
-function wpinv_get_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_price();
 }
 
-function wpinv_is_recurring_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_recurring_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_recurring();
 }
 
-function wpinv_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $price = wpinv_get_item_price( $item_id );
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_get_item_price($item_id);
+    $price = wpinv_price(wpinv_format_amount($price));
     
-    return apply_filters( 'wpinv_item_price', $price, $item_id );
+    return apply_filters('wpinv_item_price', $price, $item_id);
 }
 
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
+    if (empty($item_id)) {
         $item_id = get_the_ID();
     }
 
-    $price = wpinv_item_price( $item_id );
+    $price = wpinv_item_price($item_id);
 
-    $price           = apply_filters( 'wpinv_item_price', wpinv_sanitize_amount( $price ), $item_id );
+    $price           = apply_filters('wpinv_item_price', wpinv_sanitize_amount($price), $item_id);
     $formatted_price = '<span class="wpinv_price" id="wpinv_item_' . $item_id . '">' . $price . '</span>';
-    $formatted_price = apply_filters( 'wpinv_item_price_after_html', $formatted_price, $item_id, $price );
+    $formatted_price = apply_filters('wpinv_item_price_after_html', $formatted_price, $item_id, $price);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $formatted_price;
     } else {
         return $formatted_price;
     }
 }
 
-function wpinv_get_item_final_price( $item_id = 0, $amount_override = null ) {
-    if ( is_null( $amount_override ) ) {
-        $original_price = get_post_meta( $item_id, '_wpinv_price', true );
+function wpinv_get_item_final_price($item_id = 0, $amount_override = null) {
+    if (is_null($amount_override)) {
+        $original_price = get_post_meta($item_id, '_wpinv_price', true);
     } else {
         $original_price = $amount_override;
     }
     
     $price = $original_price;
 
-    return apply_filters( 'wpinv_get_item_final_price', $price, $item_id );
+    return apply_filters('wpinv_get_item_final_price', $price, $item_id);
 }
 
-function wpinv_item_custom_singular_name( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_custom_singular_name($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_custom_singular_name();
 }
 
 function wpinv_get_item_types() {
     $item_types = array(
-            'custom'    => __( 'Standard', 'invoicing' ),
-            'fee'       => __( 'Fee', 'invoicing' ),
+            'custom'    => __('Standard', 'invoicing'),
+            'fee'       => __('Fee', 'invoicing'),
         );
-    return apply_filters( 'wpinv_get_item_types', $item_types );
+    return apply_filters('wpinv_get_item_types', $item_types);
 }
 
 function wpinv_item_types() {
     $item_types = wpinv_get_item_types();
     
-    return ( !empty( $item_types ) ? array_keys( $item_types ) : array() );
+    return (!empty($item_types) ? array_keys($item_types) : array());
 }
 
-function wpinv_get_item_type( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_type($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_type();
 }
 
-function wpinv_item_type( $item_id ) {
+function wpinv_item_type($item_id) {
     $item_types = wpinv_get_item_types();
     
-    $item_type = wpinv_get_item_type( $item_id );
+    $item_type = wpinv_get_item_type($item_id);
     
-    if ( empty( $item_type ) ) {
+    if (empty($item_type)) {
         $item_type = '-';
     }
     
-    $item_type = isset( $item_types[$item_type] ) ? $item_types[$item_type] : __( $item_type, 'invoicing' );
+    $item_type = isset($item_types[$item_type]) ? $item_types[$item_type] : __($item_type, 'invoicing');
 
-    return apply_filters( 'wpinv_item_type', $item_type, $item_id );
+    return apply_filters('wpinv_item_type', $item_type, $item_id);
 }
 
-function wpinv_record_item_in_log( $item_id = 0, $file_id, $user_info, $ip, $invoice_id ) {
+function wpinv_record_item_in_log($item_id = 0, $file_id, $user_info, $ip, $invoice_id) {
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
@@ -222,7 +222,7 @@ 
         'log_type'		=> 'wpi_item'
     );
 
-    $user_id = isset( $user_info['user_id'] ) ? $user_info['user_id'] : (int) -1;
+    $user_id = isset($user_info['user_id']) ? $user_info['user_id'] : (int) -1;
 
     $log_meta = array(
         'user_info'	=> $user_info,
@@ -232,253 +232,253 @@ 
         'invoice_id'=> $invoice_id,
     );
 
-    $wpinv_logs->insert_log( $log_data, $log_meta );
+    $wpinv_logs->insert_log($log_data, $log_meta);
 }
 
-function wpinv_remove_item_logs_on_delete( $item_id = 0 ) {
-    if ( 'wpi_item' !== get_post_type( $item_id ) )
+function wpinv_remove_item_logs_on_delete($item_id = 0) {
+    if ('wpi_item' !== get_post_type($item_id))
         return;
 
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
     // Remove all log entries related to this item
-    $wpinv_logs->delete_logs( $item_id );
+    $wpinv_logs->delete_logs($item_id);
 }
-add_action( 'delete_post', 'wpinv_remove_item_logs_on_delete' );
+add_action('delete_post', 'wpinv_remove_item_logs_on_delete');
 
-function wpinv_get_random_item( $post_ids = true ) {
-    wpinv_get_random_items( 1, $post_ids );
+function wpinv_get_random_item($post_ids = true) {
+    wpinv_get_random_items(1, $post_ids);
 }
 
-function wpinv_get_random_items( $num = 3, $post_ids = true ) {
-    if ( $post_ids ) {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids' );
+function wpinv_get_random_items($num = 3, $post_ids = true) {
+    if ($post_ids) {
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids');
     } else {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num );
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num);
     }
     
-    $args  = apply_filters( 'wpinv_get_random_items', $args );
+    $args = apply_filters('wpinv_get_random_items', $args);
     
-    return get_posts( $args );
+    return get_posts($args);
 }
 
-function wpinv_get_item_token( $url = '' ) {
+function wpinv_get_item_token($url = '') {
     $args    = array();
-    $hash    = apply_filters( 'wpinv_get_url_token_algorithm', 'sha256' );
-    $secret  = apply_filters( 'wpinv_get_url_token_secret', hash( $hash, wp_salt() ) );
+    $hash    = apply_filters('wpinv_get_url_token_algorithm', 'sha256');
+    $secret  = apply_filters('wpinv_get_url_token_secret', hash($hash, wp_salt()));
 
-    $parts   = parse_url( $url );
+    $parts   = parse_url($url);
     $options = array();
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        if ( ! empty( $query_args['o'] ) ) {
-            $options = explode( ':', rawurldecode( $query_args['o'] ) );
+        if (!empty($query_args['o'])) {
+            $options = explode(':', rawurldecode($query_args['o']));
 
-            if ( in_array( 'ip', $options ) ) {
+            if (in_array('ip', $options)) {
                 $args['ip'] = wpinv_get_ip();
             }
 
-            if ( in_array( 'ua', $options ) ) {
+            if (in_array('ua', $options)) {
                 $ua = wpinv_get_user_agent();
-                $args['user_agent'] = rawurlencode( $ua );
+                $args['user_agent'] = rawurlencode($ua);
             }
         }
     }
 
-    $args = apply_filters( 'wpinv_get_url_token_args', $args, $url, $options );
+    $args = apply_filters('wpinv_get_url_token_args', $args, $url, $options);
 
     $args['secret'] = $secret;
     $args['token']  = false;
 
-    $url   = add_query_arg( $args, $url );
-    $parts = parse_url( $url );
+    $url   = add_query_arg($args, $url);
+    $parts = parse_url($url);
 
-    if ( ! isset( $parts['path'] ) ) {
+    if (!isset($parts['path'])) {
         $parts['path'] = '';
     }
 
-    $token = md5( $parts['path'] . '?' . $parts['query'] );
+    $token = md5($parts['path'] . '?' . $parts['query']);
 
     return $token;
 }
 
-function wpinv_validate_url_token( $url = '' ) {
+function wpinv_validate_url_token($url = '') {
     $ret   = false;
-    $parts = parse_url( $url );
+    $parts = parse_url($url);
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        $allowed = apply_filters( 'wpinv_url_token_allowed_params', array(
+        $allowed = apply_filters('wpinv_url_token_allowed_params', array(
             'item',
             'ttl',
             'token'
-        ) );
+        ));
 
         $remove = array();
 
-        foreach( $query_args as $key => $value ) {
-            if( false === in_array( $key, $allowed ) ) {
+        foreach ($query_args as $key => $value) {
+            if (false === in_array($key, $allowed)) {
                 $remove[] = $key;
             }
         }
 
-        if( ! empty( $remove ) ) {
-            $url = remove_query_arg( $remove, $url );
+        if (!empty($remove)) {
+            $url = remove_query_arg($remove, $url);
         }
 
-        if ( isset( $query_args['ttl'] ) && current_time( 'timestamp' ) > $query_args['ttl'] ) {
-            wp_die( apply_filters( 'wpinv_item_link_expired_text', __( 'Sorry but your item link has expired.', 'invoicing' ) ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+        if (isset($query_args['ttl']) && current_time('timestamp') > $query_args['ttl']) {
+            wp_die(apply_filters('wpinv_item_link_expired_text', __('Sorry but your item link has expired.', 'invoicing')), __('Error', 'invoicing'), array('response' => 403));
         }
 
-        if ( isset( $query_args['token'] ) && $query_args['token'] == wpinv_get_item_token( $url ) ) {
+        if (isset($query_args['token']) && $query_args['token'] == wpinv_get_item_token($url)) {
             $ret = true;
         }
 
     }
 
-    return apply_filters( 'wpinv_validate_url_token', $ret, $url, $query_args );
+    return apply_filters('wpinv_validate_url_token', $ret, $url, $query_args);
 }
 
-function wpinv_item_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_item_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
     $ret = false;
 
-    if ( is_array( $cart_items ) ) {
-        foreach ( $cart_items as $item ) {
-            if ( $item['id'] == $item_id ) {
+    if (is_array($cart_items)) {
+        foreach ($cart_items as $item) {
+            if ($item['id'] == $item_id) {
                 $ret = true;
                 break;
             }
         }
     }
 
-    return (bool) apply_filters( 'wpinv_item_in_cart', $ret, $item_id, $options );
+    return (bool)apply_filters('wpinv_item_in_cart', $ret, $item_id, $options);
 }
 
-function wpinv_get_cart_item_tax( $item_id = 0, $subtotal = '', $options = array() ) {
+function wpinv_get_cart_item_tax($item_id = 0, $subtotal = '', $options = array()) {
     $tax = 0;
-    if ( ! wpinv_item_is_tax_exclusive( $item_id ) ) {
-        $country = !empty( $_POST['country'] ) ? $_POST['country'] : false;
-        $state   = isset( $_POST['state'] ) ? $_POST['state'] : '';
+    if (!wpinv_item_is_tax_exclusive($item_id)) {
+        $country = !empty($_POST['country']) ? $_POST['country'] : false;
+        $state   = isset($_POST['state']) ? $_POST['state'] : '';
 
-        $tax = wpinv_calculate_tax( $subtotal, $country, $state, $item_id );
+        $tax = wpinv_calculate_tax($subtotal, $country, $state, $item_id);
     }
 
-    return apply_filters( 'wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options );
+    return apply_filters('wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options);
 }
 
-function wpinv_cart_item_price( $item ) {
+function wpinv_cart_item_price($item) {
     $use_taxes  = wpinv_use_taxes();
-    $item_id    = isset( $item['id'] ) ? $item['id'] : 0;
-    $price      = isset( $item['item_price'] ) ? wpinv_round_amount( $item['item_price'] ) : 0;
-    $options    = isset( $item['options'] ) ? $item['options'] : array();
-    $price_id   = isset( $options['price_id'] ) ? $options['price_id'] : false;
-    $tax        = wpinv_price( wpinv_format_amount( $item['tax'] ) );
-    
-    if ( !wpinv_is_free_item( $item_id, $price_id ) && !wpinv_item_is_tax_exclusive( $item_id ) ) {
-        if ( wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax() ) {
+    $item_id    = isset($item['id']) ? $item['id'] : 0;
+    $price      = isset($item['item_price']) ? wpinv_round_amount($item['item_price']) : 0;
+    $options    = isset($item['options']) ? $item['options'] : array();
+    $price_id   = isset($options['price_id']) ? $options['price_id'] : false;
+    $tax        = wpinv_price(wpinv_format_amount($item['tax']));
+    
+    if (!wpinv_is_free_item($item_id, $price_id) && !wpinv_item_is_tax_exclusive($item_id)) {
+        if (wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax()) {
             $price += $tax;
         }
         
-        if( !wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax() ) {
+        if (!wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax()) {
             $price -= $tax;
         }        
     }
 
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_price(wpinv_format_amount($price));
 
-    return apply_filters( 'wpinv_cart_item_price_label', $price, $item );
+    return apply_filters('wpinv_cart_item_price_label', $price, $item);
 }
 
-function wpinv_cart_item_subtotal( $item ) {
-    $subtotal   = isset( $item['subtotal'] ) ? $item['subtotal'] : 0;
-    $subtotal   = wpinv_price( wpinv_format_amount( $subtotal ) );
+function wpinv_cart_item_subtotal($item) {
+    $subtotal   = isset($item['subtotal']) ? $item['subtotal'] : 0;
+    $subtotal   = wpinv_price(wpinv_format_amount($subtotal));
 
-    return apply_filters( 'wpinv_cart_item_subtotal_label', $subtotal, $item );
+    return apply_filters('wpinv_cart_item_subtotal_label', $subtotal, $item);
 }
 
-function wpinv_cart_item_tax( $item ) {
+function wpinv_cart_item_tax($item) {
     $tax        = '';
     $tax_rate   = '';
     
-    if ( isset( $item['tax'] ) && $item['tax'] > 0 && $item['subtotal'] > 0 ) {
-        $tax      = wpinv_price( wpinv_format_amount( $item['tax'] ) );
-        $tax_rate = !empty( $item['vat_rate'] ) ? $item['vat_rate'] : ( $item['tax'] / $item['subtotal'] ) * 100;
-        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+    if (isset($item['tax']) && $item['tax'] > 0 && $item['subtotal'] > 0) {
+        $tax      = wpinv_price(wpinv_format_amount($item['tax']));
+        $tax_rate = !empty($item['vat_rate']) ? $item['vat_rate'] : ($item['tax'] / $item['subtotal']) * 100;
+        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount($tax_rate, 4) : '';
         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate normal small">(' . $tax_rate . '%)</small>' : '';
     }
     
-    $tax        = $tax . $tax_rate;
+    $tax = $tax . $tax_rate;
     
-    if ( $tax === '' ) {
+    if ($tax === '') {
         $tax = 0; // Zero tax
     }
 
-    return apply_filters( 'wpinv_cart_item_tax_label', $tax, $item );
+    return apply_filters('wpinv_cart_item_tax_label', $tax, $item);
 }
 
-function wpinv_get_cart_item_price( $item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false ) {
+function wpinv_get_cart_item_price($item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false) {
     $price = 0;
     
     // Set custom price
-    if ( isset( $cart_item['custom_price'] ) && $cart_item['custom_price'] !== '' ) {
+    if (isset($cart_item['custom_price']) && $cart_item['custom_price'] !== '') {
         $price = $cart_item['custom_price'];
     } else {
-        $variable_prices = wpinv_has_variable_prices( $item_id );
+        $variable_prices = wpinv_has_variable_prices($item_id);
 
-        if ( $variable_prices ) {
-            $prices = wpinv_get_variable_prices( $item_id );
+        if ($variable_prices) {
+            $prices = wpinv_get_variable_prices($item_id);
 
-            if ( $prices ) {
-                if( ! empty( $options ) ) {
-                    $price = isset( $prices[ $options['price_id'] ] ) ? $prices[ $options['price_id'] ]['amount'] : false;
+            if ($prices) {
+                if (!empty($options)) {
+                    $price = isset($prices[$options['price_id']]) ? $prices[$options['price_id']]['amount'] : false;
                 } else {
                     $price = false;
                 }
             }
         }
 
-        if( ! $variable_prices || false === $price ) {
+        if (!$variable_prices || false === $price) {
             // Get the standard Item price if not using variable prices
-            $price = wpinv_get_item_price( $item_id );
+            $price = wpinv_get_item_price($item_id);
         }
     }
 
-    if ( $remove_tax_from_inclusive && wpinv_prices_include_tax() ) {
-        $price -= wpinv_get_cart_item_tax( $item_id, $price, $options );
+    if ($remove_tax_from_inclusive && wpinv_prices_include_tax()) {
+        $price -= wpinv_get_cart_item_tax($item_id, $price, $options);
     }
 
-    return apply_filters( 'wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive );
+    return apply_filters('wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive);
 }
 
-function wpinv_get_cart_item_price_id( $item = array() ) {
-    if( isset( $item['item_number'] ) ) {
-        $price_id = isset( $item['item_number']['options']['price_id'] ) ? $item['item_number']['options']['price_id'] : null;
+function wpinv_get_cart_item_price_id($item = array()) {
+    if (isset($item['item_number'])) {
+        $price_id = isset($item['item_number']['options']['price_id']) ? $item['item_number']['options']['price_id'] : null;
     } else {
-        $price_id = isset( $item['options']['price_id'] ) ? $item['options']['price_id'] : null;
+        $price_id = isset($item['options']['price_id']) ? $item['options']['price_id'] : null;
     }
     return $price_id;
 }
 
-function wpinv_get_cart_item_price_name( $item = array() ) {
-    $price_id = (int)wpinv_get_cart_item_price_id( $item );
-    $prices   = wpinv_get_variable_prices( $item['id'] );
-    $name     = ! empty( $prices[ $price_id ] ) ? $prices[ $price_id ]['name'] : '';
-    return apply_filters( 'wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item );
+function wpinv_get_cart_item_price_name($item = array()) {
+    $price_id = (int)wpinv_get_cart_item_price_id($item);
+    $prices   = wpinv_get_variable_prices($item['id']);
+    $name     = !empty($prices[$price_id]) ? $prices[$price_id]['name'] : '';
+    return apply_filters('wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item);
 }
 
-function wpinv_get_cart_item_name( $item = array() ) {
-    $item_title = !empty( $item['name'] ) ? $item['name'] : get_the_title( $item['id'] );
+function wpinv_get_cart_item_name($item = array()) {
+    $item_title = !empty($item['name']) ? $item['name'] : get_the_title($item['id']);
 
-    if ( empty( $item_title ) ) {
+    if (empty($item_title)) {
         $item_title = $item['id'];
     }
 
@@ -488,23 +488,23 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_get_cart_item_name', $item_title, $item['id'], $item );
+    return apply_filters('wpinv_get_cart_item_name', $item_title, $item['id'], $item);
 }
 
-function wpinv_has_variable_prices( $item_id = 0 ) {
+function wpinv_has_variable_prices($item_id = 0) {
     return false;
 }
 
-function wpinv_get_item_position_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_get_item_position_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
-    if ( !is_array( $cart_items ) ) {
+    if (!is_array($cart_items)) {
         return false; // Empty cart
     } else {
-        foreach ( $cart_items as $position => $item ) {
-            if ( $item['id'] == $item_id ) {
-                if ( isset( $options['price_id'] ) && isset( $item['options']['price_id'] ) ) {
-                    if ( (int) $options['price_id'] == (int) $item['options']['price_id'] ) {
+        foreach ($cart_items as $position => $item) {
+            if ($item['id'] == $item_id) {
+                if (isset($options['price_id']) && isset($item['options']['price_id'])) {
+                    if ((int)$options['price_id'] == (int)$item['options']['price_id']) {
                         return $position;
                     }
                 } else {
@@ -517,80 +517,80 @@ 
     return false; // Not found
 }
 
-function wpinv_get_cart_item_quantity( $item ) {
-    if ( wpinv_item_quantities_enabled() ) {
-        $quantity = !empty( $item['quantity'] ) && (int)$item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
+function wpinv_get_cart_item_quantity($item) {
+    if (wpinv_item_quantities_enabled()) {
+        $quantity = !empty($item['quantity']) && (int)$item['quantity'] > 0 ? absint($item['quantity']) : 1;
     } else {
         $quantity = 1;
     }
     
-    if ( $quantity < 1 ) {
+    if ($quantity < 1) {
         $quantity = 1;
     }
     
-    return apply_filters( 'wpinv_get_cart_item_quantity', $quantity, $item );
+    return apply_filters('wpinv_get_cart_item_quantity', $quantity, $item);
 }
 
-function wpinv_get_item_suffix( $item, $html = true ) {
-    if ( empty( $item ) ) {
+function wpinv_get_item_suffix($item, $html = true) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '';
+    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '';
     
-    if ( !$html && $suffix ) {
-        $suffix = strip_tags( $suffix );
+    if (!$html && $suffix) {
+        $suffix = strip_tags($suffix);
     }
     
-    return apply_filters( 'wpinv_get_item_suffix', $suffix, $item, $html );
+    return apply_filters('wpinv_get_item_suffix', $suffix, $item, $html);
 }
 
-function wpinv_remove_item( $item = 0, $force_delete = false ) {
-    if ( empty( $item ) ) {
+function wpinv_remove_item($item = 0, $force_delete = false) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    do_action( 'wpinv_pre_delete_item', $item );
+    do_action('wpinv_pre_delete_item', $item);
 
-    wp_delete_post( $item->ID, $force_delete );
+    wp_delete_post($item->ID, $force_delete);
 
-    do_action( 'wpinv_post_delete_item', $item );
+    do_action('wpinv_post_delete_item', $item);
 }
 
-function wpinv_can_delete_item( $post_id ) {
-    $return = current_user_can( 'manage_options' ) ? true : false;
+function wpinv_can_delete_item($post_id) {
+    $return = current_user_can('manage_options') ? true : false;
     
-    if ( $return && wpinv_item_in_use( $post_id ) ) {
+    if ($return && wpinv_item_in_use($post_id)) {
         $return = false; // Don't delete item already use in invoices.
     }
     
-    return apply_filters( 'wpinv_can_delete_item', $return, $post_id );
+    return apply_filters('wpinv_can_delete_item', $return, $post_id);
 }
 
 function wpinv_admin_action_delete() {
     $screen = get_current_screen();
     
-    if ( !empty( $screen->post_type ) && $screen->post_type == 'wpi_item' && !empty( $_REQUEST['post'] ) && is_array( $_REQUEST['post'] ) ) {
+    if (!empty($screen->post_type) && $screen->post_type == 'wpi_item' && !empty($_REQUEST['post']) && is_array($_REQUEST['post'])) {
         $post_ids = array();
         
-        foreach ( $_REQUEST['post'] as $post_id ) {
-            if ( !wpinv_can_delete_item( $post_id ) ) {
+        foreach ($_REQUEST['post'] as $post_id) {
+            if (!wpinv_can_delete_item($post_id)) {
                 continue;
             }
             
@@ -600,80 +600,80 @@ 
         $_REQUEST['post'] = $post_ids;
     }
 }
-add_action( 'admin_action_trash', 'wpinv_admin_action_delete', -10 );
-add_action( 'admin_action_delete', 'wpinv_admin_action_delete', -10 );
+add_action('admin_action_trash', 'wpinv_admin_action_delete', -10);
+add_action('admin_action_delete', 'wpinv_admin_action_delete', -10);
 
-function wpinv_check_delete_item( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_item' ) {
-        if ( $force_delete && !wpinv_can_delete_item( $post->ID ) ) {
+function wpinv_check_delete_item($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_item') {
+        if ($force_delete && !wpinv_can_delete_item($post->ID)) {
             return true;
         }
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_item', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_item', 10, 3);
 
-function wpinv_item_in_use( $item_id ) {
+function wpinv_item_in_use($item_id) {
     global $wpdb, $wpi_items_in_use;
     
-    if ( !$item_id > 0 ) {
+    if (!$item_id > 0) {
         return false;
     }
     
-    if ( !empty( $wpi_items_in_use ) ) {
-        if ( isset( $wpi_items_in_use[$item_id] ) ) {
+    if (!empty($wpi_items_in_use)) {
+        if (isset($wpi_items_in_use[$item_id])) {
             return $wpi_items_in_use[$item_id];
         }
     } else {
         $wpi_items_in_use = array();
     }
     
-    $statuses   = array_keys( wpinv_get_invoice_statuses( true ) );
+    $statuses = array_keys(wpinv_get_invoice_statuses(true));
     
-    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode( "','", $statuses ) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
-    $in_use = $wpdb->get_var( $query ) > 0 ? true : false;
+    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode("','", $statuses) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
+    $in_use = $wpdb->get_var($query) > 0 ? true : false;
     
     $wpi_items_in_use[$item_id] = $in_use;
     
     return $in_use;
 }
 
-function wpinv_create_item( $args = array(), $wp_error = false, $force_update = false ) {
+function wpinv_create_item($args = array(), $wp_error = false, $force_update = false) {
     // Set some defaults
     $defaults = array(
-        'type'                 => 'custom',                                                // Optional. Item type. Default 'custom'.
-        'title'                => '',                                                      // Required. Item title.
-        'custom_id'            => 0,                                                       // Optional. Any integer or non numeric id. Must be unique within item type.
-        'price'                => '0.00',                                                  // Optional. Item price. Default '0.00'.
-        'status'               => 'pending',                                               // Optional. pending, publish
-        'custom_name'          => '',                                                      // Optional. Plural sub title for item.
-        'custom_singular_name' => '',                                                      // Optional. Singular sub title for item.
-        'vat_rule'             => 'digital',                                               // Optional. digital => Digital item, physical => Physical item
-        'excerpt'              => '',                                                      // Optional. Item short description
+        'type'                 => 'custom', // Optional. Item type. Default 'custom'.
+        'title'                => '', // Required. Item title.
+        'custom_id'            => 0, // Optional. Any integer or non numeric id. Must be unique within item type.
+        'price'                => '0.00', // Optional. Item price. Default '0.00'.
+        'status'               => 'pending', // Optional. pending, publish
+        'custom_name'          => '', // Optional. Plural sub title for item.
+        'custom_singular_name' => '', // Optional. Singular sub title for item.
+        'vat_rule'             => 'digital', // Optional. digital => Digital item, physical => Physical item
+        'excerpt'              => '', // Optional. Item short description
         /* Recurring item fields */
-        'is_recurring'         => 0,                                                       // Optional. 1 => Allow recurring or 0 => Don't allow recurring
-        'recurring_period'     => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'recurring_interval'   => 0,                                                       // Optional. Integer value between 1 - 90.
-        'recurring_limit'      => 0,                                                       // Optional. Any integer number. 0 for recurring forever until cancelled.
-        'free_trial'           => 0,                                                       // Optional. 1 => Allow free trial or 0 => Don't free trial
-        'trial_period'         => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'trial_interval'       => 0,                                                       // Optional. Any integer number.
+        'is_recurring'         => 0, // Optional. 1 => Allow recurring or 0 => Don't allow recurring
+        'recurring_period'     => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'recurring_interval'   => 0, // Optional. Integer value between 1 - 90.
+        'recurring_limit'      => 0, // Optional. Any integer number. 0 for recurring forever until cancelled.
+        'free_trial'           => 0, // Optional. 1 => Allow free trial or 0 => Don't free trial
+        'trial_period'         => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'trial_interval'       => 0, // Optional. Any integer number.
     );
     
-    $data = wp_parse_args( $args, $defaults );
+    $data = wp_parse_args($args, $defaults);
     
-    if ( empty( $data['type'] ) ) {
+    if (empty($data['type'])) {
         $data['type'] = 'custom';
     }
     
-    if ( !empty( $data['custom_id'] ) ) {
-        $item = wpinv_get_item_by( 'custom_id', $data['custom_id'], $data['type'] );
+    if (!empty($data['custom_id'])) {
+        $item = wpinv_get_item_by('custom_id', $data['custom_id'], $data['type']);
     } else {
         $item = NULL;
     }
     
-    if ( !$force_update && !empty( $item ) ) {
+    if (!$force_update && !empty($item)) {
         return $item;
     }
         
@@ -682,18 +682,18 @@ 
     $meta['custom_id']              = $data['custom_id'];
     $meta['custom_singular_name']   = $data['custom_singular_name'];
     $meta['custom_name']            = $data['custom_name'];
-    $meta['price']                  = wpinv_round_amount( $data['price'] );
+    $meta['price']                  = wpinv_round_amount($data['price']);
     $meta['vat_rule']               = $data['vat_rule'];
     $meta['vat_class']              = '_standard';
     
-    if ( !empty( $data['is_recurring'] ) ) {
+    if (!empty($data['is_recurring'])) {
         $meta['is_recurring']       = $data['is_recurring'];
         $meta['recurring_period']   = $data['recurring_period'];
-        $meta['recurring_interval'] = absint( $data['recurring_interval'] );
-        $meta['recurring_limit']    = absint( $data['recurring_limit'] );
+        $meta['recurring_interval'] = absint($data['recurring_interval']);
+        $meta['recurring_limit']    = absint($data['recurring_limit']);
         $meta['free_trial']         = $data['free_trial'];
         $meta['trial_period']       = $data['trial_period'];
-        $meta['trial_interval']     = absint( $data['trial_interval'] );
+        $meta['trial_interval']     = absint($data['trial_interval']);
     } else {
         $meta['is_recurring']       = 0;
         $meta['recurring_period']   = '';
@@ -704,18 +704,18 @@ 
         $meta['trial_interval']     = '';
     }
     
-    $post_data  = array( 
+    $post_data = array( 
         'post_title'    => $data['title'],
         'post_excerpt'  => $data['excerpt'],
         'post_status'   => $data['status'],
         'meta'          => $meta
     );
 
-    if ( !empty( $item ) ) {
-        $item->update( $post_data, $wp_error );
+    if (!empty($item)) {
+        $item->update($post_data, $wp_error);
     } else {
         $item = new WPInv_Item();
-        $item->create( $post_data, $wp_error );
+        $item->create($post_data, $wp_error);
     }
     
     return $item;

includes/wpinv-helper-functions.php

Spacing +235 added lines, -235 removed lines

@@ -7,89 +7,89 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_item_quantities_enabled() {
-    $ret = wpinv_get_option( 'item_quantities', true );
+    $ret = wpinv_get_option('item_quantities', true);
     
-    return (bool) apply_filters( 'wpinv_item_quantities_enabled', $ret );
+    return (bool)apply_filters('wpinv_item_quantities_enabled', $ret);
 }
 
 function wpinv_get_ip() {
     $ip = '127.0.0.1';
 
-    if ( !empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_CLIENT_IP'] );
-    } elseif ( !empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_X_FORWARDED_FOR'] );
-    } elseif( !empty( $_SERVER['REMOTE_ADDR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_CLIENT_IP']);
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_X_FORWARDED_FOR']);
+    } elseif (!empty($_SERVER['REMOTE_ADDR'])) {
+        $ip = sanitize_text_field($_SERVER['REMOTE_ADDR']);
     }
     
-    return apply_filters( 'wpinv_get_ip', $ip );
+    return apply_filters('wpinv_get_ip', $ip);
 }
 
 function wpinv_get_user_agent() {
-    if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
-        $user_agent = sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] );
+    if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+        $user_agent = sanitize_text_field($_SERVER['HTTP_USER_AGENT']);
     } else {
         $user_agent = '';
     }
     
-    return apply_filters( 'wpinv_get_user_agent', $user_agent );
+    return apply_filters('wpinv_get_user_agent', $user_agent);
 }
 
-function wpinv_sanitize_amount( $amount, $decimals = NULL ) {
+function wpinv_sanitize_amount($amount, $decimals = NULL) {
     $is_negative   = false;
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
     // Sanitize the amount
-    if ( $decimal_sep == ',' && false !== ( $found = strpos( $amount, $decimal_sep ) ) ) {
-        if ( ( $thousands_sep == '.' || $thousands_sep == ' ' ) && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-            $amount = str_replace( $thousands_sep, '', $amount );
-        } elseif( empty( $thousands_sep ) && false !== ( $found = strpos( $amount, '.' ) ) ) {
-            $amount = str_replace( '.', '', $amount );
+    if ($decimal_sep == ',' && false !== ($found = strpos($amount, $decimal_sep))) {
+        if (($thousands_sep == '.' || $thousands_sep == ' ') && false !== ($found = strpos($amount, $thousands_sep))) {
+            $amount = str_replace($thousands_sep, '', $amount);
+        } elseif (empty($thousands_sep) && false !== ($found = strpos($amount, '.'))) {
+            $amount = str_replace('.', '', $amount);
         }
 
-        $amount = str_replace( $decimal_sep, '.', $amount );
-    } elseif( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( $thousands_sep, '', $amount );
+        $amount = str_replace($decimal_sep, '.', $amount);
+    } elseif ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace($thousands_sep, '', $amount);
     }
 
-    if( $amount < 0 ) {
+    if ($amount < 0) {
         $is_negative = true;
     }
 
-    $amount   = preg_replace( '/[^0-9\.]/', '', $amount );
+    $amount   = preg_replace('/[^0-9\.]/', '', $amount);
 
-    $decimals = apply_filters( 'wpinv_sanitize_amount_decimals', absint( $decimals ), $amount );
-    $amount   = number_format( (double) $amount, absint( $decimals ), '.', '' );
+    $decimals = apply_filters('wpinv_sanitize_amount_decimals', absint($decimals), $amount);
+    $amount   = number_format((double)$amount, absint($decimals), '.', '');
 
-    if( $is_negative ) {
+    if ($is_negative) {
         $amount *= -1;
     }
 
-    return apply_filters( 'wpinv_sanitize_amount', $amount, $decimals );
+    return apply_filters('wpinv_sanitize_amount', $amount, $decimals);
 }
-add_filter( 'wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_round_amount( $amount, $decimals = NULL ) {
-    if ( $decimals === NULL ) {
+function wpinv_round_amount($amount, $decimals = NULL) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
     
-    $amount = round( (double)$amount, wpinv_currency_decimal_filter( absint( $decimals ) ) );
+    $amount = round((double)$amount, wpinv_currency_decimal_filter(absint($decimals)));
 
-    return apply_filters( 'wpinv_round_amount', $amount, $decimals );
+    return apply_filters('wpinv_round_amount', $amount, $decimals);
 }
 
-function wpinv_get_invoice_statuses( $trashed = false ) {
+function wpinv_get_invoice_statuses($trashed = false) {
     global $post;
     $invoice_statuses = array();
     $invoice_statuses = array(
@@ -103,32 +103,32 @@ 
         'wpi-renewal' => __('Renewal Payment', 'invoicing')
     );
     
-    if ( $trashed ) {
-        $invoice_statuses['trash'] = __( 'Trash', 'invoicing' );
+    if ($trashed) {
+        $invoice_statuses['trash'] = __('Trash', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_statuses', $invoice_statuses );
+    return apply_filters('wpinv_statuses', $invoice_statuses);
 }
 
-function wpinv_status_nicename( $status ) {
+function wpinv_status_nicename($status) {
     $statuses = wpinv_get_invoice_statuses();
-    $status   = isset( $statuses[$status] ) ? $statuses[$status] : __( $status, 'invoicing' );
+    $status   = isset($statuses[$status]) ? $statuses[$status] : __($status, 'invoicing');
 
     return $status;
 }
 
 function wpinv_get_currency() {
-    $currency = wpinv_get_option( 'currency', 'USD' );
+    $currency = wpinv_get_option('currency', 'USD');
     
-    return apply_filters( 'wpinv_currency', $currency );
+    return apply_filters('wpinv_currency', $currency);
 }
 
-function wpinv_currency_symbol( $currency = '' ) {
-    if ( empty( $currency ) ) {
+function wpinv_currency_symbol($currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
     
-    $symbols = apply_filters( 'wpinv_currency_symbols', array(
+    $symbols = apply_filters('wpinv_currency_symbols', array(
         'AED' => 'د.إ',
         'ARS' => '&#36;',
         'AUD' => '&#36;',
@@ -180,78 +180,78 @@ 
         'USD' => '&#36;',
         'VND' => '&#8363;',
         'ZAR' => '&#82;',
-    ) );
+    ));
 
-    $currency_symbol = isset( $symbols[$currency] ) ? $symbols[$currency] : '&#36;';
+    $currency_symbol = isset($symbols[$currency]) ? $symbols[$currency] : '&#36;';
 
-    return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
+    return apply_filters('wpinv_currency_symbol', $currency_symbol, $currency);
 }
 
 function wpinv_currency_position() {
-    $position = wpinv_get_option( 'currency_position', 'left' );
+    $position = wpinv_get_option('currency_position', 'left');
     
-    return apply_filters( 'wpinv_currency_position', $position );
+    return apply_filters('wpinv_currency_position', $position);
 }
 
 function wpinv_thousands_separator() {
-    $thousand_sep = wpinv_get_option( 'thousands_separator', ',' );
+    $thousand_sep = wpinv_get_option('thousands_separator', ',');
     
-    return apply_filters( 'wpinv_thousands_separator', $thousand_sep );
+    return apply_filters('wpinv_thousands_separator', $thousand_sep);
 }
 
 function wpinv_decimal_separator() {
-    $decimal_sep = wpinv_get_option( 'decimal_separator', '.' );
+    $decimal_sep = wpinv_get_option('decimal_separator', '.');
     
-    return apply_filters( 'wpinv_decimal_separator', $decimal_sep );
+    return apply_filters('wpinv_decimal_separator', $decimal_sep);
 }
 
 function wpinv_decimals() {
-    $decimals = apply_filters( 'wpinv_decimals', wpinv_get_option( 'decimals', 2 ) );
+    $decimals = apply_filters('wpinv_decimals', wpinv_get_option('decimals', 2));
     
-    return absint( $decimals );
+    return absint($decimals);
 }
 
 function wpinv_get_currencies() {
     $currencies = array(
-        'USD'  => __( 'US Dollars (&#36;)', 'invoicing' ),
-        'EUR'  => __( 'Euros (&euro;)', 'invoicing' ),
-        'GBP'  => __( 'Pounds Sterling (&pound;)', 'invoicing' ),
-        'AUD'  => __( 'Australian Dollars (&#36;)', 'invoicing' ),
-        'BRL'  => __( 'Brazilian Real (R&#36;)', 'invoicing' ),
-        'CAD'  => __( 'Canadian Dollars (&#36;)', 'invoicing' ),
-        'CLP'  => __( 'Chilean Peso (&#36;)', 'invoicing' ),
-        'CNY'  => __( 'Chinese Yuan (&yen;)', 'invoicing' ),
-        'CZK'  => __( 'Czech Koruna (&#75;&#269;)', 'invoicing' ),
-        'DKK'  => __( 'Danish Krone (DKK)', 'invoicing' ),
-        'HKD'  => __( 'Hong Kong Dollar (&#36;)', 'invoicing' ),
-        'HUF'  => __( 'Hungarian Forint (&#70;&#116;)', 'invoicing' ),
-        'INR'  => __( 'Indian Rupee (&#8377;)', 'invoicing' ),
-        'ILS'  => __( 'Israeli Shekel (&#8362;)', 'invoicing' ),
-        'JPY'  => __( 'Japanese Yen (&yen;)', 'invoicing' ),
-        'MYR'  => __( 'Malaysian Ringgit (&#82;&#77;)', 'invoicing' ),
-        'MXN'  => __( 'Mexican Peso (&#36;)', 'invoicing' ),
-        'NZD'  => __( 'New Zealand Dollar (&#36;)', 'invoicing' ),
-        'NOK'  => __( 'Norwegian Krone (&#107;&#114;)', 'invoicing' ),
-        'PHP'  => __( 'Philippine Peso (&#8369;)', 'invoicing' ),
-        'PLN'  => __( 'Polish Zloty (&#122;&#322;)', 'invoicing' ),
-        'SGD'  => __( 'Singapore Dollar (&#36;)', 'invoicing' ),
-        'SEK'  => __( 'Swedish Krona (&#107;&#114;)', 'invoicing' ),
-        'CHF'  => __( 'Swiss Franc (&#67;&#72;&#70;)', 'invoicing' ),
-        'TWD'  => __( 'Taiwan New Dollar (&#78;&#84;&#36;)', 'invoicing' ),
-        'THB'  => __( 'Thai Baht (&#3647;)', 'invoicing' ),
-        'TRY'  => __( 'Turkish Lira (&#8378;)', 'invoicing' ),
-        'RIAL' => __( 'Iranian Rial (&#65020;)', 'invoicing' ),
-        'RUB'  => __( 'Russian Ruble (&#8381;)', 'invoicing' ),
-        'ZAR'  => __( 'South African Rand (&#82;)', 'invoicing' )
+        'USD'  => __('US Dollars (&#36;)', 'invoicing'),
+        'EUR'  => __('Euros (&euro;)', 'invoicing'),
+        'GBP'  => __('Pounds Sterling (&pound;)', 'invoicing'),
+        'AUD'  => __('Australian Dollars (&#36;)', 'invoicing'),
+        'BRL'  => __('Brazilian Real (R&#36;)', 'invoicing'),
+        'CAD'  => __('Canadian Dollars (&#36;)', 'invoicing'),
+        'CLP'  => __('Chilean Peso (&#36;)', 'invoicing'),
+        'CNY'  => __('Chinese Yuan (&yen;)', 'invoicing'),
+        'CZK'  => __('Czech Koruna (&#75;&#269;)', 'invoicing'),
+        'DKK'  => __('Danish Krone (DKK)', 'invoicing'),
+        'HKD'  => __('Hong Kong Dollar (&#36;)', 'invoicing'),
+        'HUF'  => __('Hungarian Forint (&#70;&#116;)', 'invoicing'),
+        'INR'  => __('Indian Rupee (&#8377;)', 'invoicing'),
+        'ILS'  => __('Israeli Shekel (&#8362;)', 'invoicing'),
+        'JPY'  => __('Japanese Yen (&yen;)', 'invoicing'),
+        'MYR'  => __('Malaysian Ringgit (&#82;&#77;)', 'invoicing'),
+        'MXN'  => __('Mexican Peso (&#36;)', 'invoicing'),
+        'NZD'  => __('New Zealand Dollar (&#36;)', 'invoicing'),
+        'NOK'  => __('Norwegian Krone (&#107;&#114;)', 'invoicing'),
+        'PHP'  => __('Philippine Peso (&#8369;)', 'invoicing'),
+        'PLN'  => __('Polish Zloty (&#122;&#322;)', 'invoicing'),
+        'SGD'  => __('Singapore Dollar (&#36;)', 'invoicing'),
+        'SEK'  => __('Swedish Krona (&#107;&#114;)', 'invoicing'),
+        'CHF'  => __('Swiss Franc (&#67;&#72;&#70;)', 'invoicing'),
+        'TWD'  => __('Taiwan New Dollar (&#78;&#84;&#36;)', 'invoicing'),
+        'THB'  => __('Thai Baht (&#3647;)', 'invoicing'),
+        'TRY'  => __('Turkish Lira (&#8378;)', 'invoicing'),
+        'RIAL' => __('Iranian Rial (&#65020;)', 'invoicing'),
+        'RUB'  => __('Russian Ruble (&#8381;)', 'invoicing'),
+        'ZAR'  => __('South African Rand (&#82;)', 'invoicing')
     );
     
-    asort( $currencies );
+    asort($currencies);
 
-    return apply_filters( 'wpinv_currencies', $currencies );
+    return apply_filters('wpinv_currencies', $currencies);
 }
 
-function wpinv_price( $amount = '', $currency = '' ) {
-    if( empty( $currency ) ) {
+function wpinv_price($amount = '', $currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
@@ -259,14 +259,14 @@ 
 
     $negative = $amount < 0;
 
-    if ( $negative ) {
-        $amount = substr( $amount, 1 );
+    if ($negative) {
+        $amount = substr($amount, 1);
     }
 
-    $symbol = wpinv_currency_symbol( $currency );
+    $symbol = wpinv_currency_symbol($currency);
 
-    if ( $position == 'left' || $position == 'left_space' ) {
-        switch ( $currency ) {
+    if ($position == 'left' || $position == 'left_space') {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -278,15 +278,15 @@ 
             case "NZD" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
             default :
                 //$price = $currency . ' ' . $amount;
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
         }
     } else {
-        switch ( $currency ) {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -297,83 +297,83 @@ 
             case "MXN" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
             default :
                 //$price = $amount . ' ' . $currency;
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
         }
     }
     
-    if ( $negative ) {
+    if ($negative) {
         $price = '-' . $price;
     }
     
-    $price = apply_filters( 'wpinv_' . strtolower( $currency ) . '_currency_filter_' . $position, $price, $currency, $amount );
+    $price = apply_filters('wpinv_' . strtolower($currency) . '_currency_filter_' . $position, $price, $currency, $amount);
 
     return $price;
 }
 
-function wpinv_format_amount( $amount, $decimals = NULL, $calculate = false ) {
+function wpinv_format_amount($amount, $decimals = NULL, $calculate = false) {
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
 
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
-    if ( $decimal_sep == ',' && false !== ( $sep_found = strpos( $amount, $decimal_sep ) ) ) {
-        $whole = substr( $amount, 0, $sep_found );
-        $part = substr( $amount, $sep_found + 1, ( strlen( $amount ) - 1 ) );
+    if ($decimal_sep == ',' && false !== ($sep_found = strpos($amount, $decimal_sep))) {
+        $whole = substr($amount, 0, $sep_found);
+        $part = substr($amount, $sep_found + 1, (strlen($amount) - 1));
         $amount = $whole . '.' . $part;
     }
 
-    if ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ',', '', $amount );
+    if ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(',', '', $amount);
     }
 
-    if ( $thousands_sep == ' ' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ' ', '', $amount );
+    if ($thousands_sep == ' ' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(' ', '', $amount);
     }
 
-    if ( empty( $amount ) ) {
+    if (empty($amount)) {
         $amount = 0;
     }
     
-    $decimals  = apply_filters( 'wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate );
-    $formatted = number_format( (float)$amount, $decimals, $decimal_sep, $thousands_sep );
+    $decimals  = apply_filters('wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate);
+    $formatted = number_format((float)$amount, $decimals, $decimal_sep, $thousands_sep);
     
-    if ( $calculate ) {
-        if ( $thousands_sep === "," ) {
-            $formatted = str_replace( ",", "", $formatted );
+    if ($calculate) {
+        if ($thousands_sep === ",") {
+            $formatted = str_replace(",", "", $formatted);
         }
         
-        if ( $decimal_sep === "," ) {
-            $formatted = str_replace( ",", ".", $formatted );
+        if ($decimal_sep === ",") {
+            $formatted = str_replace(",", ".", $formatted);
         }
     }
 
-    return apply_filters( 'wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate );
+    return apply_filters('wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate);
 }
-add_filter( 'wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_sanitize_key( $key ) {
+function wpinv_sanitize_key($key) {
     $raw_key = $key;
-    $key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
+    $key = preg_replace('/[^a-zA-Z0-9_\-\.\:\/]/', '', $key);
 
-    return apply_filters( 'wpinv_sanitize_key', $key, $raw_key );
+    return apply_filters('wpinv_sanitize_key', $key, $raw_key);
 }
 
-function wpinv_get_file_extension( $str ) {
-    $parts = explode( '.', $str );
-    return end( $parts );
+function wpinv_get_file_extension($str) {
+    $parts = explode('.', $str);
+    return end($parts);
 }
 
-function wpinv_string_is_image_url( $str ) {
-    $ext = wpinv_get_file_extension( $str );
+function wpinv_string_is_image_url($str) {
+    $ext = wpinv_get_file_extension($str);
 
-    switch ( strtolower( $ext ) ) {
+    switch (strtolower($ext)) {
         case 'jpeg';
         case 'jpg';
             $return = true;
@@ -389,32 +389,32 @@ 
             break;
     }
 
-    return (bool)apply_filters( 'wpinv_string_is_image', $return, $str );
+    return (bool)apply_filters('wpinv_string_is_image', $return, $str);
 }
 
-function wpinv_error_log( $log, $title = '', $file = '', $line = '', $exit = false ) {
-    $should_log = apply_filters( 'wpinv_log_errors', WP_DEBUG );
+function wpinv_error_log($log, $title = '', $file = '', $line = '', $exit = false) {
+    $should_log = apply_filters('wpinv_log_errors', WP_DEBUG);
     
-    if ( true === $should_log ) {
+    if (true === $should_log) {
         $label = '';
-        if ( $file && $file !== '' ) {
-            $label .= basename( $file ) . ( $line ? '(' . $line . ')' : '' );
+        if ($file && $file !== '') {
+            $label .= basename($file) . ($line ? '(' . $line . ')' : '');
         }
         
-        if ( $title && $title !== '' ) {
+        if ($title && $title !== '') {
             $label = $label !== '' ? $label . ' ' : '';
             $label .= $title . ' ';
         }
         
-        $label = $label !== '' ? trim( $label ) . ' : ' : '';
+        $label = $label !== '' ? trim($label) . ' : ' : '';
         
-        if ( is_array( $log ) || is_object( $log ) ) {
-            error_log( $label . print_r( $log, true ) );
+        if (is_array($log) || is_object($log)) {
+            error_log($label . print_r($log, true));
         } else {
-            error_log( $label . $log );
+            error_log($label . $log);
         }
         
-        if ( $exit ) {
+        if ($exit) {
             exit;
         }
     }
@@ -422,65 +422,65 @@ 
 
 function wpinv_is_ajax_disabled() {
     $retval = false;
-    return apply_filters( 'wpinv_is_ajax_disabled', $retval );
+    return apply_filters('wpinv_is_ajax_disabled', $retval);
 }
 
-function wpinv_get_current_page_url( $nocache = false ) {
+function wpinv_get_current_page_url($nocache = false) {
     global $wp;
 
-    if ( get_option( 'permalink_structure' ) ) {
-        $base = trailingslashit( home_url( $wp->request ) );
+    if (get_option('permalink_structure')) {
+        $base = trailingslashit(home_url($wp->request));
     } else {
-        $base = add_query_arg( $wp->query_string, '', trailingslashit( home_url( $wp->request ) ) );
-        $base = remove_query_arg( array( 'post_type', 'name' ), $base );
+        $base = add_query_arg($wp->query_string, '', trailingslashit(home_url($wp->request)));
+        $base = remove_query_arg(array('post_type', 'name'), $base);
     }
 
     $scheme = is_ssl() ? 'https' : 'http';
-    $uri    = set_url_scheme( $base, $scheme );
+    $uri    = set_url_scheme($base, $scheme);
 
-    if ( is_front_page() ) {
-        $uri = home_url( '/' );
-    } elseif ( wpinv_is_checkout( array(), false ) ) {
+    if (is_front_page()) {
+        $uri = home_url('/');
+    } elseif (wpinv_is_checkout(array(), false)) {
         $uri = wpinv_get_checkout_uri();
     }
 
-    $uri = apply_filters( 'wpinv_get_current_page_url', $uri );
+    $uri = apply_filters('wpinv_get_current_page_url', $uri);
 
-    if ( $nocache ) {
-        $uri = wpinv_add_cache_busting( $uri );
+    if ($nocache) {
+        $uri = wpinv_add_cache_busting($uri);
     }
 
     return $uri;
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
-function wpinv_rgb_from_hex( $color ) {
-    $color = str_replace( '#', '', $color );
+function wpinv_rgb_from_hex($color) {
+    $color = str_replace('#', '', $color);
     // Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-    $color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
+    $color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
 
     $rgb      = array();
-    $rgb['R'] = hexdec( $color{0}.$color{1} );
-    $rgb['G'] = hexdec( $color{2}.$color{3} );
-    $rgb['B'] = hexdec( $color{4}.$color{5} );
+    $rgb['R'] = hexdec($color{0} . $color{1} );
+    $rgb['G'] = hexdec($color{2} . $color{3} );
+    $rgb['B'] = hexdec($color{4} . $color{5} );
 
     return $rgb;
 }
 
-function wpinv_hex_darker( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_darker($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = $v / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v - $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -489,18 +489,18 @@ 
     return $color;
 }
 
-function wpinv_hex_lighter( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_lighter($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = 255 - $v;
         $amount      = $amount / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v + $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -509,22 +509,22 @@ 
     return $color;
 }
 
-function wpinv_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
-    $hex = str_replace( '#', '', $color );
+function wpinv_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
+    $hex = str_replace('#', '', $color);
 
-    $c_r = hexdec( substr( $hex, 0, 2 ) );
-    $c_g = hexdec( substr( $hex, 2, 2 ) );
-    $c_b = hexdec( substr( $hex, 4, 2 ) );
+    $c_r = hexdec(substr($hex, 0, 2));
+    $c_g = hexdec(substr($hex, 2, 2));
+    $c_b = hexdec(substr($hex, 4, 2));
 
-    $brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+    $brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
     return $brightness > 155 ? $dark : $light;
 }
 
-function wpinv_format_hex( $hex ) {
-    $hex = trim( str_replace( '#', '', $hex ) );
+function wpinv_format_hex($hex) {
+    $hex = trim(str_replace('#', '', $hex));
 
-    if ( strlen( $hex ) == 3 ) {
+    if (strlen($hex) == 3) {
         $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
     }
 
@@ -544,12 +544,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function wpinv_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
     
-    return wpinv_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return wpinv_utf8_substr($str, $start, $width, $encoding) . $trimmaker;
 }
 
 /**
@@ -561,28 +561,28 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function wpinv_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function wpinv_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
         
-    return strlen( $str );
+    return strlen($str);
 }
 
-function wpinv_utf8_strtolower( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtolower' ) ) {
-        return mb_strtolower( $str, $encoding );
+function wpinv_utf8_strtolower($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtolower')) {
+        return mb_strtolower($str, $encoding);
     }
     
-    return strtolower( $str );
+    return strtolower($str);
 }
 
-function wpinv_utf8_strtoupper( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtoupper' ) ) {
-        return mb_strtoupper( $str, $encoding );
+function wpinv_utf8_strtoupper($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtoupper($str, $encoding);
     }
     
-    return strtoupper( $str );
+    return strtoupper($str);
 }
 
 /**
@@ -596,12 +596,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function wpinv_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
         
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -615,12 +615,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function wpinv_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
         
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -635,16 +635,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+function wpinv_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, wpinv_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
         
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -656,48 +656,48 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function wpinv_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strwidth' ) ) {
-        return mb_strwidth( $str, $encoding );
+function wpinv_utf8_strwidth($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strwidth')) {
+        return mb_strwidth($str, $encoding);
     }
     
-    return wpinv_utf8_strlen( $str, $encoding );
+    return wpinv_utf8_strlen($str, $encoding);
 }
 
-function wpinv_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = wpinv_utf8_strtoupper( wpinv_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function wpinv_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = wpinv_utf8_strtoupper(wpinv_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = wpinv_utf8_strtolower( wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = wpinv_utf8_strtolower(wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding);
         }
 
         return $first_letter . $str_end;
     }
     
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
-function wpinv_utf8_ucwords( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_convert_case' ) ) {
-        return mb_convert_case( $str, MB_CASE_TITLE, $encoding );
+function wpinv_utf8_ucwords($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_convert_case')) {
+        return mb_convert_case($str, MB_CASE_TITLE, $encoding);
     }
     
-    return ucwords( $str );
+    return ucwords($str);
 }
 
-function wpinv_period_in_days( $period, $unit ) {
-    $period = absint( $period );
+function wpinv_period_in_days($period, $unit) {
+    $period = absint($period);
     
-    if ( $period > 0 ) {
-        if ( in_array( strtolower( $unit ), array( 'w', 'week', 'weeks' ) ) ) {
+    if ($period > 0) {
+        if (in_array(strtolower($unit), array('w', 'week', 'weeks'))) {
             $period = $period * 7;
-        } else if ( in_array( strtolower( $unit ), array( 'm', 'month', 'months' ) ) ) {
+        } else if (in_array(strtolower($unit), array('m', 'month', 'months'))) {
             $period = $period * 30;
-        } else if ( in_array( strtolower( $unit ), array( 'y', 'year', 'years' ) ) ) {
+        } else if (in_array(strtolower($unit), array('y', 'year', 'years'))) {
             $period = $period * 365;
         }
     }

includes/class-wpinv.php

Spacing +153 added lines, -153 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();
@@ -23,7 +23,7 @@ 
             self::$instance->reports    = new WPInv_Reports();
         }
         
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
         
         return self::$instance;
     }
@@ -33,31 +33,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( 'WPInv_Shortcodes', 'init' ) );
-        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('WPInv_Shortcodes', 'init'));
+        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('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
         
-        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'));
         }
         
         /**
@@ -67,9 +67,9 @@ 
          *
          * @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() {
@@ -83,193 +83,193 @@ 
      * @since 1.0
      */
     public function load_textdomain() {
-        $locale = apply_filters( 'plugin_locale', get_locale(), 'invoicing' );
+        $locale = apply_filters('plugin_locale', get_locale(), 'invoicing');
         
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        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-gd-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/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-gd-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
         //require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
         //require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
         //require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscription.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/class-wpinv-session.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-shortcodes.php' );
-        if ( !class_exists( 'Geodir_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.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/class-wpinv-session.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-shortcodes.php');
+        if (!class_exists('Geodir_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/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/subscriptions.php' );
         }
         
         // 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() {
-        if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
+        if (!(defined('DOING_AJAX') && DOING_AJAX)) {
         }
         
-        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_deregister_style( 'font-awesome' );
-        wp_register_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0' );
-        wp_enqueue_style( 'font-awesome' );
+        wp_deregister_style('font-awesome');
+        wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0');
+        wp_enqueue_style('font-awesome');
         
-        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' . $suffix . '.js', array( 'jquery', 'wpinv-vat-script' ),  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' . $suffix . '.js', array('jquery', 'wpinv-vat-script'), 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 = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('jquery-blockui');
+        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';
+        $suffix     = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_deregister_style( 'font-awesome' );
-        wp_register_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0' );
-        wp_enqueue_style( 'font-awesome' );
+        wp_deregister_style('font-awesome');
+        wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0');
+        wp_enqueue_style('font-awesome');
         
-        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('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( 'jquery-chosen', WPINV_PLUGIN_URL . 'assets/css/chosen' . $suffix . '.css', array(), '1.6.2' );
-        wp_enqueue_style( 'jquery-chosen' );
+        wp_register_style('jquery-chosen', WPINV_PLUGIN_URL . 'assets/css/chosen' . $suffix . '.css', array(), '1.6.2');
+        wp_enqueue_style('jquery-chosen');
 
-        wp_register_script( 'jquery-chosen', WPINV_PLUGIN_URL . 'assets/js/chosen.jquery' . $suffix . '.js', array( 'jquery' ), '1.6.2' );
-        wp_enqueue_script( 'jquery-chosen' );
+        wp_register_script('jquery-chosen', WPINV_PLUGIN_URL . 'assets/js/chosen.jquery' . $suffix . '.js', array('jquery'), '1.6.2');
+        wp_enqueue_script('jquery-chosen');
         
-        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');
         
-        if ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
+            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);
         
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array( 'jquery', 'jquery-blockui' ),  WPINV_VERSION );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array('jquery', 'jquery-blockui'), 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();
@@ -277,55 +277,55 @@ 
         $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( '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['hasGD']                      = wpinv_gd_active();;
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('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['hasGD']                      = wpinv_gd_active(); ;
         $localize['hasPM']                      = wpinv_pm_active();
-        $localize['emptyInvoice']               = __( 'Add atleast one item to save invoice!', 'invoicing' );
-        $localize['deletePackage']              = __( 'GD package items should be deleted from GD payment manager only, otherwise it will break invoices that created with this package!', 'invoicing' );
-        $localize['deletePackages']             = __( 'GD package items should be deleted from GD payment manager only', 'invoicing' );
-        $localize['deleteInvoiceFirst']         = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
+        $localize['emptyInvoice']               = __('Add atleast one item to save invoice!', 'invoicing');
+        $localize['deletePackage']              = __('GD package items should be deleted from GD payment manager only, otherwise it will break invoices that created with this package!', 'invoicing');
+        $localize['deletePackages']             = __('GD package items should be deleted from GD payment manager only', 'invoicing');
+        $localize['deleteInvoiceFirst']         = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
         
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
     }
     
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow;
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
         $add_class = false;
-        if ( $pagenow == 'admin.php' && $page ) {
-            $add_class = strpos( $page, 'wpinv-' );
+        if ($pagenow == 'admin.php' && $page) {
+            $add_class = strpos($page, 'wpinv-');
         }
         
         $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';
         } else {
             return $classes;
@@ -337,26 +337,26 @@ 
     public function admin_print_scripts_edit_php() {
         $post_type = wpinv_admin_post_type();
         
-        if ( $post_type == 'wpi_item' ) {
-            wp_enqueue_script( 'wpinv-inline-edit-post', WPINV_PLUGIN_URL . 'assets/js/quick-edit.js', array( 'jquery', 'inline-edit-post' ), '', true );
+        if ($post_type == 'wpi_item') {
+            wp_enqueue_script('wpinv-inline-edit-post', WPINV_PLUGIN_URL . 'assets/js/quick-edit.js', array('jquery', 'inline-edit-post'), '', true);
         }
     }
     
     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');
     }
 }
\ No newline at end of file

includes/class-wpinv-invoice.php

Spacing +798 added lines, -798 removed lines

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