AyeCode / invoicing

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

Spacing +150 added lines, -150 removed lines

@@ -1,44 +1,44 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Meta_Box_Items {
-    public static function output( $post ) {
+    public static function output($post) {
         global $wpinv_euvat, $ajax_cart_details;
         
-        $post_id            = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice            = new WPInv_Invoice( $post_id );
+        $post_id            = !empty($post->ID) ? $post->ID : 0;
+        $invoice            = new WPInv_Invoice($post_id);
         $ajax_cart_details  = $invoice->get_cart_details();
-        $subtotal           = $invoice->get_subtotal( true );
+        $subtotal           = $invoice->get_subtotal(true);
         $discount_raw       = $invoice->get_discount();
-        $discount           = wpinv_price( $discount_raw, $invoice->get_currency() );
+        $discount           = wpinv_price($discount_raw, $invoice->get_currency());
         $discounts          = $discount_raw > 0 ? $invoice->get_discounts() : '';
-        $tax                = $invoice->get_tax( true );
-        $total              = $invoice->get_total( true );
+        $tax                = $invoice->get_tax(true);
+        $total              = $invoice->get_total(true);
         $item_quantities    = wpinv_item_quantities_enabled();
         $use_taxes          = wpinv_use_taxes();
-        $item_types         = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
+        $item_types         = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
         $is_recurring       = $invoice->is_recurring();
         $post_type_object   = get_post_type_object($invoice->post_type);
         $type_title         = $post_type_object->labels->singular_name;
         
         $cols = 5;
-        if ( $item_quantities ) {
+        if ($item_quantities) {
             $cols++;
         }
-        if ( $use_taxes ) {
+        if ($use_taxes) {
             $cols++;
         }
         $class = '';
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             $class .= ' wpinv-paid';
         }
-        if ( $invoice->is_refunded() ) {
+        if ($invoice->is_refunded()) {
             $class .= ' wpinv-refunded';
         }
-        if ( $is_recurring ) {
+        if ($is_recurring) {
             $class .= ' wpi-recurring';
         }
         ?>
@@ -46,21 +46,21 @@ 
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
                 <thead>
                     <tr>
-                        <th class="id"><?php _e( 'ID', 'invoicing' );?></th>
-                        <th class="title"><?php _e( 'Item', 'invoicing' );?></th>
-                        <th class="price"><?php _e( 'Price', 'invoicing' );?></th>
-                        <?php if ( $item_quantities ) { ?>
-                        <th class="qty"><?php _e( 'Qty', 'invoicing' );?></th>
+                        <th class="id"><?php _e('ID', 'invoicing'); ?></th>
+                        <th class="title"><?php _e('Item', 'invoicing'); ?></th>
+                        <th class="price"><?php _e('Price', 'invoicing'); ?></th>
+                        <?php if ($item_quantities) { ?>
+                        <th class="qty"><?php _e('Qty', 'invoicing'); ?></th>
                         <?php } ?>
-                        <th class="total"><?php _e( 'Total', 'invoicing' );?></th>
-                        <?php if ( $use_taxes ) { ?>
-                        <th class="tax"><?php _e( 'Tax (%)', 'invoicing' );?></th>
+                        <th class="total"><?php _e('Total', 'invoicing'); ?></th>
+                        <?php if ($use_taxes) { ?>
+                        <th class="tax"><?php _e('Tax (%)', 'invoicing'); ?></th>
                         <?php } ?>
                         <th class="action"></th>
                     </tr>
                 </thead>
                 <tbody class="wpinv-line-items">
-                    <?php echo wpinv_admin_get_line_items( $invoice ); ?>
+                    <?php echo wpinv_admin_get_line_items($invoice); ?>
                 </tbody>
                 <tfoot class="wpinv-totals">
                     <tr>
@@ -72,44 +72,44 @@ 
                                         </td>
                                         <td class="title">
                                             <input type="text" class="regular-text" placeholder="Item name" value="" name="_wpinv_quick[name]">
-                                            <?php if ( $wpinv_euvat->allow_vat_rules() ) { ?>
+                                            <?php if ($wpinv_euvat->allow_vat_rules()) { ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-vat-rule">
-                                                    <span class="title"><?php _e( 'VAT rule type', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('VAT rule type', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $wpinv_euvat->get_rules(),
                                                             'name'             => '_wpinv_quick[vat_rule]',
                                                             'id'               => '_wpinv_quick_vat_rule',
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-rule',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
-                                            <?php } if ( $wpinv_euvat->allow_vat_classes() ) { ?>
+                                            <?php } if ($wpinv_euvat->allow_vat_classes()) { ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-vat-class">
-                                                    <span class="title"><?php _e( 'VAT class', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('VAT class', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $wpinv_euvat->get_all_classes(),
                                                             'name'             => '_wpinv_quick[vat_class]',
                                                             'id'               => '_wpinv_quick_vat_class',
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-class',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
                                             <?php } ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-type">
-                                                    <span class="title"><?php _e( 'Item type', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('Item type', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $item_types,
                                                             'name'             => '_wpinv_quick[type]',
                                                             'id'               => '_wpinv_quick_type',
@@ -117,7 +117,7 @@ 
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-type',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
@@ -130,11 +130,11 @@ 
                                             </div>
                                         </td>
                                         <td class="price"><input type="text" placeholder="0.00" class="wpi-field-price wpi-price" name="_wpinv_quick[price]" /></td>
-                                        <?php if ( $item_quantities ) { ?>
+                                        <?php if ($item_quantities) { ?>
                                         <td class="qty"><input type="number" class="small-text" step="1" min="1" value="1" name="_wpinv_quick[qty]" /></td>
                                         <?php } ?>
                                         <td class="total"></td>
-                                        <?php if ( $use_taxes ) { ?>
+                                        <?php if ($use_taxes) { ?>
                                         <td class="tax"></td>
                                         <?php } ?>
                                         <td class="action"></td>
@@ -147,29 +147,29 @@ 
                         <td colspan="<?php echo $cols; ?>"></td>
                     </tr>
                     <tr class="totals">
-                        <td colspan="<?php echo ( $cols - 4 ); ?>"></td>
+                        <td colspan="<?php echo ($cols - 4); ?>"></td>
                         <td colspan="4">
                             <table cellspacing="0" cellpadding="0">
                                 <tr class="subtotal">
-                                    <td class="name"><?php _e( 'Sub Total:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo $subtotal;?></td>
+                                    <td class="name"><?php _e('Sub Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo $subtotal; ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <tr class="discount">
-                                    <td class="name"><?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="name"><?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="action"></td>
                                 </tr>
-                                <?php if ( $use_taxes ) { ?>
+                                <?php if ($use_taxes) { ?>
                                 <tr class="tax">
-                                    <td class="name"><?php _e( 'Tax:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo $tax;?></td>
+                                    <td class="name"><?php _e('Tax:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo $tax; ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php } ?>
                                 <tr class="total">
-                                    <td class="name"><?php echo apply_filters( 'wpinv_invoice_items_total_label', __( 'Invoice Total:', 'invoicing' ), $invoice );?></td>
-                                    <td class="total"><?php echo $total;?></td>
+                                    <td class="name"><?php echo apply_filters('wpinv_invoice_items_total_label', __('Invoice Total:', 'invoicing'), $invoice); ?></td>
+                                    <td class="total"><?php echo $total; ?></td>
                                     <td class="action"></td>
                                 </tr>
                             </table>
@@ -179,86 +179,86 @@ 
             </table>
             <div class="wpinv-actions">
                 <?php
-                    if ( !$invoice->is_paid() && !$invoice->is_refunded() ) {
-                    if ( !$invoice->is_recurring() ) {
-                    echo wpinv_item_dropdown( array(
+                    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+                    if (!$invoice->is_recurring()) {
+                    echo wpinv_item_dropdown(array(
                         'name'             => 'wpinv_invoice_item',
                         'id'               => 'wpinv_invoice_item',
                         'show_recurring'   => true,
-                    ) );
+                    ));
                     ?>
-                <input type="button" value="<?php echo sprintf(esc_attr__( 'Add item to %s', 'invoicing'), $type_title); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e( 'Create new item', 'invoicing' );?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e( 'Recalculate Totals', 'invoicing' );?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
+                <input type="button" value="<?php echo sprintf(esc_attr__('Add item to %s', 'invoicing'), $type_title); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e('Create new item', 'invoicing'); ?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e('Recalculate Totals', 'invoicing'); ?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
                     <?php } ?>
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
             </div>
         </div>
         <?php
     }
     
-    public static function prices( $post ) {        
+    public static function prices($post) {        
         $symbol         = wpinv_currency_symbol();
         $position       = wpinv_currency_position();
-        $item           = new WPInv_Item( $post->ID );
+        $item           = new WPInv_Item($post->ID);
         
         $price          = $item->get_price();
         $is_recurring   = $item->is_recurring();
         $period         = $item->get_recurring_period();
-        $interval       = absint( $item->get_recurring_interval() );
-        $times          = absint( $item->get_recurring_limit() );
+        $interval       = absint($item->get_recurring_interval());
+        $times          = absint($item->get_recurring_limit());
         $free_trial     = $item->has_free_trial();
         $trial_interval = $item->get_trial_interval();
         $trial_period   = $item->get_trial_period();
         
         $intervals      = array();
-        for ( $i = 1; $i <= 90; $i++ ) {
+        for ($i = 1; $i <= 90; $i++) {
             $intervals[$i] = $i;
         }
         
-        $interval       = $interval > 0 ? $interval : 1;
+        $interval = $interval > 0 ? $interval : 1;
         
         $class = $is_recurring ? 'wpinv-recurring-y' : 'wpinv-recurring-n';
         ?>
-        <p class="wpinv-row-prices"><?php echo ( $position != 'right' ? $symbol . '&nbsp;' : '' );?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount( 0 ); ?>" value="<?php echo $price;?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled( $item->is_editable(), false ); ?> /><?php echo ( $position == 'right' ? '&nbsp;' . $symbol : '' );?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce( 'wpinv_item_meta_box_save' ) ;?>" />
-        <?php do_action( 'wpinv_prices_metabox_price', $item ); ?>
+        <p class="wpinv-row-prices"><?php echo ($position != 'right' ? $symbol . '&nbsp;' : ''); ?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount(0); ?>" value="<?php echo $price; ?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled($item->is_editable(), false); ?> /><?php echo ($position == 'right' ? '&nbsp;' . $symbol : ''); ?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce('wpinv_item_meta_box_save'); ?>" />
+        <?php do_action('wpinv_prices_metabox_price', $item); ?>
         </p>
         <p class="wpinv-row-is-recurring">
             <label for="wpinv_is_recurring">
-                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked( 1, $is_recurring ); ?> />
-                <?php echo apply_filters( 'wpinv_is_recurring_toggle_text', __( 'Is Recurring Item?', 'invoicing' ) ); ?>
+                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked(1, $is_recurring); ?> />
+                <?php echo apply_filters('wpinv_is_recurring_toggle_text', __('Is Recurring Item?', 'invoicing')); ?>
             </label>
         </p>
-        <p class="wpinv-row-recurring-fields <?php echo $class;?>">
-                <label class="wpinv-period" for="wpinv_recurring_period"><?php _e( 'Recurring', 'invoicing' );?> <select class="wpinv-select " id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e( 'day(s)', 'invoicing' ); ?>" <?php selected( 'D', $period );?>><?php _e( 'Daily', 'invoicing' ); ?></option><option value="W" data-text="<?php esc_attr_e( 'week(s)', 'invoicing' ); ?>" <?php selected( 'W', $period );?>><?php _e( 'Weekly', 'invoicing' ); ?></option><option value="M" data-text="<?php esc_attr_e( 'month(s)', 'invoicing' ); ?>" <?php selected( 'M', $period );?>><?php _e( 'Monthly', 'invoicing' ); ?></option><option value="Y" data-text="<?php esc_attr_e( 'year(s)', 'invoicing' ); ?>" <?php selected( 'Y', $period );?>><?php _e( 'Yearly', 'invoicing' ); ?></option></select></label>
-                <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e( 'at every', 'invoicing' );?> <?php echo wpinv_html_select( array(
+        <p class="wpinv-row-recurring-fields <?php echo $class; ?>">
+                <label class="wpinv-period" for="wpinv_recurring_period"><?php _e('Recurring', 'invoicing'); ?> <select class="wpinv-select " id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e('day(s)', 'invoicing'); ?>" <?php selected('D', $period); ?>><?php _e('Daily', 'invoicing'); ?></option><option value="W" data-text="<?php esc_attr_e('week(s)', 'invoicing'); ?>" <?php selected('W', $period); ?>><?php _e('Weekly', 'invoicing'); ?></option><option value="M" data-text="<?php esc_attr_e('month(s)', 'invoicing'); ?>" <?php selected('M', $period); ?>><?php _e('Monthly', 'invoicing'); ?></option><option value="Y" data-text="<?php esc_attr_e('year(s)', 'invoicing'); ?>" <?php selected('Y', $period); ?>><?php _e('Yearly', 'invoicing'); ?></option></select></label>
+                <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e('at every', 'invoicing'); ?> <?php echo wpinv_html_select(array(
                     'options'          => $intervals,
                     'name'             => 'wpinv_recurring_interval',
                     'id'               => 'wpinv_recurring_interval',
                     'selected'         => $interval,
                     'show_option_all'  => false,
                     'show_option_none' => false
-                ) ); ?> <span id="wpinv_interval_text"><?php _e( 'day(s)', 'invoicing' );?></span></label>
-                <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e( 'for', 'invoicing' );?> <input class="small-text" type="number" value="<?php echo $times;?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e( 'time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing' );?></label>
+                )); ?> <span id="wpinv_interval_text"><?php _e('day(s)', 'invoicing'); ?></span></label>
+                <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e('for', 'invoicing'); ?> <input class="small-text" type="number" value="<?php echo $times; ?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e('time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing'); ?></label>
                 <span class="clear wpi-trial-clr"></span>
                 <label class="wpinv-free-trial" for="wpinv_free_trial">
-                    <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked( true, (bool)$free_trial ); ?> /> 
-                    <?php echo __( 'Offer free trial for', 'invoicing' ); ?>
+                    <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked(true, (bool)$free_trial); ?> /> 
+                    <?php echo __('Offer free trial for', 'invoicing'); ?>
                 </label>
                 <label class="wpinv-trial-interval" for="wpinv_trial_interval">
-                    <input class="small-text" type="number" value="<?php echo $trial_interval;?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected( 'D', $trial_period );?>><?php _e( 'day(s)', 'invoicing' ); ?></option><option value="W" <?php selected( 'W', $trial_period );?>><?php _e( 'week(s)', 'invoicing' ); ?></option><option value="M" <?php selected( 'M', $trial_period );?>><?php _e( 'month(s)', 'invoicing' ); ?></option><option value="Y" <?php selected( 'Y', $trial_period );?>><?php _e( 'year(s)', 'invoicing' ); ?></option></select>
+                    <input class="small-text" type="number" value="<?php echo $trial_interval; ?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected('D', $trial_period); ?>><?php _e('day(s)', 'invoicing'); ?></option><option value="W" <?php selected('W', $trial_period); ?>><?php _e('week(s)', 'invoicing'); ?></option><option value="M" <?php selected('M', $trial_period); ?>><?php _e('month(s)', 'invoicing'); ?></option><option value="Y" <?php selected('Y', $trial_period); ?>><?php _e('year(s)', 'invoicing'); ?></option></select>
                 </label>
         </p>
-        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type( $post->ID ); ?>" />
-        <?php do_action( 'wpinv_item_price_field', $post->ID ); ?>
+        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type($post->ID); ?>" />
+        <?php do_action('wpinv_item_price_field', $post->ID); ?>
         <?php
     }
     
-    public static function vat_rules( $post ) {
+    public static function vat_rules($post) {
         global $wpinv_euvat;
         
-        $rule_type = $wpinv_euvat->get_item_rule( $post->ID );
+        $rule_type = $wpinv_euvat->get_item_rule($post->ID);
         ?>
-        <p><label for="wpinv_vat_rules"><strong><?php _e( 'Select how VAT rules will be applied:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
-        <?php echo wpinv_html_select( array(
+        <p><label for="wpinv_vat_rules"><strong><?php _e('Select how VAT rules will be applied:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
+        <?php echo wpinv_html_select(array(
                     'options'          => $wpinv_euvat->get_rules(),
                     'name'             => 'wpinv_vat_rules',
                     'id'               => 'wpinv_vat_rules',
@@ -266,19 +266,19 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-vat-rules',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing' ); ?></p>
-        <p class="wpi-m0"><?php _e( 'If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing' ); ?></p>
+        <p class="wpi-m0"><?php _e('When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing'); ?></p>
+        <p class="wpi-m0"><?php _e('If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing'); ?></p>
         <?php
     }
     
-    public static function vat_classes( $post ) {
+    public static function vat_classes($post) {
         global $wpinv_euvat;
         
-        $vat_class = $wpinv_euvat->get_item_class( $post->ID );
+        $vat_class = $wpinv_euvat->get_item_class($post->ID);
         ?>
-        <p><?php echo wpinv_html_select( array(
+        <p><?php echo wpinv_html_select(array(
                     'options'          => $wpinv_euvat->get_all_classes(),
                     'name'             => 'wpinv_vat_class',
                     'id'               => 'wpinv_vat_class',
@@ -286,18 +286,18 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-vat-class',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'Select the VAT rate class to use for this invoice item.', 'invoicing' ); ?></p>
+        <p class="wpi-m0"><?php _e('Select the VAT rate class to use for this invoice item.', 'invoicing'); ?></p>
         <?php
     }
     
-    public static function item_info( $post ) {
-        $item_type = wpinv_get_item_type( $post->ID );
-        do_action( 'wpinv_item_info_metabox_before', $post );
+    public static function item_info($post) {
+        $item_type = wpinv_get_item_type($post->ID);
+        do_action('wpinv_item_info_metabox_before', $post);
         ?>
-        <p><label for="wpinv_item_type"><strong><?php _e( 'Type:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
-        <?php echo wpinv_html_select( array(
+        <p><label for="wpinv_item_type"><strong><?php _e('Type:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
+        <?php echo wpinv_html_select(array(
                     'options'          => wpinv_get_item_types(),
                     'name'             => 'wpinv_item_type',
                     'id'               => 'wpinv_item_type',
@@ -305,114 +305,114 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-item-type',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'Select item type.', 'invoicing' );?><br><?php _e( '<b>Standard:</b> Standard item type', 'invoicing' );?><br><?php _e( '<b>Fee:</b> Like Registration Fee, Sign up Fee etc.', 'invoicing' );?></p>
+        <p class="wpi-m0"><?php _e('Select item type.', 'invoicing'); ?><br><?php _e('<b>Standard:</b> Standard item type', 'invoicing'); ?><br><?php _e('<b>Fee:</b> Like Registration Fee, Sign up Fee etc.', 'invoicing'); ?></p>
         <?php
-        do_action( 'wpinv_item_info_metabox_after', $post );
+        do_action('wpinv_item_info_metabox_after', $post);
     }
     
-    public static function meta_values( $post ) {
-        $meta_keys = apply_filters( 'wpinv_show_meta_values_for_keys', array(
+    public static function meta_values($post) {
+        $meta_keys = apply_filters('wpinv_show_meta_values_for_keys', array(
             'type',
             'custom_id'
-        ) );
+        ));
         
-        if ( empty( $meta_keys ) ) {
+        if (empty($meta_keys)) {
             return;
         }
         
-        do_action( 'wpinv_meta_values_metabox_before', $post );
+        do_action('wpinv_meta_values_metabox_before', $post);
         
-        foreach ( $meta_keys as $meta_key ) {
+        foreach ($meta_keys as $meta_key) {
             ?>
-            <p class="wpi-mtb05"><label><strong><?php echo $meta_key; ?></strong>: <?php echo get_post_meta( $post->ID, '_wpinv_' . $meta_key, true ); ?></label></p>
+            <p class="wpi-mtb05"><label><strong><?php echo $meta_key; ?></strong>: <?php echo get_post_meta($post->ID, '_wpinv_' . $meta_key, true); ?></label></p>
             <?php 
         }
         
-        do_action( 'wpinv_meta_values_metabox_after', $post );
+        do_action('wpinv_meta_values_metabox_after', $post);
     }
     
-    public static function save( $post_id, $data, $post ) {
-        $invoice        = new WPInv_Invoice( $post_id );
+    public static function save($post_id, $data, $post) {
+        $invoice        = new WPInv_Invoice($post_id);
         
         // Billing
-        $first_name     = sanitize_text_field( $data['wpinv_first_name'] );
-        $last_name      = sanitize_text_field( $data['wpinv_last_name'] );
-        $company        = sanitize_text_field( $data['wpinv_company'] );
-        $vat_number     = sanitize_text_field( $data['wpinv_vat_number'] );
-        $phone          = sanitize_text_field( $data['wpinv_phone'] );
-        $address        = sanitize_text_field( $data['wpinv_address'] );
-        $city           = sanitize_text_field( $data['wpinv_city'] );
-        $zip            = sanitize_text_field( $data['wpinv_zip'] );
-        $country        = sanitize_text_field( $data['wpinv_country'] );
-        $state          = sanitize_text_field( $data['wpinv_state'] );
+        $first_name     = sanitize_text_field($data['wpinv_first_name']);
+        $last_name      = sanitize_text_field($data['wpinv_last_name']);
+        $company        = sanitize_text_field($data['wpinv_company']);
+        $vat_number     = sanitize_text_field($data['wpinv_vat_number']);
+        $phone          = sanitize_text_field($data['wpinv_phone']);
+        $address        = sanitize_text_field($data['wpinv_address']);
+        $city           = sanitize_text_field($data['wpinv_city']);
+        $zip            = sanitize_text_field($data['wpinv_zip']);
+        $country        = sanitize_text_field($data['wpinv_country']);
+        $state          = sanitize_text_field($data['wpinv_state']);
         
         // Details
-        $status         = sanitize_text_field( $data['wpinv_status'] );
-        $old_status     = !empty( $data['original_post_status'] ) ? sanitize_text_field( $data['original_post_status'] ) : $status;
-        $number         = sanitize_text_field( $data['wpinv_number'] );
-        $due_date       = isset( $data['wpinv_due_date'] ) ? sanitize_text_field( $data['wpinv_due_date'] ) : '';
+        $status         = sanitize_text_field($data['wpinv_status']);
+        $old_status     = !empty($data['original_post_status']) ? sanitize_text_field($data['original_post_status']) : $status;
+        $number         = sanitize_text_field($data['wpinv_number']);
+        $due_date       = isset($data['wpinv_due_date']) ? sanitize_text_field($data['wpinv_due_date']) : '';
         //$discounts      = sanitize_text_field( $data['wpinv_discounts'] );
         //$discount       = sanitize_text_field( $data['wpinv_discount'] );
         
-        $ip             = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
+        $ip = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
         
-        $invoice->set( 'due_date', $due_date );
-        $invoice->set( 'first_name', $first_name );
-        $invoice->set( 'last_name', $last_name );
-        $invoice->set( 'company', $company );
-        $invoice->set( 'vat_number', $vat_number );
-        $invoice->set( 'phone', $phone );
-        $invoice->set( 'address', $address );
-        $invoice->set( 'city', $city );
-        $invoice->set( 'zip', $zip );
-        $invoice->set( 'country', $country );
-        $invoice->set( 'state', $state );
-        $invoice->set( 'status', $status );
+        $invoice->set('due_date', $due_date);
+        $invoice->set('first_name', $first_name);
+        $invoice->set('last_name', $last_name);
+        $invoice->set('company', $company);
+        $invoice->set('vat_number', $vat_number);
+        $invoice->set('phone', $phone);
+        $invoice->set('address', $address);
+        $invoice->set('city', $city);
+        $invoice->set('zip', $zip);
+        $invoice->set('country', $country);
+        $invoice->set('state', $state);
+        $invoice->set('status', $status);
         //$invoice->set( 'number', $number );
         //$invoice->set( 'discounts', $discounts );
         //$invoice->set( 'discount', $discount );
-        $invoice->set( 'ip', $ip );
+        $invoice->set('ip', $ip);
         $invoice->old_status = $_POST['original_post_status'];
         $invoice->currency = wpinv_get_currency();
-        if ( !empty( $data['wpinv_gateway'] ) ) {
-            $invoice->set( 'gateway', sanitize_text_field( $data['wpinv_gateway'] ) );
+        if (!empty($data['wpinv_gateway'])) {
+            $invoice->set('gateway', sanitize_text_field($data['wpinv_gateway']));
         }
         $saved = $invoice->save();
         
         // Check for payment notes
-        if ( !empty( $data['invoice_note'] ) ) {
-            $note               = wp_kses( $data['invoice_note'], array() );
-            $note_type          = sanitize_text_field( $data['invoice_note_type'] );
+        if (!empty($data['invoice_note'])) {
+            $note               = wp_kses($data['invoice_note'], array());
+            $note_type          = sanitize_text_field($data['invoice_note_type']);
             $is_customer_note   = $note_type == 'customer' ? 1 : 0;
         
-            wpinv_insert_payment_note( $invoice->ID, $note, $is_customer_note );
+            wpinv_insert_payment_note($invoice->ID, $note, $is_customer_note);
         }
         
         // Update user address if empty.
-        if ( $saved && !empty( $invoice ) ) {
-            if ( $user_id = $invoice->get_user_id() ) {
-                $user_address = wpinv_get_user_address( $user_id, false );
+        if ($saved && !empty($invoice)) {
+            if ($user_id = $invoice->get_user_id()) {
+                $user_address = wpinv_get_user_address($user_id, false);
                 
                 if (empty($user_address['first_name'])) {
-                    update_user_meta( $user_id, '_wpinv_first_name', $first_name );
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
+                    update_user_meta($user_id, '_wpinv_first_name', $first_name);
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
                 } else if (empty($user_address['last_name']) && $user_address['first_name'] == $first_name) {
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
                 }
                 
                 if (empty($user_address['address']) || empty($user_address['city']) || empty($user_address['state']) || empty($user_address['country'])) {
-                    update_user_meta( $user_id, '_wpinv_address', $address );
-                    update_user_meta( $user_id, '_wpinv_city', $city );
-                    update_user_meta( $user_id, '_wpinv_state', $state );
-                    update_user_meta( $user_id, '_wpinv_country', $country );
-                    update_user_meta( $user_id, '_wpinv_zip', $zip );
-                    update_user_meta( $user_id, '_wpinv_phone', $phone );
+                    update_user_meta($user_id, '_wpinv_address', $address);
+                    update_user_meta($user_id, '_wpinv_city', $city);
+                    update_user_meta($user_id, '_wpinv_state', $state);
+                    update_user_meta($user_id, '_wpinv_country', $country);
+                    update_user_meta($user_id, '_wpinv_zip', $zip);
+                    update_user_meta($user_id, '_wpinv_phone', $phone);
                 }
             }
             
-            do_action( 'wpinv_invoice_metabox_saved', $invoice );
+            do_action('wpinv_invoice_metabox_saved', $invoice);
         }
         
         return $saved;

includes/admin/admin-meta-boxes.php

Spacing +126 added lines, -126 removed lines

@@ -1,65 +1,65 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_add_meta_boxes( $post_type, $post ) {
+function wpinv_add_meta_boxes($post_type, $post) {
     global $wpi_mb_invoice;
-    if ( $post_type == 'wpi_invoice' && !empty( $post->ID ) ) {
-        $wpi_mb_invoice = wpinv_get_invoice( $post->ID );
+    if ($post_type == 'wpi_invoice' && !empty($post->ID)) {
+        $wpi_mb_invoice = wpinv_get_invoice($post->ID);
     }
     
-    if ( !empty( $wpi_mb_invoice ) && !$wpi_mb_invoice->has_status( array( 'draft', 'auto-draft' ) ) ) {
-        add_meta_box( 'wpinv-mb-resend-invoice', __( 'Resend Invoice', 'invoicing' ), 'WPInv_Meta_Box_Details::resend_invoice', 'wpi_invoice', 'side', 'high' );
+    if (!empty($wpi_mb_invoice) && !$wpi_mb_invoice->has_status(array('draft', 'auto-draft'))) {
+        add_meta_box('wpinv-mb-resend-invoice', __('Resend Invoice', 'invoicing'), 'WPInv_Meta_Box_Details::resend_invoice', 'wpi_invoice', 'side', 'high');
     }
     
-    if ( !empty( $wpi_mb_invoice ) && $wpi_mb_invoice->is_recurring() && $wpi_mb_invoice->is_parent() ) {
-        add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscriptions', 'invoicing' ), 'WPInv_Meta_Box_Details::subscriptions', 'wpi_invoice', 'side', 'high' );
+    if (!empty($wpi_mb_invoice) && $wpi_mb_invoice->is_recurring() && $wpi_mb_invoice->is_parent()) {
+        add_meta_box('wpinv-mb-subscriptions', __('Subscriptions', 'invoicing'), 'WPInv_Meta_Box_Details::subscriptions', 'wpi_invoice', 'side', 'high');
     }
     
-    if ( wpinv_is_subscription_payment( $wpi_mb_invoice ) ) {
-        add_meta_box( 'wpinv-mb-renewals', __( 'Renewal Payment', 'invoicing' ), 'WPInv_Meta_Box_Details::renewals', 'wpi_invoice', 'side', 'high' );
+    if (wpinv_is_subscription_payment($wpi_mb_invoice)) {
+        add_meta_box('wpinv-mb-renewals', __('Renewal Payment', 'invoicing'), 'WPInv_Meta_Box_Details::renewals', 'wpi_invoice', 'side', 'high');
     }
     
-    add_meta_box( 'wpinv-details', __( 'Invoice Details', 'invoicing' ), 'WPInv_Meta_Box_Details::output', 'wpi_invoice', 'side', 'default' );
-    add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'WPInv_Meta_Box_Details::payment_meta', 'wpi_invoice', 'side', 'default' );
+    add_meta_box('wpinv-details', __('Invoice Details', 'invoicing'), 'WPInv_Meta_Box_Details::output', 'wpi_invoice', 'side', 'default');
+    add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'WPInv_Meta_Box_Details::payment_meta', 'wpi_invoice', 'side', 'default');
    
-    add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'WPInv_Meta_Box_Billing_Details::output', 'wpi_invoice', 'normal', 'high' );
-    add_meta_box( 'wpinv-items', __( 'Invoice Items', 'invoicing' ), 'WPInv_Meta_Box_Items::output', 'wpi_invoice', 'normal', 'high' );
-    add_meta_box( 'wpinv-notes', __( 'Invoice Notes', 'invoicing' ), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'normal', 'high' );
+    add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'WPInv_Meta_Box_Billing_Details::output', 'wpi_invoice', 'normal', 'high');
+    add_meta_box('wpinv-items', __('Invoice Items', 'invoicing'), 'WPInv_Meta_Box_Items::output', 'wpi_invoice', 'normal', 'high');
+    add_meta_box('wpinv-notes', __('Invoice Notes', 'invoicing'), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'normal', 'high');
 }
-add_action( 'add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2 );
+add_action('add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2);
 
-function wpinv_save_meta_boxes( $post_id, $post, $update = false ) {
-    remove_action( 'save_post', __FUNCTION__ );
+function wpinv_save_meta_boxes($post_id, $post, $update = false) {
+    remove_action('save_post', __FUNCTION__);
     
     // $post_id and $post are required
-    if ( empty( $post_id ) || empty( $post ) ) {
+    if (empty($post_id) || empty($post)) {
         return;
     }
         
-    if ( !current_user_can( 'edit_post', $post_id ) || empty( $post->post_type ) ) {
+    if (!current_user_can('edit_post', $post_id) || empty($post->post_type)) {
         return;
     }
     
     // Dont' save meta boxes for revisions or autosaves
-    if ( defined( 'DOING_AUTOSAVE' ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+    if (defined('DOING_AUTOSAVE') || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
         return;
     }
         
-    if ( $post->post_type == 'wpi_invoice' or $post->post_type == 'wpi_quote' ) {
-        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+    if ($post->post_type == 'wpi_invoice' or $post->post_type == 'wpi_quote') {
+        if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
             return;
         }
     
-        if ( isset( $_POST['wpinv_save_invoice'] ) && wp_verify_nonce( $_POST['wpinv_save_invoice'], 'wpinv_save_invoice' ) ) {
-            WPInv_Meta_Box_Items::save( $post_id, $_POST, $post );
+        if (isset($_POST['wpinv_save_invoice']) && wp_verify_nonce($_POST['wpinv_save_invoice'], 'wpinv_save_invoice')) {
+            WPInv_Meta_Box_Items::save($post_id, $_POST, $post);
         }
-    } else if ( $post->post_type == 'wpi_item' ) {
+    } else if ($post->post_type == 'wpi_item') {
         // verify nonce
-        if ( isset( $_POST['wpinv_vat_meta_box_nonce'] ) && wp_verify_nonce( $_POST['wpinv_vat_meta_box_nonce'], 'wpinv_item_meta_box_save' ) ) {
-            $fields                                 = array();
+        if (isset($_POST['wpinv_vat_meta_box_nonce']) && wp_verify_nonce($_POST['wpinv_vat_meta_box_nonce'], 'wpinv_item_meta_box_save')) {
+            $fields = array();
             $fields['_wpinv_price']              = 'wpinv_item_price';
             $fields['_wpinv_vat_class']          = 'wpinv_vat_class';
             $fields['_wpinv_vat_rule']           = 'wpinv_vat_rules';
@@ -72,258 +72,258 @@ 
             $fields['_wpinv_trial_period']       = 'wpinv_trial_period';
             $fields['_wpinv_trial_interval']     = 'wpinv_trial_interval';
             
-            if ( !isset( $_POST['wpinv_is_recurring'] ) ) {
+            if (!isset($_POST['wpinv_is_recurring'])) {
                 $_POST['wpinv_is_recurring'] = 0;
             }
             
-            if ( !isset( $_POST['wpinv_free_trial'] ) || empty( $_POST['wpinv_is_recurring'] ) ) {
+            if (!isset($_POST['wpinv_free_trial']) || empty($_POST['wpinv_is_recurring'])) {
                 $_POST['wpinv_free_trial'] = 0;
             }
             
-            foreach ( $fields as $field => $name ) {
-                if ( isset( $_POST[ $name ] ) ) {
-                    $allowed = apply_filters( 'wpinv_item_allowed_save_meta_value', true, $field, $post_id );
+            foreach ($fields as $field => $name) {
+                if (isset($_POST[$name])) {
+                    $allowed = apply_filters('wpinv_item_allowed_save_meta_value', true, $field, $post_id);
 
-                    if ( !$allowed ) {
+                    if (!$allowed) {
                         continue;
                     }
 
-                    if ( $field == '_wpinv_price' ) {
-                        $value = wpinv_sanitize_amount( $_POST[ $name ] );
+                    if ($field == '_wpinv_price') {
+                        $value = wpinv_sanitize_amount($_POST[$name]);
                     } else {
-                        $value = is_string( $_POST[ $name ] ) ? sanitize_text_field( $_POST[ $name ] ) : $_POST[ $name ];
+                        $value = is_string($_POST[$name]) ? sanitize_text_field($_POST[$name]) : $_POST[$name];
                     }
                     
-                    $value = apply_filters( 'wpinv_item_metabox_save_' . $field, $value, $name );
-                    update_post_meta( $post_id, $field, $value );
+                    $value = apply_filters('wpinv_item_metabox_save_' . $field, $value, $name);
+                    update_post_meta($post_id, $field, $value);
                 }
             }
             
-            if ( !get_post_meta( $post_id, '_wpinv_custom_id', true ) ) {
-                update_post_meta( $post_id, '_wpinv_custom_id', $post_id );
+            if (!get_post_meta($post_id, '_wpinv_custom_id', true)) {
+                update_post_meta($post_id, '_wpinv_custom_id', $post_id);
             }
         }
     }
 }
-add_action( 'save_post', 'wpinv_save_meta_boxes', 10, 3 );
+add_action('save_post', 'wpinv_save_meta_boxes', 10, 3);
 
 function wpinv_register_item_meta_boxes() {    
     global $wpinv_euvat;
     
-    add_meta_box( 'wpinv_field_prices', __( 'Item Price', 'invoicing' ), 'WPInv_Meta_Box_Items::prices', 'wpi_item', 'normal', 'high' );
+    add_meta_box('wpinv_field_prices', __('Item Price', 'invoicing'), 'WPInv_Meta_Box_Items::prices', 'wpi_item', 'normal', 'high');
 
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        add_meta_box( 'wpinv_field_vat_rules', __( 'VAT rules type to use', 'invoicing' ), 'WPInv_Meta_Box_Items::vat_rules', 'wpi_item', 'normal', 'high' );
+    if ($wpinv_euvat->allow_vat_rules()) {
+        add_meta_box('wpinv_field_vat_rules', __('VAT rules type to use', 'invoicing'), 'WPInv_Meta_Box_Items::vat_rules', 'wpi_item', 'normal', 'high');
     }
     
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        add_meta_box( 'wpinv_field_vat_classes', __( 'VAT rates class to use', 'invoicing' ), 'WPInv_Meta_Box_Items::vat_classes', 'wpi_item', 'normal', 'high' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        add_meta_box('wpinv_field_vat_classes', __('VAT rates class to use', 'invoicing'), 'WPInv_Meta_Box_Items::vat_classes', 'wpi_item', 'normal', 'high');
     }
     
-    add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'WPInv_Meta_Box_Items::item_info', 'wpi_item', 'side', 'core' );
-    add_meta_box( 'wpinv_field_meta_values', __( 'Item Meta Values', 'invoicing' ), 'WPInv_Meta_Box_Items::meta_values', 'wpi_item', 'side', 'core' );
+    add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'WPInv_Meta_Box_Items::item_info', 'wpi_item', 'side', 'core');
+    add_meta_box('wpinv_field_meta_values', __('Item Meta Values', 'invoicing'), 'WPInv_Meta_Box_Items::meta_values', 'wpi_item', 'side', 'core');
 }
 
 function wpinv_register_discount_meta_boxes() {
-    add_meta_box( 'wpinv_discount_fields', __( 'Discount Details', 'invoicing' ), 'wpinv_discount_metabox_details', 'wpi_discount', 'normal', 'high' );
+    add_meta_box('wpinv_discount_fields', __('Discount Details', 'invoicing'), 'wpinv_discount_metabox_details', 'wpi_discount', 'normal', 'high');
 }
 
-function wpinv_discount_metabox_details( $post ) {
+function wpinv_discount_metabox_details($post) {
     $discount_id    = $post->ID;
-    $discount       = wpinv_get_discount( $discount_id );
+    $discount       = wpinv_get_discount($discount_id);
     
-    $type           = wpinv_get_discount_type( $discount_id );
-    $item_reqs      = wpinv_get_discount_item_reqs( $discount_id );
-    $excluded_items = wpinv_get_discount_excluded_items( $discount_id );
-    $min_total      = wpinv_get_discount_min_total( $discount_id );
-    $max_total      = wpinv_get_discount_max_total( $discount_id );
-    $max_uses       = wpinv_get_discount_max_uses( $discount_id );
-    $single_use     = wpinv_discount_is_single_use( $discount_id );
-    $recurring      = (bool)wpinv_discount_is_recurring( $discount_id );
+    $type           = wpinv_get_discount_type($discount_id);
+    $item_reqs      = wpinv_get_discount_item_reqs($discount_id);
+    $excluded_items = wpinv_get_discount_excluded_items($discount_id);
+    $min_total      = wpinv_get_discount_min_total($discount_id);
+    $max_total      = wpinv_get_discount_max_total($discount_id);
+    $max_uses       = wpinv_get_discount_max_uses($discount_id);
+    $single_use     = wpinv_discount_is_single_use($discount_id);
+    $recurring      = (bool)wpinv_discount_is_recurring($discount_id);
     
     $min_total      = $min_total > 0 ? $min_total : '';
     $max_total      = $max_total > 0 ? $max_total : '';
     $max_uses       = $max_uses > 0 ? $max_uses : '';
 ?>
-<?php do_action( 'wpinv_discount_form_top', $post ); ?>
-<?php wp_nonce_field( 'wpinv_discount_metabox_nonce', 'wpinv_discount_metabox_nonce' ); ;?>
+<?php do_action('wpinv_discount_form_top', $post); ?>
+<?php wp_nonce_field('wpinv_discount_metabox_nonce', 'wpinv_discount_metabox_nonce'); ;?>
 <table class="form-table wpi-form-table">
     <tbody>
-        <?php do_action( 'wpinv_discount_form_first', $post ); ?>
-        <?php do_action( 'wpinv_discount_form_before_code', $post ); ?>
+        <?php do_action('wpinv_discount_form_first', $post); ?>
+        <?php do_action('wpinv_discount_form_before_code', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_code"><?php _e( 'Discount Code', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_code"><?php _e('Discount Code', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" name="code" id="wpinv_discount_code" class="medium-text" value="<?php echo esc_attr( wpinv_get_discount_code( $discount_id ) ); ?>" required>
-                <p class="description"><?php _e( 'Enter a code for this discount, such as 10OFF', 'invoicing' ); ?></p>
+                <input type="text" name="code" id="wpinv_discount_code" class="medium-text" value="<?php echo esc_attr(wpinv_get_discount_code($discount_id)); ?>" required>
+                <p class="description"><?php _e('Enter a code for this discount, such as 10OFF', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_type', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_type', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_type"><?php _e( 'Discount Type', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_type"><?php _e('Discount Type', 'invoicing'); ?></label>
             </th>
             <td>
                 <select id="wpinv_discount_type" name="type" class="medium-text">
-                    <?php foreach ( wpinv_get_discount_types() as $value => $label ) { ?>
-                    <option value="<?php echo $value ;?>" <?php selected( $type, $value ); ?>><?php echo $label; ?></option>
+                    <?php foreach (wpinv_get_discount_types() as $value => $label) { ?>
+                    <option value="<?php echo $value; ?>" <?php selected($type, $value); ?>><?php echo $label; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'The kind of discount to apply for this discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('The kind of discount to apply for this discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_amount', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_amount', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_amount"><?php _e( 'Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_amount"><?php _e('Amount', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" name="amount" id="wpinv_discount_amount" class="wpi-field-price wpi-price" value="<?php echo esc_attr( wpinv_get_discount_amount( $discount_id ) ); ?>" required> <font class="wpi-discount-p">%</font><font class="wpi-discount-f" style="display:none;"><?php echo wpinv_currency_symbol() ;?></font>
-                <p style="display:none;" class="description"><?php _e( 'Enter the discount amount in USD', 'invoicing' ); ?></p>
-                <p class="description"><?php _e( 'Enter the discount value. Ex: 10', 'invoicing' ); ?></p>
+                <input type="text" name="amount" id="wpinv_discount_amount" class="wpi-field-price wpi-price" value="<?php echo esc_attr(wpinv_get_discount_amount($discount_id)); ?>" required> <font class="wpi-discount-p">%</font><font class="wpi-discount-f" style="display:none;"><?php echo wpinv_currency_symbol(); ?></font>
+                <p style="display:none;" class="description"><?php _e('Enter the discount amount in USD', 'invoicing'); ?></p>
+                <p class="description"><?php _e('Enter the discount value. Ex: 10', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_items', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_items', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_items"><?php _e( 'Items', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_items"><?php _e('Items', 'invoicing'); ?></label>
             </th>
             <td>
-                <p><?php echo wpinv_item_dropdown( array(
+                <p><?php echo wpinv_item_dropdown(array(
                         'name'              => 'items[]',
                         'id'                => 'items',
                         'selected'          => $item_reqs,
                         'multiple'          => true,
                         'chosen'            => true,
                         'class'             => 'medium-text',
-                        'placeholder'       => __( 'Select one or more Items', 'invoicing' ),
+                        'placeholder'       => __('Select one or more Items', 'invoicing'),
                         'show_recurring'    => true,
-                    ) ); ?>
+                    )); ?>
                 </p>
-                <p class="description"><?php _e( 'Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount can be used on any item.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount can be used on any item.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_excluded_items', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_excluded_items', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_excluded_items"><?php _e( 'Excluded Items', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_excluded_items"><?php _e('Excluded Items', 'invoicing'); ?></label>
             </th>
             <td>
-                <p><?php echo wpinv_item_dropdown( array(
+                <p><?php echo wpinv_item_dropdown(array(
                         'name'              => 'excluded_items[]',
                         'id'                => 'excluded_items',
                         'selected'          => $excluded_items,
                         'multiple'          => true,
                         'chosen'            => true,
                         'class'             => 'medium-text',
-                        'placeholder'       => __( 'Select one or more Items', 'invoicing' ),
+                        'placeholder'       => __('Select one or more Items', 'invoicing'),
                         'show_recurring'    => true,
-                    ) ); ?>
+                    )); ?>
                 </p>
-                <p class="description"><?php _e( 'Items which are NOT allowed to use this discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Items which are NOT allowed to use this discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_start', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_start', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_start"><?php _e( 'Start Date', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_start"><?php _e('Start Date', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" class="medium-text wpiDatepicker" id="wpinv_discount_start" data-dateFormat="yy-mm-dd" name="start" value="<?php echo esc_attr( wpinv_get_discount_start_date( $discount_id ) ); ?>">
-                <p class="description"><?php _e( 'Enter the start date for this discount code in the format of yyyy-mm-dd. For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing' ); ?></p>
+                <input type="text" class="medium-text wpiDatepicker" id="wpinv_discount_start" data-dateFormat="yy-mm-dd" name="start" value="<?php echo esc_attr(wpinv_get_discount_start_date($discount_id)); ?>">
+                <p class="description"><?php _e('Enter the start date for this discount code in the format of yyyy-mm-dd. For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_expiration', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_expiration', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_expiration"><?php _e( 'Expiration Date', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_expiration"><?php _e('Expiration Date', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" class="medium-text wpiDatepicker" id="wpinv_discount_expiration" data-dateFormat="yy-mm-dd" name="expiration" value="<?php echo esc_attr( wpinv_get_discount_expiration( $discount_id ) ); ?>">
-                <p class="description"><?php _e( 'Enter the expiration date for this discount code in the format of yyyy-mm-dd. Leave blank for no expiration.', 'invoicing' ); ?></p>
+                <input type="text" class="medium-text wpiDatepicker" id="wpinv_discount_expiration" data-dateFormat="yy-mm-dd" name="expiration" value="<?php echo esc_attr(wpinv_get_discount_expiration($discount_id)); ?>">
+                <p class="description"><?php _e('Enter the expiration date for this discount code in the format of yyyy-mm-dd. Leave blank for no expiration.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_min_total', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_min_total', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_min_total"><?php _e( 'Minimum Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_min_total"><?php _e('Minimum Amount', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="text" name="min_total" id="wpinv_discount_min_total" class="wpi-field-price wpi-price" value="<?php echo $min_total; ?>">
-                <p class="description"><?php _e( 'This allows you to set the minimum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('This allows you to set the minimum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_max_total', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_max_total', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_max_total"><?php _e( 'Maximum Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_max_total"><?php _e('Maximum Amount', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="text" name="max_total" id="wpinv_discount_max_total" class="wpi-field-price wpi-price" value="<?php echo $max_total; ?>">
-                <p class="description"><?php _e( 'This allows you to set the maximum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('This allows you to set the maximum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_recurring', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_recurring', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_recurring"><?php _e( 'For recurring apply to', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_recurring"><?php _e('For recurring apply to', 'invoicing'); ?></label>
             </th>
             <td>
                 <select id="wpinv_discount_recurring" name="recurring" class="medium-text">
-                    <option value="0" <?php selected( false, $recurring ); ?>><?php _e( 'All payments', 'invoicing' ); ?></option>
-                    <option value="1" <?php selected( true, $recurring ); ?>><?php _e( 'First payment only', 'invoicing' ); ?></option>
+                    <option value="0" <?php selected(false, $recurring); ?>><?php _e('All payments', 'invoicing'); ?></option>
+                    <option value="1" <?php selected(true, $recurring); ?>><?php _e('First payment only', 'invoicing'); ?></option>
                 </select>
-                <p class="description"><?php _e( '<b>All payments:</b> Apply this discount to all recurring payments of the recurring invoice. <br><b>First payment only:</b> Apply this discount to only first payment of the recurring invoice.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('<b>All payments:</b> Apply this discount to all recurring payments of the recurring invoice. <br><b>First payment only:</b> Apply this discount to only first payment of the recurring invoice.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_max_uses', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_max_uses', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_max_uses"><?php _e( 'Max Uses', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_max_uses"><?php _e('Max Uses', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="number" min="0" step="1" id="wpinv_discount_max_uses" name="max_uses" class="medium-text" value="<?php echo $max_uses; ?>">
-                <p class="description"><?php _e( 'The maximum number of times this discount can be used. Leave blank for unlimited.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('The maximum number of times this discount can be used. Leave blank for unlimited.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_single_use', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_single_use', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_single_use"><?php _e( 'Use Once Per User', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_single_use"><?php _e('Use Once Per User', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="checkbox" value="1" name="single_use" id="wpinv_discount_single_use" <?php checked( true, $single_use ); ?>>
-                <span class="description"><?php _e( 'Limit this discount to a single use per user?', 'invoicing' ); ?></span>
+                <input type="checkbox" value="1" name="single_use" id="wpinv_discount_single_use" <?php checked(true, $single_use); ?>>
+                <span class="description"><?php _e('Limit this discount to a single use per user?', 'invoicing'); ?></span>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_last', $post ); ?>
+        <?php do_action('wpinv_discount_form_last', $post); ?>
     </tbody>
 </table>
-<?php do_action( 'wpinv_discount_form_bottom', $post ); ?>
+<?php do_action('wpinv_discount_form_bottom', $post); ?>
     <?php
 }
 
-function wpinv_discount_metabox_save( $post_id, $post, $update = false ) {
-    $post_type = !empty( $post ) ? $post->post_type : '';
+function wpinv_discount_metabox_save($post_id, $post, $update = false) {
+    $post_type = !empty($post) ? $post->post_type : '';
     
-    if ( $post_type != 'wpi_discount' ) {
+    if ($post_type != 'wpi_discount') {
         return;
     }
     
-    if ( !isset( $_POST['wpinv_discount_metabox_nonce'] ) || ( isset( $_POST['wpinv_discount_metabox_nonce'] ) && !wp_verify_nonce( $_POST['wpinv_discount_metabox_nonce'], 'wpinv_discount_metabox_nonce' ) ) ) {
+    if (!isset($_POST['wpinv_discount_metabox_nonce']) || (isset($_POST['wpinv_discount_metabox_nonce']) && !wp_verify_nonce($_POST['wpinv_discount_metabox_nonce'], 'wpinv_discount_metabox_nonce'))) {
         return;
     }
     
-    if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+    if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || (defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
         return;
     }
     
-    if ( !current_user_can( 'manage_options', $post_id ) ) {
+    if (!current_user_can('manage_options', $post_id)) {
         return;
     }
     
-    return wpinv_store_discount( $post_id, $_POST, $post, $update );
+    return wpinv_store_discount($post_id, $_POST, $post, $update);
 }
-add_action( 'save_post', 'wpinv_discount_metabox_save', 10, 3 );
\ No newline at end of file
+add_action('save_post', 'wpinv_discount_metabox_save', 10, 3);
\ No newline at end of file

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

Spacing +28 added lines, -28 removed lines

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

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

Spacing +87 added lines, -87 removed lines

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

includes/wpinv-invoice-functions.php

Spacing +713 added lines, -713 removed lines

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

includes/class-wpinv-invoice.php

Spacing +804 added lines, -804 removed lines

@@ -7,12 +7,12 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 final class WPInv_Invoice {
-    public $ID  = 0;
+    public $ID = 0;
     public $title;
     public $post_type;
     
@@ -65,17 +65,17 @@ 
     public $full_name = '';
     public $parent_invoice = 0;
     
-    public function __construct( $invoice_id = false ) {
-        if( empty( $invoice_id ) ) {
+    public function __construct($invoice_id = false) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $this->setup_invoice( $invoice_id );
+        $this->setup_invoice($invoice_id);
     }
 
-    public function get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            $value = call_user_func( array( $this, 'get_' . $key ) );
+    public function get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            $value = call_user_func(array($this, 'get_' . $key));
         } else {
             $value = $this->$key;
         }
@@ -83,51 +83,51 @@ 
         return $value;
     }
 
-    public function set( $key, $value ) {
-        $ignore = array( 'items', 'cart_details', 'fees', '_ID' );
+    public function set($key, $value) {
+        $ignore = array('items', 'cart_details', 'fees', '_ID');
 
-        if ( $key === 'status' ) {
+        if ($key === 'status') {
             $this->old_status = $this->status;
         }
 
-        if ( ! in_array( $key, $ignore ) ) {
-            $this->pending[ $key ] = $value;
+        if (!in_array($key, $ignore)) {
+            $this->pending[$key] = $value;
         }
 
-        if( '_ID' !== $key ) {
+        if ('_ID' !== $key) {
             $this->$key = $value;
         }
     }
 
-    public function _isset( $name ) {
-        if ( property_exists( $this, $name) ) {
-            return false === empty( $this->$name );
+    public function _isset($name) {
+        if (property_exists($this, $name)) {
+            return false === empty($this->$name);
         } else {
             return null;
         }
     }
 
-    private function setup_invoice( $invoice_id ) {
+    private function setup_invoice($invoice_id) {
         $this->pending = array();
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $invoice = get_post( $invoice_id );
+        $invoice = get_post($invoice_id);
 
-        if( !$invoice || is_wp_error( $invoice ) ) {
+        if (!$invoice || is_wp_error($invoice)) {
             return false;
         }
 
-        if( !('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type) ) {
+        if (!('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type)) {
             return false;
         }
 
-        do_action( 'wpinv_pre_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_pre_setup_invoice', $this, $invoice_id);
         
         // Primary Identifier
-        $this->ID              = absint( $invoice_id );
+        $this->ID              = absint($invoice_id);
         $this->post_type       = $invoice->post_type;
         
         // We have a payment, get the generic payment_meta item to reduce calls to it
@@ -139,7 +139,7 @@ 
         $this->post_status     = $this->status;
         $this->mode            = $this->setup_mode();
         $this->parent_invoice  = $invoice->post_parent;
-        $this->post_name       = $this->setup_post_name( $invoice );
+        $this->post_name       = $this->setup_post_name($invoice);
         $this->status_nicename = $this->setup_status_nicename($invoice->post_status);
 
         // Items
@@ -161,8 +161,8 @@ 
         
         // User based
         $this->ip              = $this->setup_ip();
-        $this->user_id         = !empty( $invoice->post_author ) ? $invoice->post_author : get_current_user_id();///$this->setup_user_id();
-        $this->email           = get_the_author_meta( 'email', $this->user_id );
+        $this->user_id         = !empty($invoice->post_author) ? $invoice->post_author : get_current_user_id(); ///$this->setup_user_id();
+        $this->email           = get_the_author_meta('email', $this->user_id);
         
         $this->user_info       = $this->setup_user_info();
                 
@@ -171,7 +171,7 @@ 
         $this->company         = $this->user_info['company'];
         $this->vat_number      = $this->user_info['vat_number'];
         $this->vat_rate        = $this->user_info['vat_rate'];
-        $this->adddress_confirmed  = $this->user_info['adddress_confirmed'];
+        $this->adddress_confirmed = $this->user_info['adddress_confirmed'];
         $this->address         = $this->user_info['address'];
         $this->city            = $this->user_info['city'];
         $this->country         = $this->user_info['country'];
@@ -186,35 +186,35 @@ 
         // Other Identifiers
         $this->key             = $this->setup_invoice_key();
         $this->number          = $this->setup_invoice_number();
-        $this->title           = !empty( $invoice->post_title ) ? $invoice->post_title : $this->number;
+        $this->title           = !empty($invoice->post_title) ? $invoice->post_title : $this->number;
         
-        $this->full_name       = trim( $this->first_name . ' '. $this->last_name );
+        $this->full_name       = trim($this->first_name . ' ' . $this->last_name);
         
         // Allow extensions to add items to this object via hook
-        do_action( 'wpinv_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_setup_invoice', $this, $invoice_id);
 
         return true;
     }
     
     private function setup_status_nicename($status) {
-        $all_invoice_statuses  = wpinv_get_invoice_statuses();
-        $status   = isset( $all_invoice_statuses[$status] ) ? $all_invoice_statuses[$status] : __( $status, 'invoicing' );
+        $all_invoice_statuses = wpinv_get_invoice_statuses();
+        $status = isset($all_invoice_statuses[$status]) ? $all_invoice_statuses[$status] : __($status, 'invoicing');
 
-        return apply_filters( 'setup_status_nicename', $status );
+        return apply_filters('setup_status_nicename', $status);
     }
     
-    private function setup_post_name( $post = NULL ) {
+    private function setup_post_name($post = NULL) {
         global $wpdb;
         
         $post_name = '';
         
-        if ( !empty( $post ) ) {
-            if( !empty( $post->post_name ) ) {
+        if (!empty($post)) {
+            if (!empty($post->post_name)) {
                 $post_name = $post->post_name;
-            } else if ( !empty( $post->ID ) ) {
-                $post_name = wpinv_generate_post_name( $post->ID );
+            } else if (!empty($post->ID)) {
+                $post_name = wpinv_generate_post_name($post->ID);
 
-                $wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
+                $wpdb->update($wpdb->posts, array('post_name' => $post_name), array('ID' => $post->ID));
             }
         }
 
@@ -222,12 +222,12 @@ 
     }
     
     private function setup_due_date() {
-        $due_date = $this->get_meta( '_wpinv_due_date' );
+        $due_date = $this->get_meta('_wpinv_due_date');
         
-        if ( empty( $due_date ) ) {
-            $overdue_time = strtotime( $this->date ) + ( DAY_IN_SECONDS * absint( wpinv_get_option( 'overdue_days' ) ) );
-            $due_date = date_i18n( 'Y-m-d', $overdue_time );
-        } else if ( $due_date == 'none' ) {
+        if (empty($due_date)) {
+            $overdue_time = strtotime($this->date) + (DAY_IN_SECONDS * absint(wpinv_get_option('overdue_days')));
+            $due_date = date_i18n('Y-m-d', $overdue_time);
+        } else if ($due_date == 'none') {
             $due_date = '';
         }
         
@@ -235,66 +235,66 @@ 
     }
     
     private function setup_completed_date() {
-        $invoice = get_post( $this->ID );
+        $invoice = get_post($this->ID);
 
-        if ( 'wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status ) {
+        if ('wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status) {
             return false; // This invoice was never paid
         }
 
-        $date = ( $date = $this->get_meta( '_wpinv_completed_date', true ) ) ? $date : $invoice->modified_date;
+        $date = ($date = $this->get_meta('_wpinv_completed_date', true)) ? $date : $invoice->modified_date;
 
         return $date;
     }
     
     private function setup_cart_details() {
-        $cart_details = isset( $this->payment_meta['cart_details'] ) ? maybe_unserialize( $this->payment_meta['cart_details'] ) : array();
+        $cart_details = isset($this->payment_meta['cart_details']) ? maybe_unserialize($this->payment_meta['cart_details']) : array();
         return $cart_details;
     }
     
     public function array_convert() {
-        return get_object_vars( $this );
+        return get_object_vars($this);
     }
     
     private function setup_items() {
-        $items = isset( $this->payment_meta['items'] ) ? maybe_unserialize( $this->payment_meta['items'] ) : array();
+        $items = isset($this->payment_meta['items']) ? maybe_unserialize($this->payment_meta['items']) : array();
         return $items;
     }
     
     private function setup_fees() {
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
         return $payment_fees;
     }
         
     private function setup_currency() {
-        $currency = isset( $this->payment_meta['currency'] ) ? $this->payment_meta['currency'] : apply_filters( 'wpinv_currency_default', wpinv_get_currency(), $this );
+        $currency = isset($this->payment_meta['currency']) ? $this->payment_meta['currency'] : apply_filters('wpinv_currency_default', wpinv_get_currency(), $this);
         return $currency;
     }
     
     private function setup_discount() {
         //$discount = $this->get_meta( '_wpinv_discount', true );
-        $discount = (float)$this->subtotal - ( (float)$this->total - (float)$this->tax - (float)$this->fees_total );
-        if ( $discount < 0 ) {
+        $discount = (float)$this->subtotal - ((float)$this->total - (float)$this->tax - (float)$this->fees_total);
+        if ($discount < 0) {
             $discount = 0;
         }
-        $discount = wpinv_round_amount( $discount );
+        $discount = wpinv_round_amount($discount);
         
         return $discount;
     }
     
     private function setup_discount_code() {
-        $discount_code = !empty( $this->discounts ) ? $this->discounts : $this->get_meta( '_wpinv_discount_code', true );
+        $discount_code = !empty($this->discounts) ? $this->discounts : $this->get_meta('_wpinv_discount_code', true);
         return $discount_code;
     }
     
     private function setup_tax() {
-        $tax = $this->get_meta( '_wpinv_tax', true );
+        $tax = $this->get_meta('_wpinv_tax', true);
 
         // We don't have tax as it's own meta and no meta was passed
-        if ( '' === $tax ) {            
-            $tax = isset( $this->payment_meta['tax'] ) ? $this->payment_meta['tax'] : 0;
+        if ('' === $tax) {            
+            $tax = isset($this->payment_meta['tax']) ? $this->payment_meta['tax'] : 0;
         }
         
-        if ( $tax < 0 ) {
+        if ($tax < 0) {
             $tax = 0;
         }
 
@@ -305,9 +305,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'];
                 }
             }
@@ -321,23 +321,23 @@ 
     }
     
     private function setup_discounts() {
-        $discounts = ! empty( $this->payment_meta['user_info']['discount'] ) ? $this->payment_meta['user_info']['discount'] : array();
+        $discounts = !empty($this->payment_meta['user_info']['discount']) ? $this->payment_meta['user_info']['discount'] : array();
         return $discounts;
     }
     
     private function setup_total() {
-        $amount = $this->get_meta( '_wpinv_total', true );
+        $amount = $this->get_meta('_wpinv_total', true);
 
-        if ( empty( $amount ) && '0.00' != $amount ) {
-            $meta   = $this->get_meta( '_wpinv_payment_meta', true );
-            $meta   = maybe_unserialize( $meta );
+        if (empty($amount) && '0.00' != $amount) {
+            $meta   = $this->get_meta('_wpinv_payment_meta', true);
+            $meta   = maybe_unserialize($meta);
 
-            if ( isset( $meta['amount'] ) ) {
+            if (isset($meta['amount'])) {
                 $amount = $meta['amount'];
             }
         }
 
-        if($amount < 0){
+        if ($amount < 0) {
             $amount = 0;
         }
 
@@ -345,13 +345,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';
         }
         
@@ -359,23 +359,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;
     }
 
@@ -385,62 +385,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;
     }
 
@@ -449,7 +449,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,
@@ -464,12 +464,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;
@@ -478,13 +478,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,
@@ -493,23 +493,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;
                     }
                 }
@@ -520,25 +520,25 @@ 
     }
 
     private function setup_invoice_key() {
-        $key = $this->get_meta( '_wpinv_key', true );
+        $key = $this->get_meta('_wpinv_key', true);
         
         return $key;
     }
 
     private function setup_invoice_number() {
-        $number = $this->get_meta( '_wpinv_number', true );
+        $number = $this->get_meta('_wpinv_number', true);
 
-        if ( !$number ) {
+        if (!$number) {
             $number = $this->ID;
 
-            if ( $this->status == 'auto-draft' ) {
-                if ( wpinv_sequential_number_active( $this->post_type ) ) {
-                    $next_number = wpinv_get_next_invoice_number( $this->post_type );
+            if ($this->status == 'auto-draft') {
+                if (wpinv_sequential_number_active($this->post_type)) {
+                    $next_number = wpinv_get_next_invoice_number($this->post_type);
                     $number      = $next_number;
                 }
             }
             
-            $number = wpinv_format_invoice_number( $number, $this->post_type );
+            $number = wpinv_format_invoice_number($number, $this->post_type);
         }
 
         return $number;
@@ -547,10 +547,10 @@ 
     private function insert_invoice() {
         global $wpdb;
 
-        if ( empty( $this->post_type ) ) {
-            if ( !empty( $this->ID ) && $post_type = get_post_type( $this->ID ) ) {
+        if (empty($this->post_type)) {
+            if (!empty($this->ID) && $post_type = get_post_type($this->ID)) {
                 $this->post_type = $post_type;
-            } else if ( !empty( $this->parent_invoice ) && $post_type = get_post_type( $this->parent_invoice ) ) {
+            } else if (!empty($this->parent_invoice) && $post_type = get_post_type($this->parent_invoice)) {
                 $this->post_type = $post_type;
             } else {
                 $this->post_type = 'wpi_invoice';
@@ -558,16 +558,16 @@ 
         }
 
         $invoice_number = $this->ID;
-        if ( $number = $this->get_meta( '_wpinv_number', true ) ) {
+        if ($number = $this->get_meta('_wpinv_number', true)) {
             $invoice_number = $number;
         }
 
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
 
-        if ( empty( $this->ip ) ) {
+        if (empty($this->ip)) {
             $this->ip = wpinv_get_ip();
             $this->pending['ip'] = $this->ip;
         }
@@ -604,61 +604,61 @@ 
                         'post_status'   => $this->status,
                         'post_author'   => $this->user_id,
                         'post_type'     => $this->post_type,
-                        'post_date'     => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time( 'mysql' ),
-                        'post_date_gmt' => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date( $this->date ) : current_time( 'mysql', 1 ),
+                        'post_date'     => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time('mysql'),
+                        'post_date_gmt' => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date($this->date) : current_time('mysql', 1),
                         'post_parent'   => $this->parent_invoice,
                     );
-        $args = apply_filters( 'wpinv_insert_invoice_args', $post_data, $this );
+        $args = apply_filters('wpinv_insert_invoice_args', $post_data, $this);
 
         // Create a blank invoice
-        if ( !empty( $this->ID ) ) {
-            $args['ID']         = $this->ID;
+        if (!empty($this->ID)) {
+            $args['ID'] = $this->ID;
 
-            $invoice_id = wp_update_post( $args, true );
+            $invoice_id = wp_update_post($args, true);
         } else {
-            $invoice_id = wp_insert_post( $args, true );
+            $invoice_id = wp_insert_post($args, true);
         }
 
-        if ( is_wp_error( $invoice_id ) ) {
+        if (is_wp_error($invoice_id)) {
             return false;
         }
 
-        if ( !empty( $invoice_id ) ) {
+        if (!empty($invoice_id)) {
             $this->ID  = $invoice_id;
             $this->_ID = $invoice_id;
 
-            $this->payment_meta = apply_filters( 'wpinv_payment_meta', $this->payment_meta, $payment_data );
-            if ( ! empty( $this->payment_meta['fees'] ) ) {
-                $this->fees = array_merge( $this->fees, $this->payment_meta['fees'] );
-                foreach( $this->fees as $fee ) {
-                    $this->increase_fees( $fee['amount'] );
+            $this->payment_meta = apply_filters('wpinv_payment_meta', $this->payment_meta, $payment_data);
+            if (!empty($this->payment_meta['fees'])) {
+                $this->fees = array_merge($this->fees, $this->payment_meta['fees']);
+                foreach ($this->fees as $fee) {
+                    $this->increase_fees($fee['amount']);
                 }
             }
 
-            $this->update_meta( '_wpinv_payment_meta', $this->payment_meta );            
+            $this->update_meta('_wpinv_payment_meta', $this->payment_meta);            
             $this->new = true;
         }
 
         return $this->ID;
     }
 
-    public function save( $setup = false ) {
+    public function save($setup = false) {
         global $wpi_session;
         
         $saved = false;
-        if ( empty( $this->items ) ) {
+        if (empty($this->items)) {
             return $saved; // Don't save empty invoice.
         }
         
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
         
-        if ( empty( $this->ID ) ) {
+        if (empty($this->ID)) {
             $invoice_id = $this->insert_invoice();
 
-            if ( false === $invoice_id ) {
+            if (false === $invoice_id) {
                 $saved = false;
             } else {
                 $this->ID = $invoice_id;
@@ -666,27 +666,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;
@@ -694,16 +694,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;
@@ -715,83 +715,83 @@ 
                         }
                         break;
                     case 'status':
-                        $this->update_status( $this->status );
+                        $this->update_status($this->status);
                         break;
                     case 'gateway':
-                        $this->update_meta( '_wpinv_gateway', $this->gateway );
+                        $this->update_meta('_wpinv_gateway', $this->gateway);
                         break;
                     case 'mode':
-                        $this->update_meta( '_wpinv_mode', $this->mode );
+                        $this->update_meta('_wpinv_mode', $this->mode);
                         break;
                     case 'transaction_id':
-                        $this->update_meta( '_wpinv_transaction_id', $this->transaction_id );
+                        $this->update_meta('_wpinv_transaction_id', $this->transaction_id);
                         break;
                     case 'ip':
-                        $this->update_meta( '_wpinv_user_ip', $this->ip );
+                        $this->update_meta('_wpinv_user_ip', $this->ip);
                         break;
                     ///case 'user_id':
                         ///$this->update_meta( '_wpinv_user_id', $this->user_id );
                         ///$this->user_info['user_id'] = $this->user_id;
                         ///break;
                     case 'first_name':
-                        $this->update_meta( '_wpinv_first_name', $this->first_name );
+                        $this->update_meta('_wpinv_first_name', $this->first_name);
                         $this->user_info['first_name'] = $this->first_name;
                         break;
                     case 'last_name':
-                        $this->update_meta( '_wpinv_last_name', $this->last_name );
+                        $this->update_meta('_wpinv_last_name', $this->last_name);
                         $this->user_info['last_name'] = $this->last_name;
                         break;
                     case 'phone':
-                        $this->update_meta( '_wpinv_phone', $this->phone );
+                        $this->update_meta('_wpinv_phone', $this->phone);
                         $this->user_info['phone'] = $this->phone;
                         break;
                     case 'address':
-                        $this->update_meta( '_wpinv_address', $this->address );
+                        $this->update_meta('_wpinv_address', $this->address);
                         $this->user_info['address'] = $this->address;
                         break;
                     case 'city':
-                        $this->update_meta( '_wpinv_city', $this->city );
+                        $this->update_meta('_wpinv_city', $this->city);
                         $this->user_info['city'] = $this->city;
                         break;
                     case 'country':
-                        $this->update_meta( '_wpinv_country', $this->country );
+                        $this->update_meta('_wpinv_country', $this->country);
                         $this->user_info['country'] = $this->country;
                         break;
                     case 'state':
-                        $this->update_meta( '_wpinv_state', $this->state );
+                        $this->update_meta('_wpinv_state', $this->state);
                         $this->user_info['state'] = $this->state;
                         break;
                     case 'zip':
-                        $this->update_meta( '_wpinv_zip', $this->zip );
+                        $this->update_meta('_wpinv_zip', $this->zip);
                         $this->user_info['zip'] = $this->zip;
                         break;
                     case 'company':
-                        $this->update_meta( '_wpinv_company', $this->company );
+                        $this->update_meta('_wpinv_company', $this->company);
                         $this->user_info['company'] = $this->company;
                         break;
                     case 'vat_number':
-                        $this->update_meta( '_wpinv_vat_number', $this->vat_number );
+                        $this->update_meta('_wpinv_vat_number', $this->vat_number);
                         $this->user_info['vat_number'] = $this->vat_number;
                         
-                        $vat_info = $wpi_session->get( 'user_vat_data' );
-                        if ( $this->vat_number && !empty( $vat_info ) && isset( $vat_info['number'] ) && isset( $vat_info['valid'] ) && $vat_info['number'] == $this->vat_number ) {
-                            $adddress_confirmed = isset( $vat_info['adddress_confirmed'] ) ? $vat_info['adddress_confirmed'] : false;
-                            $this->update_meta( '_wpinv_adddress_confirmed', (bool)$adddress_confirmed );
+                        $vat_info = $wpi_session->get('user_vat_data');
+                        if ($this->vat_number && !empty($vat_info) && isset($vat_info['number']) && isset($vat_info['valid']) && $vat_info['number'] == $this->vat_number) {
+                            $adddress_confirmed = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+                            $this->update_meta('_wpinv_adddress_confirmed', (bool)$adddress_confirmed);
                             $this->user_info['adddress_confirmed'] = (bool)$adddress_confirmed;
                         }
     
                         break;
                     case 'vat_rate':
-                        $this->update_meta( '_wpinv_vat_rate', $this->vat_rate );
+                        $this->update_meta('_wpinv_vat_rate', $this->vat_rate);
                         $this->user_info['vat_rate'] = $this->vat_rate;
                         break;
                     case 'adddress_confirmed':
-                        $this->update_meta( '_wpinv_adddress_confirmed', $this->adddress_confirmed );
+                        $this->update_meta('_wpinv_adddress_confirmed', $this->adddress_confirmed);
                         $this->user_info['adddress_confirmed'] = $this->adddress_confirmed;
                         break;
                     
                     case 'key':
-                        $this->update_meta( '_wpinv_key', $this->key );
+                        $this->update_meta('_wpinv_key', $this->key);
                         break;
                     case 'date':
                         $args = array(
@@ -800,49 +800,49 @@ 
                             'edit_date' => true,
                         );
 
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     case 'due_date':
-                        if ( empty( $this->due_date ) ) {
+                        if (empty($this->due_date)) {
                             $this->due_date = 'none';
                         }
                         
-                        $this->update_meta( '_wpinv_due_date', $this->due_date );
+                        $this->update_meta('_wpinv_due_date', $this->due_date);
                         break;
                     case 'completed_date':
-                        $this->update_meta( '_wpinv_completed_date', $this->completed_date );
+                        $this->update_meta('_wpinv_completed_date', $this->completed_date);
                         break;
                     case 'discounts':
-                        if ( ! is_array( $this->discounts ) ) {
-                            $this->discounts = explode( ',', $this->discounts );
+                        if (!is_array($this->discounts)) {
+                            $this->discounts = explode(',', $this->discounts);
                         }
 
-                        $this->user_info['discount'] = implode( ',', $this->discounts );
+                        $this->user_info['discount'] = implode(',', $this->discounts);
                         break;
                     case 'discount':
-                        $this->update_meta( '_wpinv_discount', wpinv_round_amount( $this->discount ) );
+                        $this->update_meta('_wpinv_discount', wpinv_round_amount($this->discount));
                         break;
                     case 'discount_code':
-                        $this->update_meta( '_wpinv_discount_code', $this->discount_code );
+                        $this->update_meta('_wpinv_discount_code', $this->discount_code);
                         break;
                     case 'parent_invoice':
                         $args = array(
                             'ID'          => $this->ID,
                             'post_parent' => $this->parent_invoice,
                         );
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     default:
-                        do_action( 'wpinv_save', $this, $key );
+                        do_action('wpinv_save', $this, $key);
                         break;
                 }
             }
 
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
             
-            $this->items    = array_values( $this->items );
+            $this->items = array_values($this->items);
             
             $new_meta = array(
                 'items'         => $this->items,
@@ -853,12 +853,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;
                 }
             }
@@ -866,15 +866,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();
@@ -882,7 +882,7 @@ 
         return $saved;
     }
     
-    public function add_fee( $args, $global = true ) {
+    public function add_fee($args, $global = true) {
         $default_args = array(
             'label'       => '',
             'amount'      => 0,
@@ -892,75 +892,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;
@@ -968,35 +968,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'        => 'WPInvoicing',
             '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,
@@ -1004,53 +1004,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;
         }
 
@@ -1061,54 +1061,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;
@@ -1121,9 +1121,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;
@@ -1137,72 +1137,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);
         }
     }
     
@@ -1210,92 +1210,92 @@ 
         $process_pending = true;
 
         // If the payment was not in publish or revoked status, don't decrement stats as they were never incremented
-        if ( ( 'publish' != $this->old_status && 'revoked' != $this->old_status ) || 'wpi-pending' != $this->status ) {
+        if (('publish' != $this->old_status && 'revoked' != $this->old_status) || 'wpi-pending' != $this->status) {
             $process_pending = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_pending = apply_filters( 'wpinv_should_process_pending', $process_pending, $this );
+        $process_pending = apply_filters('wpinv_should_process_pending', $process_pending, $this);
 
-        if ( false === $process_pending ) {
+        if (false === $process_pending) {
             return;
         }
 
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_pending', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_pending', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_pending', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_pending', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_pending', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_pending', true, $this);
 
         $this->completed_date = '';
-        $this->update_meta( '_wpinv_completed_date', '' );
+        $this->update_meta('_wpinv_completed_date', '');
     }
     
     // get data
-    public function get_meta( $meta_key = '_wpinv_payment_meta', $single = true ) {
-        $meta = get_post_meta( $this->ID, $meta_key, $single );
+    public function get_meta($meta_key = '_wpinv_payment_meta', $single = true) {
+        $meta = get_post_meta($this->ID, $meta_key, $single);
 
-        if ( $meta_key === '_wpinv_payment_meta' ) {
+        if ($meta_key === '_wpinv_payment_meta') {
 
-            if(!is_array($meta)){$meta = array();} // we need this to be an array so make sure it is.
+            if (!is_array($meta)) {$meta = array(); } // we need this to be an array so make sure it is.
 
-            if ( empty( $meta['key'] ) ) {
+            if (empty($meta['key'])) {
                 $meta['key'] = $this->setup_invoice_key();
             }
 
-            if ( empty( $meta['date'] ) ) {
-                $meta['date'] = get_post_field( 'post_date', $this->ID );
+            if (empty($meta['date'])) {
+                $meta['date'] = get_post_field('post_date', $this->ID);
             }
         }
 
-        $meta = apply_filters( 'wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID );
+        $meta = apply_filters('wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID);
 
-        return apply_filters( 'wpinv_get_invoice_meta', $meta, $this->ID, $meta_key );
+        return apply_filters('wpinv_get_invoice_meta', $meta, $this->ID, $meta_key);
     }
     
     public function get_description() {
-        $post = get_post( $this->ID );
+        $post = get_post($this->ID);
         
-        $description = !empty( $post ) ? $post->post_content : '';
-        return apply_filters( 'wpinv_get_description', $description, $this->ID, $this );
+        $description = !empty($post) ? $post->post_content : '';
+        return apply_filters('wpinv_get_description', $description, $this->ID, $this);
     }
     
-    public function get_status( $nicename = false ) {
-        if ( !$nicename ) {
+    public function get_status($nicename = false) {
+        if (!$nicename) {
             $status = $this->status;
         } else {
             $status = $this->status_nicename;
         }
         
-        return apply_filters( 'wpinv_get_status', $status, $nicename, $this->ID, $this );
+        return apply_filters('wpinv_get_status', $status, $nicename, $this->ID, $this);
     }
     
     public function get_cart_details() {
-        return apply_filters( 'wpinv_cart_details', $this->cart_details, $this->ID, $this );
+        return apply_filters('wpinv_cart_details', $this->cart_details, $this->ID, $this);
     }
     
-    public function get_subtotal( $currency = false ) {
-        $subtotal = wpinv_round_amount( $this->subtotal );
+    public function get_subtotal($currency = false) {
+        $subtotal = wpinv_round_amount($this->subtotal);
         
-        if ( $currency ) {
-            $subtotal = wpinv_price( wpinv_format_amount( $subtotal, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $subtotal = wpinv_price(wpinv_format_amount($subtotal, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency);
     }
     
-    public function get_total( $currency = false ) {        
-        if ( $this->is_free_trial() ) {
-            $total = wpinv_round_amount( 0 );
+    public function get_total($currency = false) {        
+        if ($this->is_free_trial()) {
+            $total = wpinv_round_amount(0);
         } else {
-            $total = wpinv_round_amount( $this->total );
+            $total = wpinv_round_amount($this->total);
         }
-        if ( $currency ) {
-            $total = wpinv_price( wpinv_format_amount( $total, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $total = wpinv_price(wpinv_format_amount($total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_total', $total, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_total', $total, $this->ID, $this, $currency);
     }
     
-    public function get_recurring_details( $field = '', $currency = false ) {        
+    public function get_recurring_details($field = '', $currency = false) {        
         $data                 = array();
         $data['cart_details'] = $this->cart_details;
         $data['subtotal']     = $this->get_subtotal();
@@ -1303,45 +1303,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;
                         }
                         
@@ -1349,113 +1349,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 );
 
@@ -1475,116 +1475,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;
         }
         
@@ -1603,8 +1603,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;
@@ -1616,19 +1616,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;
                 }
 
@@ -1640,29 +1640,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;
             }
             
@@ -1678,25 +1678,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(
@@ -1704,29 +1704,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'],
@@ -1736,18 +1736,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,
@@ -1755,51 +1755,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;
                     }
                 }
@@ -1808,13 +1808,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.
             }
 
@@ -1822,41 +1822,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;
             }
             
@@ -1875,16 +1875,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;
@@ -1895,8 +1895,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;
     }
@@ -1904,7 +1904,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;
@@ -1914,42 +1914,42 @@ 
             $_POST['wpinv_country'] = $this->country;
             $_POST['wpinv_state']   = $this->state;
             
-            foreach ( $this->cart_details as $key => $item ) {
+            foreach ($this->cart_details as $key => $item) {
                 $item_price = $item['item_price'];
-                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                $amount     = wpinv_round_amount( $item_price * $quantity );
+                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                $amount     = wpinv_round_amount($item_price * $quantity);
                 $subtotal   = $item_price * $quantity;
                 
                 $wpi_current_id         = $this->ID;
                 $wpi_item_id            = $item['id'];
                 
-                $discount   = wpinv_get_cart_item_discount_amount( $item, $this->get_discounts() );
+                $discount   = wpinv_get_cart_item_discount_amount($item, $this->get_discounts());
                 
-                $tax_rate   = wpinv_get_tax_rate( $this->country, $this->state, $wpi_item_id );
-                $tax_class  = $wpinv_euvat->get_item_class( $wpi_item_id );
-                $tax        = $item_price > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+                $tax_rate   = wpinv_get_tax_rate($this->country, $this->state, $wpi_item_id);
+                $tax_class  = $wpinv_euvat->get_item_class($wpi_item_id);
+                $tax        = $item_price > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
 
-                if ( wpinv_prices_include_tax() ) {
-                    $subtotal -= wpinv_round_amount( $tax );
+                if (wpinv_prices_include_tax()) {
+                    $subtotal -= wpinv_round_amount($tax);
                 }
 
-                $total      = $subtotal - $discount + $tax;
+                $total = $subtotal - $discount + $tax;
 
                 // Do not allow totals to go negative
-                if( $total < 0 ) {
+                if ($total < 0) {
                     $total = 0;
                 }
 
                 $cart_details[] = array(
                     'id'          => $item['id'],
                     'name'        => $item['name'],
-                    'item_price'  => wpinv_round_amount( $item_price ),
-                    'custom_price'=> ( isset( $item['custom_price'] ) ? $item['custom_price'] : '' ),
+                    'item_price'  => wpinv_round_amount($item_price),
+                    'custom_price'=> (isset($item['custom_price']) ? $item['custom_price'] : ''),
                     'quantity'    => $quantity,
                     'discount'    => $discount,
-                    'subtotal'    => wpinv_round_amount( $subtotal ),
-                    'tax'         => wpinv_round_amount( $tax ),
-                    'price'       => wpinv_round_amount( $total ),
+                    'subtotal'    => wpinv_round_amount($subtotal),
+                    'tax'         => wpinv_round_amount($tax),
+                    'price'       => wpinv_round_amount($total),
                     'vat_rate'    => $tax_rate,
                     'vat_class'   => $tax_class,
                     'meta'        => isset($item['meta']) ? $item['meta'] : array(),
@@ -1960,15 +1960,15 @@ 
                 $cart_discount  += (float)($discount);
                 $cart_tax       += (float)($tax);
             }
-            if ( $cart_subtotal < 0 ) {
+            if ($cart_subtotal < 0) {
                 $cart_subtotal = 0;
             }
-            if ( $cart_tax < 0 ) {
+            if ($cart_tax < 0) {
                 $cart_tax = 0;
             }
-            $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();
             
@@ -1980,226 +1980,226 @@ 
     
     public function recalculate_totals($temp = false) {        
         $this->update_items($temp);
-        $this->save( true );
+        $this->save(true);
         
         return $this;
     }
     
     public function needs_payment() {
-        $valid_invoice_statuses = apply_filters( 'wpinv_valid_invoice_statuses_for_payment', array( 'wpi-pending' ), $this );
+        $valid_invoice_statuses = apply_filters('wpinv_valid_invoice_statuses_for_payment', array('wpi-pending'), $this);
 
-        if ( $this->has_status( $valid_invoice_statuses ) && ( $this->get_total() > 0 || $this->is_free_trial() || $this->is_free() ) ) {
+        if ($this->has_status($valid_invoice_statuses) && ($this->get_total() > 0 || $this->is_free_trial() || $this->is_free())) {
             $needs_payment = true;
         } else {
             $needs_payment = false;
         }
 
-        return apply_filters( 'wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses );
+        return apply_filters('wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses);
     }
     
-    public function get_checkout_payment_url( $with_key = false, $secret = false ) {
+    public function get_checkout_payment_url($with_key = false, $secret = false) {
         $pay_url = wpinv_get_checkout_uri();
 
-        if ( is_ssl() ) {
-            $pay_url = str_replace( 'http:', 'https:', $pay_url );
+        if (is_ssl()) {
+            $pay_url = str_replace('http:', 'https:', $pay_url);
         }
         
         $key = $this->get_key();
 
-        if ( $with_key ) {
-            $pay_url = add_query_arg( 'invoice_key', $key, $pay_url );
+        if ($with_key) {
+            $pay_url = add_query_arg('invoice_key', $key, $pay_url);
         } else {
-            $pay_url = add_query_arg( array( 'wpi_action' => 'pay_for_invoice', 'invoice_key' => $key ), $pay_url );
+            $pay_url = add_query_arg(array('wpi_action' => 'pay_for_invoice', 'invoice_key' => $key), $pay_url);
         }
         
-        if ( $secret ) {
-            $pay_url = add_query_arg( array( '_wpipay' => md5( $this->get_user_id() . '::' . $this->get_email() . '::' . $key ) ), $pay_url );
+        if ($secret) {
+            $pay_url = add_query_arg(array('_wpipay' => md5($this->get_user_id() . '::' . $this->get_email() . '::' . $key)), $pay_url);
         }
 
-        return apply_filters( 'wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret );
+        return apply_filters('wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret);
     }
     
-    public function get_view_url( $with_key = false ) {
-        $invoice_url = get_permalink( $this->ID );
+    public function get_view_url($with_key = false) {
+        $invoice_url = get_permalink($this->ID);
 
-        if ( $with_key ) {
-            $invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
+        if ($with_key) {
+            $invoice_url = add_query_arg('invoice_key', $this->get_key(), $invoice_url);
         }
 
-        return apply_filters( 'wpinv_get_view_url', $invoice_url, $this, $with_key );
+        return apply_filters('wpinv_get_view_url', $invoice_url, $this, $with_key);
     }
     
-    public function generate_key( $string = '' ) {
-        $auth_key  = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-        return strtolower( md5( $string . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'wpinv', true ) ) );  // Unique key
+    public function generate_key($string = '') {
+        $auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+        return strtolower(md5($string . date('Y-m-d H:i:s') . $auth_key . uniqid('wpinv', true))); // Unique key
     }
     
     public function is_recurring() {
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return false;
         }
         
         $has_subscription = false;
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $has_subscription = true;
                 break;
             }
         }
         
-        if ( count( $this->cart_details ) > 1 ) {
+        if (count($this->cart_details) > 1) {
             $has_subscription = false;
         }
 
-        return apply_filters( 'wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details );
+        return apply_filters('wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details);
     }
     
     public function is_free_trial() {
         $is_free_trial = false;
         
-        if ( $this->is_parent() && $item = $this->get_recurring( true ) ) {
-            if ( !empty( $item ) && $item->has_free_trial() ) {
+        if ($this->is_parent() && $item = $this->get_recurring(true)) {
+            if (!empty($item) && $item->has_free_trial()) {
                 $is_free_trial = true;
             }
         }
 
-        return apply_filters( 'wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details );
+        return apply_filters('wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details);
     }
     
-    public function get_recurring( $object = false ) {
+    public function get_recurring($object = false) {
         $item = NULL;
         
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return $item;
         }
         
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $item = $cart_item['id'];
                 break;
             }
         }
         
-        if ( $object ) {
-            $item = $item ? new WPInv_Item( $item ) : NULL;
+        if ($object) {
+            $item = $item ? new WPInv_Item($item) : NULL;
             
-            apply_filters( 'wpinv_invoice_get_recurring_item', $item, $this );
+            apply_filters('wpinv_invoice_get_recurring_item', $item, $this);
         }
 
-        return apply_filters( 'wpinv_invoice_get_recurring_item_id', $item, $this );
+        return apply_filters('wpinv_invoice_get_recurring_item_id', $item, $this);
     }
     
     public function get_subscription_name() {
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return NULL;
         }
         
-        if ( !($name = $item->get_name()) ) {
+        if (!($name = $item->get_name())) {
             $name = $item->post_name;
         }
 
-        return apply_filters( 'wpinv_invoice_get_subscription_name', $name, $this );
+        return apply_filters('wpinv_invoice_get_subscription_name', $name, $this);
     }
         
     public function get_expiration() {
-        $expiration = $this->get_meta( '_wpinv_subscr_expiration', true );
+        $expiration = $this->get_meta('_wpinv_subscr_expiration', true);
         return $expiration;
     }
     
-    public function get_cancelled_date( $formatted = true ) {
-        $cancelled_date = $this->get_subscription_status() == 'cancelled' ? $this->get_meta( '_wpinv_subscr_cancelled_on', true ) : '';
+    public function get_cancelled_date($formatted = true) {
+        $cancelled_date = $this->get_subscription_status() == 'cancelled' ? $this->get_meta('_wpinv_subscr_cancelled_on', true) : '';
         
-        if ( $formatted && $cancelled_date ) {
-            $cancelled_date = date_i18n( get_option( 'date_format' ), strtotime( $cancelled_date ) );
+        if ($formatted && $cancelled_date) {
+            $cancelled_date = date_i18n(get_option('date_format'), strtotime($cancelled_date));
         }
         
         return $cancelled_date;
     }
     
-    public function get_trial_end_date( $formatted = true ) {
-        if ( !$this->is_free_trial() || ! ( $this->is_paid() || $this->is_refunded() ) ) {
+    public function get_trial_end_date($formatted = true) {
+        if (!$this->is_free_trial() || !($this->is_paid() || $this->is_refunded())) {
             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() || $this->is_refunded() ) ) {
+    public function get_subscription_start($formatted = true) {
+        if (!($this->is_paid() || $this->is_refunded())) {
             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() || $this->is_refunded() ) ) {
+    public function get_subscription_end($formatted = true) {
+        if (!($this->is_paid() || $this->is_refunded())) {
             return '-';
         }
 
-        if ( $this->get_subscription_status() == 'cancelled' ) {
-            return $this->get_cancelled_date( $formatted );
+        if ($this->get_subscription_status() == 'cancelled') {
+            return $this->get_cancelled_date($formatted);
         }
 
         $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() {        
@@ -2211,125 +2211,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:
@@ -2340,26 +2340,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;
@@ -2379,39 +2379,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;
@@ -2431,13 +2431,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;
         }
         
@@ -2449,8 +2449,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;
         }
 
@@ -2462,8 +2462,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;
         }
 
@@ -2475,8 +2475,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;
         }
 
@@ -2488,23 +2488,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;
         }
 
@@ -2512,11 +2512,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;
         }
 
@@ -2535,85 +2535,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';
         }
@@ -2623,10 +2623,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() {
@@ -2634,8 +2634,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);
         }
     }
     
@@ -2644,44 +2644,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;
@@ -2692,100 +2692,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;
         }
         
@@ -2793,23 +2793,23 @@ 
     }
     
     public function is_refunded() {
-        $is_refunded = $this->has_status( array( 'wpi-refunded' ) );
+        $is_refunded = $this->has_status(array('wpi-refunded'));
 
-        return apply_filters( 'wpinv_invoice_is_refunded', $is_refunded, $this );
+        return apply_filters('wpinv_invoice_is_refunded', $is_refunded, $this);
     }
     
     public function is_free() {
         $is_free = false;
         
-        if ( !( (float)wpinv_round_amount( $this->get_total() ) > 0 ) ) {
-            if ( $this->is_parent() && $this->is_recurring() ) {
-                $is_free = (float)wpinv_round_amount( $this->get_recurring_details( 'total' ) ) > 0 ? false : true;
+        if (!((float)wpinv_round_amount($this->get_total()) > 0)) {
+            if ($this->is_parent() && $this->is_recurring()) {
+                $is_free = (float)wpinv_round_amount($this->get_recurring_details('total')) > 0 ? false : true;
             } else {
                 $is_free = true;
             }
         }
         
-        return apply_filters( 'wpinv_invoice_is_free', $is_free, $this );
+        return apply_filters('wpinv_invoice_is_free', $is_free, $this);
     }
     
     public function has_vat() {
@@ -2817,41 +2817,41 @@ 
         
         $requires_vat = false;
         
-        if ( $this->country ) {
+        if ($this->country) {
             $wpi_country        = $this->country;
             
-            $requires_vat       = $wpinv_euvat->requires_vat( $requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule( $this ) );
+            $requires_vat       = $wpinv_euvat->requires_vat($requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule($this));
         }
         
-        return apply_filters( 'wpinv_invoice_has_vat', $requires_vat, $this );
+        return apply_filters('wpinv_invoice_has_vat', $requires_vat, $this);
     }
     
     public function refresh_item_ids() {
         $item_ids = array();
         
-        if ( !empty( $this->cart_details ) ) {
-            foreach ( $this->cart_details as $key => $item ) {
-                if ( !empty( $item['id'] ) ) {
+        if (!empty($this->cart_details)) {
+            foreach ($this->cart_details as $key => $item) {
+                if (!empty($item['id'])) {
                     $item_ids[] = $item['id'];
                 }
             }
         }
         
-        $item_ids = !empty( $item_ids ) ? implode( ',', array_unique( $item_ids ) ) : '';
+        $item_ids = !empty($item_ids) ? implode(',', array_unique($item_ids)) : '';
         
-        update_post_meta( $this->ID, '_wpinv_item_ids', $item_ids );
+        update_post_meta($this->ID, '_wpinv_item_ids', $item_ids);
     }
     
-    public function get_invoice_quote_type( $post_id ) {
-        if ( empty( $post_id ) ) {
+    public function get_invoice_quote_type($post_id) {
+        if (empty($post_id)) {
             return '';
         }
 
-        $type = get_post_type( $post_id );
+        $type = get_post_type($post_id);
 
-        if ( 'wpi_invoice' === $type ) {
+        if ('wpi_invoice' === $type) {
             $post_type = __('Invoice', 'invoicing');
-        } else{
+        } else {
             $post_type = __('Quote', 'invoicing');
         }
 

includes/class-wpinv-cache-helper.php

Spacing +33 added lines, -33 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,17 +14,17 @@ 
      * Hook in methods.
      */
     public static function init() {
-        add_action( 'init', array( __CLASS__, 'init_hooks' ), 0 );
-        add_action( 'admin_notices', array( __CLASS__, 'notices' ) );
+        add_action('init', array(__CLASS__, 'init_hooks'), 0);
+        add_action('admin_notices', array(__CLASS__, 'notices'));
     }
 
     public static function init_hooks() {
-        if ( false === ( $page_uris = get_transient( 'wpinv_cache_excluded_uris' ) ) ) {
-            $checkout_page = wpinv_get_option( 'checkout_page', '' );
-            $success_page  = wpinv_get_option( 'success_page', '' );
-            $failure_page  = wpinv_get_option( 'failure_page', '' );
-            $history_page  = wpinv_get_option( 'invoice_history_page', '' );
-            if ( empty( $checkout_page ) || empty( $success_page ) || empty( $failure_page ) || empty( $history_page ) ) {
+        if (false === ($page_uris = get_transient('wpinv_cache_excluded_uris'))) {
+            $checkout_page = wpinv_get_option('checkout_page', '');
+            $success_page  = wpinv_get_option('success_page', '');
+            $failure_page  = wpinv_get_option('failure_page', '');
+            $history_page  = wpinv_get_option('invoice_history_page', '');
+            if (empty($checkout_page) || empty($success_page) || empty($failure_page) || empty($history_page)) {
                 return;
             }
 
@@ -37,30 +37,30 @@ 
             $page_uris[] = 'p=' . $history_page;
 
             // Exclude permalinks
-            $checkout_page  = get_post( $checkout_page );
-            $success_page   = get_post( $success_page );
-            $failure_page   = get_post( $failure_page );
-            $history_page   = get_post( $history_page );
+            $checkout_page  = get_post($checkout_page);
+            $success_page   = get_post($success_page);
+            $failure_page   = get_post($failure_page);
+            $history_page   = get_post($history_page);
 
-            if ( ! is_null( $checkout_page ) ) {
+            if (!is_null($checkout_page)) {
                 $page_uris[] = '/' . $checkout_page->post_name;
             }
-            if ( ! is_null( $success_page ) ) {
+            if (!is_null($success_page)) {
                 $page_uris[] = '/' . $success_page->post_name;
             }
-            if ( ! is_null( $failure_page ) ) {
+            if (!is_null($failure_page)) {
                 $page_uris[] = '/' . $failure_page->post_name;
             }
-            if ( ! is_null( $history_page ) ) {
+            if (!is_null($history_page)) {
                 $page_uris[] = '/' . $history_page->post_name;
             }
 
-            set_transient( 'wpinv_cache_excluded_uris', $page_uris );
+            set_transient('wpinv_cache_excluded_uris', $page_uris);
         }
 
-        if ( is_array( $page_uris ) ) {
-            foreach( $page_uris as $uri ) {
-                if ( strstr( $_SERVER['REQUEST_URI'], $uri ) ) {
+        if (is_array($page_uris)) {
+            foreach ($page_uris as $uri) {
+                if (strstr($_SERVER['REQUEST_URI'], $uri)) {
                     self::nocache();
                     break;
                 }
@@ -73,14 +73,14 @@ 
      * @access private
      */
     private static function nocache() {
-        if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-            define( "DONOTCACHEPAGE", true );
+        if (!defined('DONOTCACHEPAGE')) {
+            define("DONOTCACHEPAGE", true);
         }
-        if ( ! defined( 'DONOTCACHEOBJECT' ) ) {
-            define( "DONOTCACHEOBJECT", true );
+        if (!defined('DONOTCACHEOBJECT')) {
+            define("DONOTCACHEOBJECT", true);
         }
-        if ( ! defined( 'DONOTCACHEDB' ) ) {
-            define( "DONOTCACHEDB", true );
+        if (!defined('DONOTCACHEDB')) {
+            define("DONOTCACHEDB", true);
         }
         nocache_headers();
     }
@@ -89,18 +89,18 @@ 
      * notices function.
      */
     public static function notices() {
-        if ( ! function_exists( 'w3tc_pgcache_flush' ) || ! function_exists( 'w3_instance' ) ) {
+        if (!function_exists('w3tc_pgcache_flush') || !function_exists('w3_instance')) {
             return;
         }
 
-        $config   = w3_instance( 'W3_Config' );
-        $enabled  = $config->get_integer( 'dbcache.enabled' );
-        $settings = array_map( 'trim', $config->get_array( 'dbcache.reject.sql' ) );
+        $config   = w3_instance('W3_Config');
+        $enabled  = $config->get_integer('dbcache.enabled');
+        $settings = array_map('trim', $config->get_array('dbcache.reject.sql'));
 
-        if ( $enabled && ! in_array( '_wp_session_', $settings ) ) {
+        if ($enabled && !in_array('_wp_session_', $settings)) {
             ?>
             <div class="error">
-                <p><?php printf( __( 'In order for <strong>database caching</strong> to work with Invoicing you must add %1$s to the "Ignored Query Strings" option in <a href="%2$s">W3 Total Cache settings</a>.', 'invoicing' ), '<code>_wp_session_</code>', admin_url( 'admin.php?page=w3tc_dbcache' ) ); ?></p>
+                <p><?php printf(__('In order for <strong>database caching</strong> to work with Invoicing you must add %1$s to the "Ignored Query Strings" option in <a href="%2$s">W3 Total Cache settings</a>.', 'invoicing'), '<code>_wp_session_</code>', admin_url('admin.php?page=w3tc_dbcache')); ?></p>
             </div>
             <?php
         }

includes/gateways/paypal.php

Spacing +260 added lines, -260 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_paypal_cc_form', '__return_false' );
-add_filter( 'wpinv_paypal_support_subscription', '__return_true' );
+add_action('wpinv_paypal_cc_form', '__return_false');
+add_filter('wpinv_paypal_support_subscription', '__return_true');
 
-function wpinv_process_paypal_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_paypal_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     // Collect payment data
@@ -25,30 +25,30 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
 
     // Check payment
-    if ( ! $invoice ) {
+    if (!$invoice) {
         // Record the error
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $payment );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing'), json_encode($payment_data)), $payment);
         // Problems? send back
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     } else {
         // Only send to PayPal if the pending payment is created successfully
-        $listener_url = wpinv_get_ipn_url( 'paypal' );
+        $listener_url = wpinv_get_ipn_url('paypal');
 
         // Get the success url
-        $return_url = add_query_arg( array(
+        $return_url = add_query_arg(array(
                 'payment-confirm' => 'paypal',
                 'invoice-id' => $invoice->ID
-            ), get_permalink( wpinv_get_option( 'success_page', false ) ) );
+            ), get_permalink(wpinv_get_option('success_page', false)));
 
         // Get the PayPal redirect uri
-        $paypal_redirect = trailingslashit( wpinv_get_paypal_redirect() ) . '?';
+        $paypal_redirect = trailingslashit(wpinv_get_paypal_redirect()) . '?';
 
         // Setup PayPal arguments
         $paypal_args = array(
-            'business'      => wpinv_get_option( 'paypal_email', false ),
+            'business'      => wpinv_get_option('paypal_email', false),
             'email'         => $invoice->get_email(),
             'first_name'    => $invoice->get_first_name(),
             'last_name'     => $invoice->get_last_name(),
@@ -57,16 +57,16 @@ 
             'shipping'      => '0',
             'no_note'       => '1',
             'currency_code' => wpinv_get_currency(),
-            'charset'       => get_bloginfo( 'charset' ),
+            'charset'       => get_bloginfo('charset'),
             'custom'        => $invoice->ID,
             'rm'            => '2',
             'return'        => $return_url,
-            'cancel_return' => wpinv_get_failed_transaction_uri( '?invoice-id=' . $invoice->ID ),
+            'cancel_return' => wpinv_get_failed_transaction_uri('?invoice-id=' . $invoice->ID),
             'notify_url'    => $listener_url,
-            'cbt'           => get_bloginfo( 'name' ),
+            'cbt'           => get_bloginfo('name'),
             'bn'            => 'WPInvoicing_SP',
             'lc'            => 'US', // this will force paypal site to english
-            'landing_page'  => apply_filters( 'wpinv_paypal_standard_landing_page', 'billing', $invoice ), // 'login' or 'billing'. login - PayPal account login, billing - Non-PayPal account.
+            'landing_page'  => apply_filters('wpinv_paypal_standard_landing_page', 'billing', $invoice), // 'login' or 'billing'. login - PayPal account login, billing - Non-PayPal account.
         );
 
         $paypal_args['address1'] = $invoice->get_address();
@@ -80,57 +80,57 @@ 
             'upload' => '1'
         );
 
-        $paypal_args = array_merge( $paypal_extra_args, $paypal_args );
+        $paypal_args = array_merge($paypal_extra_args, $paypal_args);
 
         // Add cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {
                 $item['quantity'] = $item['quantity'] > 0 ? $item['quantity'] : 1;
-                $item_amount = wpinv_sanitize_amount( $item['subtotal'] / $item['quantity'], 2 );
+                $item_amount = wpinv_sanitize_amount($item['subtotal'] / $item['quantity'], 2);
 
-                if ( $item_amount <= 0 ) {
+                if ($item_amount <= 0) {
                     $item_amount = 0;
                 }
 
-                $paypal_args['item_number_' . $i ]      = $item['id'];
-                $paypal_args['item_name_' . $i ]        = stripslashes_deep( html_entity_decode( wpinv_get_cart_item_name( $item ), ENT_COMPAT, 'UTF-8' ) );
-                $paypal_args['quantity_' . $i ]         = $item['quantity'];
-                $paypal_args['amount_' . $i ]           = $item_amount;
-                $paypal_args['discount_amount_' . $i ]  = wpinv_sanitize_amount( $item['discount'], 2 );
+                $paypal_args['item_number_' . $i]      = $item['id'];
+                $paypal_args['item_name_' . $i]        = stripslashes_deep(html_entity_decode(wpinv_get_cart_item_name($item), ENT_COMPAT, 'UTF-8'));
+                $paypal_args['quantity_' . $i]         = $item['quantity'];
+                $paypal_args['amount_' . $i]           = $item_amount;
+                $paypal_args['discount_amount_' . $i]  = wpinv_sanitize_amount($item['discount'], 2);
 
                 $i++;
             }
         }
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() ) {
-            $paypal_args['tax_cart'] = wpinv_sanitize_amount( (float)$invoice->get_tax(), 2 );
+        if (wpinv_use_taxes()) {
+            $paypal_args['tax_cart'] = wpinv_sanitize_amount((float)$invoice->get_tax(), 2);
         }
 
-        $paypal_args = apply_filters( 'wpinv_paypal_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_args', $paypal_args, $purchase_data, $invoice);
 
         // Build query
-        $paypal_redirect .= http_build_query( $paypal_args );
+        $paypal_redirect .= http_build_query($paypal_args);
 
         // Fix for some sites that encode the entities
-        $paypal_redirect = str_replace( '&amp;', '&', $paypal_redirect );
+        $paypal_redirect = str_replace('&amp;', '&', $paypal_redirect);
 
         // Get rid of cart contents
         wpinv_empty_cart();
         
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
     }
 }
-add_action( 'wpinv_gateway_paypal', 'wpinv_process_paypal_payment' );
+add_action('wpinv_gateway_paypal', 'wpinv_process_paypal_payment');
 
-function wpinv_get_paypal_recurring_args( $paypal_args, $purchase_data, $invoice ) {
-    if ( $invoice->is_recurring() && $item_id = $invoice->get_recurring() ) {
-        $item   = new WPInv_Item( $item_id );
+function wpinv_get_paypal_recurring_args($paypal_args, $purchase_data, $invoice) {
+    if ($invoice->is_recurring() && $item_id = $invoice->get_recurring()) {
+        $item = new WPInv_Item($item_id);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return $paypal_args;
         }
 
@@ -138,24 +138,24 @@ 
         $interval           = $item->get_recurring_interval();
         $bill_times         = (int)$item->get_recurring_limit();
         
-        $initial_amount     = wpinv_sanitize_amount( $invoice->get_total(), 2 );
-        $recurring_amount   = wpinv_sanitize_amount( $invoice->get_recurring_details( 'total' ), 2 );
+        $initial_amount     = wpinv_sanitize_amount($invoice->get_total(), 2);
+        $recurring_amount   = wpinv_sanitize_amount($invoice->get_recurring_details('total'), 2);
         
         $paypal_args['cmd'] = '_xclick-subscriptions';
         $paypal_args['sra'] = '1';
         $paypal_args['src'] = '1';
         
         // Set item description
-        $paypal_args['item_name']   = stripslashes_deep( html_entity_decode( wpinv_get_cart_item_name( array( 'id' => $item->ID ) ), ENT_COMPAT, 'UTF-8' ) );
+        $paypal_args['item_name'] = stripslashes_deep(html_entity_decode(wpinv_get_cart_item_name(array('id' => $item->ID)), ENT_COMPAT, 'UTF-8'));
         
-        if ( $invoice->is_free_trial() && $item->has_free_trial() ) {
+        if ($invoice->is_free_trial() && $item->has_free_trial()) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $item->get_trial_interval();
             $paypal_args['t1']  = $item->get_trial_period();
             
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
-        } else if ( $initial_amount != $recurring_amount && $bill_times != 1 ) {
+        } else if ($initial_amount != $recurring_amount && $bill_times != 1) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $interval;
             $paypal_args['t1']  = $period;
@@ -163,63 +163,63 @@ 
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
             
-            if ( $bill_times > 1 ) {
+            if ($bill_times > 1) {
                 $bill_times--;
             }
         } else {
-            $paypal_args['a3']  = $initial_amount;
+            $paypal_args['a3'] = $initial_amount;
         }
         
         $paypal_args['p3']  = $interval;
         $paypal_args['t3']  = $period;
         
-        if ( $bill_times > 1 ) {
+        if ($bill_times > 1) {
             // Make sure it's not over the max of 52
-            $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+            $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
         }
                 
         // Remove cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {                
-                if ( isset( $paypal_args['item_number_' . $i] ) ) {
-                    unset( $paypal_args['item_number_' . $i] );
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {                
+                if (isset($paypal_args['item_number_' . $i])) {
+                    unset($paypal_args['item_number_' . $i]);
                 }
-                if ( isset( $paypal_args['item_name_' . $i] ) ) {
-                    unset( $paypal_args['item_name_' . $i] );
+                if (isset($paypal_args['item_name_' . $i])) {
+                    unset($paypal_args['item_name_' . $i]);
                 }
-                if ( isset( $paypal_args['quantity_' . $i] ) ) {
-                    unset( $paypal_args['quantity_' . $i] );
+                if (isset($paypal_args['quantity_' . $i])) {
+                    unset($paypal_args['quantity_' . $i]);
                 }
-                if ( isset( $paypal_args['amount_' . $i] ) ) {
-                    unset( $paypal_args['amount_' . $i] );
+                if (isset($paypal_args['amount_' . $i])) {
+                    unset($paypal_args['amount_' . $i]);
                 }
-                if ( isset( $paypal_args['discount_amount_' . $i] ) ) {
-                    unset( $paypal_args['discount_amount_' . $i] );
+                if (isset($paypal_args['discount_amount_' . $i])) {
+                    unset($paypal_args['discount_amount_' . $i]);
                 }
 
                 $i++;
             }
         }
         
-        if ( isset( $paypal_args['tax_cart'] ) ) {
-            unset( $paypal_args['tax_cart'] );
+        if (isset($paypal_args['tax_cart'])) {
+            unset($paypal_args['tax_cart']);
         }
                 
-        if ( isset( $paypal_args['upload'] ) ) {
-            unset( $paypal_args['upload'] );
+        if (isset($paypal_args['upload'])) {
+            unset($paypal_args['upload']);
         }
         
-        $paypal_args = apply_filters( 'wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice);
     }
     
     return $paypal_args;
 }
-add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
+add_filter('wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3);
 
 function wpinv_process_paypal_ipn() {
 	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
 		return;
 	}
 
@@ -227,11 +227,11 @@ 
 	$post_data = '';
 
 	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
+	if (ini_get('allow_url_fopen')) {
+		$post_data = file_get_contents('php://input');
 	} else {
 		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
+		ini_set('post_max_size', '12M');
 	}
 	// Start the encoded data collection with notification command
 	$encoded_data = 'cmd=_notify-validate';
@@ -240,43 +240,43 @@ 
 	$arg_separator = wpinv_get_php_arg_separator_output();
 
 	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
+	if ($post_data || strlen($post_data) > 0) {
 		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
+		$encoded_data .= $arg_separator . $post_data;
 	} else {
 		// Check if POST is empty
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			// Nothing to do
 			return;
 		} else {
 			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
+			foreach ($_POST as $key => $value) {
 				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
+				$encoded_data .= $arg_separator . "$key=" . urlencode($value);
 			}
 		}
 	}
 
 	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
+	parse_str($encoded_data, $encoded_data_array);
 
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&amp;', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
+	foreach ($encoded_data_array as $key => $value) {
+		if (false !== strpos($key, 'amp;')) {
+			$new_key = str_replace('&amp;', '&', $key);
+			$new_key = str_replace('amp;', '&', $new_key);
 
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
+			unset($encoded_data_array[$key]);
+			$encoded_data_array[$new_key] = $value;
 		}
 	}
 
 	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
+	$paypal_redirect = wpinv_get_paypal_redirect(true);
 
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+	if (!wpinv_get_option('disable_paypal_verification', false)) {
 		// Validate the IPN
 
-		$remote_post_vars      = array(
+		$remote_post_vars = array(
 			'method'           => 'POST',
 			'timeout'          => 45,
 			'redirection'      => 5,
@@ -294,21 +294,21 @@ 
 		);
 
 		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+		$api_response = wp_remote_post(wpinv_get_paypal_redirect(), $remote_post_vars);
 
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if (is_wp_error($api_response)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Something went wrong
 		}
 
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if ($api_response['body'] !== 'VERIFIED' && wpinv_get_option('disable_paypal_verification', false)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Response not okay
 		}
 	}
 
 	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+	if (!is_array($encoded_data_array) && !empty($encoded_data_array))
 		return;
 
 	$defaults = array(
@@ -316,215 +316,215 @@ 
 		'payment_status' => ''
 	);
 
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+	$encoded_data_array = wp_parse_args($encoded_data_array, $defaults);
 
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+	$invoice_id = isset($encoded_data_array['custom']) ? absint($encoded_data_array['custom']) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+	wpinv_error_log($encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__);
 
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+	if (has_action('wpinv_paypal_' . $encoded_data_array['txn_type'])) {
 		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id);
 	} else {
 		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_web_accept', $encoded_data_array, $invoice_id);
 	}
 	exit;
 }
-add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
+add_action('wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn');
 
-function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+function wpinv_process_paypal_web_accept_and_cart($data, $invoice_id) {
+	if ($data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded') {
 		return;
 	}
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
 	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+	$purchase_key   = isset($data['invoice']) ? $data['invoice'] : $data['item_number'];
 	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+	$payment_status = strtolower($data['payment_status']);
+	$currency_code  = strtolower($data['mc_currency']);
+	$business_email = isset($data['business']) && is_email($data['business']) ? trim($data['business']) : trim($data['receiver_email']);
+	$payment_meta   = wpinv_get_invoice_meta($invoice_id);
 
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+	if (wpinv_get_payment_gateway($invoice_id) != 'paypal') {
 		return; // this isn't a PayPal standard IPN
 	}
 
 	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ) );
+	if (strcasecmp($business_email, trim(wpinv_get_option('paypal_email', false))) != 0) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid business email in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid PayPal business email.', 'invoicing'));
 		return;
 	}
 
 	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ) );
+	if ($currency_code != strtolower($payment_meta['currency'])) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid currency in PayPal IPN.', 'invoicing'));
 		return;
 	}
 
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+	if (!wpinv_get_payment_user_email($invoice_id)) {
 		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
 		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_email', $data['payer_email']);
 
 		// Setup and store the customer's details
 		$user_info = array(
 			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
+			'email'      => sanitize_text_field($data['payer_email']),
+			'first_name' => sanitize_text_field($data['first_name']),
+			'last_name'  => sanitize_text_field($data['last_name']),
 			'discount'   => '',
 		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+		$user_info['address'] = !empty($data['address_street']) ? sanitize_text_field($data['address_street']) : false;
+		$user_info['city']    = !empty($data['address_city']) ? sanitize_text_field($data['address_city']) : false;
+		$user_info['state']   = !empty($data['address_state']) ? sanitize_text_field($data['address_state']) : false;
+		$user_info['country'] = !empty($data['address_country_code']) ? sanitize_text_field($data['address_country_code']) : false;
+		$user_info['zip']     = !empty($data['address_zip']) ? sanitize_text_field($data['address_zip']) : false;
 
 		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_payment_meta', $payment_meta);
 	}
 
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+	if ($payment_status == 'refunded' || $payment_status == 'reversed') {
 		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
+		wpinv_process_paypal_refund($data, $invoice_id);
 	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
+		if (get_post_status($invoice_id) == 'publish') {
 			return; // Only paid payments once
 		}
 
 		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
+		$payment_amount = wpinv_payment_total($invoice_id);
 
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+		if (number_format((float)$paypal_amount, 2) < number_format((float)$payment_amount, 2)) {
 			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ) );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid payment amount in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid amount in PayPal IPN.', 'invoicing'));
 			return;
 		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+		if ($purchase_key != wpinv_get_payment_key($invoice_id)) {
 			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ) );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid purchase key in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing'));
 			return;
 		}
 
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ) );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'wpi-pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+		if ('complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode('paypal')) {
+			wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $data['txn_id']));
+			wpinv_set_payment_transaction_id($invoice_id, $data['txn_id']);
+			wpinv_update_payment_status($invoice_id, 'publish');
+		} else if ('wpi-pending' == $payment_status && isset($data['pending_reason'])) {
 			// Look for possible pending reasons, such as an echeck
 			$note = '';
 
-			switch( strtolower( $data['pending_reason'] ) ) {
+			switch (strtolower($data['pending_reason'])) {
 				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+					$note = __('Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing');
 					break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+					$note = __('Payment must be accepted manually through PayPal due to international account regulations', 'invoicing');
 					break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+					$note = __('Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing');
 					break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+					$note = __('Payment was sent to non-confirmed or non-registered email address.', 'invoicing');
 					break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+					$note = __('PayPal account must be upgraded before this payment can be accepted', 'invoicing');
 					break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+					$note = __('PayPal account is not verified. Verify account in order to accept this payment', 'invoicing');
 					break;
 
 				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+					$note = __('Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing');
 					break;
 			}
 
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note );
+			if (!empty($note)) {
+				wpinv_insert_payment_note($invoice_id, $note);
 			}
 		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ) );
+			wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal IPN has been received with invalid payment status: %s', 'invoicing'), $payment_status));
 		}
 	}
 }
-add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
+add_action('wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2);
 
 // Process PayPal subscription sign ups
-add_action( 'wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup' );
+add_action('wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup');
 
 // Process PayPal subscription payments
-add_action( 'wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment' );
+add_action('wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment');
 
 // Process PayPal subscription cancellations
-add_action( 'wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel' );
+add_action('wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel');
 
 // Process PayPal subscription end of term notices
-add_action( 'wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot' );
+add_action('wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot');
 
 // Process PayPal payment failed
-add_action( 'wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed' );
+add_action('wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed');
 
 
 /**
  * Process the subscription started IPN.
  */
-function wpinv_process_paypal_subscr_signup( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
-    if( empty( $parent_invoice_id ) ) {
+function wpinv_process_paypal_subscr_signup($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
+    if (empty($parent_invoice_id)) {
         return;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
-    if ( $invoice->is_free_trial() && !empty( $ipn_data['invoice'] ) ) {
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Invoice ID: %s', 'invoicing' ) , $ipn_data['invoice'] ) );
-        wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['invoice'] );
+    if ($invoice->is_free_trial() && !empty($ipn_data['invoice'])) {
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Invoice ID: %s', 'invoicing'), $ipn_data['invoice']));
+        wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['invoice']);
     }
     
-    wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    wpinv_update_payment_status($parent_invoice_id, 'publish');
     sleep(1);
-    wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $ipn_data['subscr_id'] ) );
+    wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']));
     
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
 
-    $cart_details   = $invoice->cart_details;
+    $cart_details = $invoice->cart_details;
 
-    if ( !empty( $cart_details ) ) {
-        foreach ( $cart_details as $cart_item ) {
-            $item = new WPInv_Item( $cart_item['id'] );
+    if (!empty($cart_details)) {
+        foreach ($cart_details as $cart_item) {
+            $item = new WPInv_Item($cart_item['id']);
             
             $status = $invoice->is_free_trial() && $item->has_free_trial() ? 'trialing' : 'active';
             
@@ -533,15 +533,15 @@ 
                 'status'            => $status,
                 'period'            => $item->get_recurring_period(),
                 'initial_amount'    => $invoice->get_total(),
-                'recurring_amount'  => $invoice->get_recurring_details( 'total' ),
+                'recurring_amount'  => $invoice->get_recurring_details('total'),
                 'interval'          => $item->get_recurring_interval(),
                 'bill_times'        => $item->get_recurring_limit(),
-                'expiration'        => $invoice->get_new_expiration( $cart_item['id'] ),
+                'expiration'        => $invoice->get_new_expiration($cart_item['id']),
                 'profile_id'        => $ipn_data['subscr_id'],
-                'created'           => date_i18n( 'Y-m-d H:i:s', strtotime( $ipn_data['subscr_date'] ) )
+                'created'           => date_i18n('Y-m-d H:i:s', strtotime($ipn_data['subscr_date']))
             );
             
-            if ( $item->has_free_trial() ) {
+            if ($item->has_free_trial()) {
                 $args['trial_period']      = $item->get_trial_period();
                 $args['trial_interval']    = $item->get_trial_interval();
             } else {
@@ -550,7 +550,7 @@ 
             }
             
 
-            $subscription->update_subscription( $args );
+            $subscription->update_subscription($args);
         }
     }
 }
@@ -558,45 +558,45 @@ 
 /**
  * Process the subscription payment received IPN.
  */
-function wpinv_process_paypal_subscr_payment( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_process_paypal_subscr_payment($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
     
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
 
-    $parent_invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $parent_invoice ) ) {
+    $parent_invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($parent_invoice)) {
         return;
     }
 
-    $transaction_id = wpinv_get_payment_transaction_id( $parent_invoice_id );
+    $transaction_id = wpinv_get_payment_transaction_id($parent_invoice_id);
     $signup_date    = $subscription->get_subscription_created();
     $payment_date   = $ipn_data['payment_date'];
-    $times_billed   = $parent_invoice->get_total_payments( false );
+    $times_billed   = $parent_invoice->get_total_payments(false);
 
     // Look to see if payment is same day as signup and we have set the transaction ID on the parent payment yet.
-    if ( empty( $times_billed ) && ( !$transaction_id || $transaction_id == $parent_invoice_id ) ) {
-        wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    if (empty($times_billed) && (!$transaction_id || $transaction_id == $parent_invoice_id)) {
+        wpinv_update_payment_status($parent_invoice_id, 'publish');
         sleep(1);
         
         // This is the very first payment
-        wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['txn_id'] );
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ) );
+        wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['txn_id']);
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']));
         return;
     }
     
-    if ( wpinv_get_id_by_transaction_id( $ipn_data['txn_id'] ) ) {
+    if (wpinv_get_id_by_transaction_id($ipn_data['txn_id'])) {
         return; // Payment already recorded
     }
 
-    $currency_code = strtolower( $ipn_data['mc_currency'] );
+    $currency_code = strtolower($ipn_data['mc_currency']);
 
     // verify details
-    if ( $currency_code != strtolower( wpinv_get_currency() ) ) {
+    if ($currency_code != strtolower(wpinv_get_currency())) {
         // the currency code is invalid
-        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: ', 'invoicing' ), json_encode( $ipn_data ) ) );
+        wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: ', 'invoicing'), json_encode($ipn_data)));
         return;
     }
 
@@ -605,11 +605,11 @@ 
         'transaction_id' => $ipn_data['txn_id']
     );
     
-    $invoice = wpinv_recurring_add_subscription_payment( $parent_invoice_id, $args );
+    $invoice = wpinv_recurring_add_subscription_payment($parent_invoice_id, $args);
     
-    if ( !empty( $invoice ) ) {
+    if (!empty($invoice)) {
         sleep(1);
-        wpinv_insert_payment_note( $invoice->ID, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ) );
+        wpinv_insert_payment_note($invoice->ID, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']));
 
         $invoice->renew_subscription();
     }
@@ -618,10 +618,10 @@ 
 /**
  * Process the subscription canceled IPN.
  */
-function wpinv_process_paypal_subscr_cancel( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_cancel($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -631,10 +631,10 @@ 
 /**
  * Process the subscription expired IPN.
  */
-function wpinv_process_paypal_subscr_eot( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_eot($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -644,45 +644,45 @@ 
 /**
  * Process the subscription payment failed IPN.
  */
-function wpinv_process_paypal_subscr_failed( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_failed($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
     $subscription->failing_subscription();
 
-    do_action( 'wpinv_recurring_payment_failed', $subscription );
+    do_action('wpinv_recurring_payment_failed', $subscription);
 }
 
 /**
  * Retrieve the subscription this IPN notice is for.
  */
-function wpinv_get_paypal_subscription( $ipn_data = array() ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_get_paypal_subscription($ipn_data = array()) {
+    $parent_invoice_id = absint($ipn_data['custom']);
 
-    if( empty( $parent_invoice_id ) ) {
+    if (empty($parent_invoice_id)) {
         return false;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    $subscription = wpinv_get_subscription( $ipn_data['subscr_id'], true );
+    $subscription = wpinv_get_subscription($ipn_data['subscr_id'], true);
 
-    if ( empty( $subscription ) ) {
-        $subs         = wpinv_get_subscriptions( array( 'parent_invoice_id' => $parent_invoice_id, 'numberposts' => 1 ) );
-        $subscription = reset( $subs );
+    if (empty($subscription)) {
+        $subs         = wpinv_get_subscriptions(array('parent_invoice_id' => $parent_invoice_id, 'numberposts' => 1));
+        $subscription = reset($subs);
 
-        if ( $subscription && $subscription->ID > 0 ) {
+        if ($subscription && $subscription->ID > 0) {
             // Update the profile ID so it is set for future renewals
-            $subscription->update_subscription( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+            $subscription->update_subscription(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
         } else {
             $subscription = $invoice;
-            $subscription->update_subscription( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+            $subscription->update_subscription(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
             // No subscription found with a matching payment ID, bail
             //return false;
         }
@@ -692,39 +692,39 @@ 
 
 }
 
-function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
+function wpinv_process_paypal_refund($data, $invoice_id = 0) {
 	// Collect payment details
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+	if (get_post_status($invoice_id) == 'wpi-refunded') {
 		return; // Only refund payments once
 	}
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
+	$payment_amount = wpinv_payment_total($invoice_id);
 	$refund_amount  = $data['mc_gross'] * -1;
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Partial PayPal refund processed: %s', 'invoicing' ), $data['parent_txn_id'] ) );
+	if (number_format((float)$refund_amount, 2) < number_format((float)$payment_amount, 2)) {
+		wpinv_insert_payment_note($invoice_id, sprintf(__('Partial PayPal refund processed: %s', 'invoicing'), $data['parent_txn_id']));
 		return; // This is a partial refund
 	}
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ) );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ) );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Payment #%s Refunded for reason: %s', 'invoicing'), $data['parent_txn_id'], $data['reason_code']));
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Refund Transaction ID: %s', 'invoicing'), $data['txn_id']));
+	wpinv_update_payment_status($invoice_id, 'wpi-refunded');
 }
 
-function wpinv_get_paypal_redirect( $ssl_check = false ) {
-    if ( is_ssl() || ! $ssl_check ) {
+function wpinv_get_paypal_redirect($ssl_check = false) {
+    if (is_ssl() || !$ssl_check) {
         $protocol = 'https://';
     } else {
         $protocol = 'http://';
     }
 
     // Check the current payment mode
-    if ( wpinv_is_test_mode( 'paypal' ) ) {
+    if (wpinv_is_test_mode('paypal')) {
         // Test mode
         $paypal_uri = $protocol . 'www.sandbox.paypal.com/cgi-bin/webscr';
     } else {
@@ -732,67 +732,67 @@ 
         $paypal_uri = $protocol . 'www.paypal.com/cgi-bin/webscr';
     }
 
-    return apply_filters( 'wpinv_paypal_uri', $paypal_uri );
+    return apply_filters('wpinv_paypal_uri', $paypal_uri);
 }
 
-function wpinv_paypal_success_page_content( $content ) {
+function wpinv_paypal_success_page_content($content) {
     global $wpi_invoice;
     
     $session = wpinv_get_checkout_session();
 
-    if ( empty( $_GET['invoice-id'] ) && empty( $session['invoice_key'] )  ) {
+    if (empty($_GET['invoice-id']) && empty($session['invoice_key'])) {
         return $content;
     }
 
-    $invoice_id = !empty( $_GET['invoice-id'] ) ? absint( $_GET['invoice-id'] ) : wpinv_get_invoice_id_by_key( $session['invoice_key'] );
+    $invoice_id = !empty($_GET['invoice-id']) ? absint($_GET['invoice-id']) : wpinv_get_invoice_id_by_key($session['invoice_key']);
 
-    if ( empty(  $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return $content;
     }
 
-    $wpi_invoice = wpinv_get_invoice( $invoice_id );
+    $wpi_invoice = wpinv_get_invoice($invoice_id);
     
-    if ( !empty( $wpi_invoice ) && 'wpi-pending' == $wpi_invoice->status ) {
+    if (!empty($wpi_invoice) && 'wpi-pending' == $wpi_invoice->status) {
         // Payment is still pending so show processing indicator to fix the Race Condition, issue #
         ob_start();
-        wpinv_get_template_part( 'wpinv-payment-processing' );
+        wpinv_get_template_part('wpinv-payment-processing');
         $content = ob_get_clean();
     }
 
     return $content;
 }
-add_filter( 'wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content' );
+add_filter('wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content');
 
-function wpinv_paypal_get_transaction_id( $invoice_id ) {
+function wpinv_paypal_get_transaction_id($invoice_id) {
     $transaction_id = '';
-    $notes = wpinv_get_invoice_notes( $invoice_id );
+    $notes = wpinv_get_invoice_notes($invoice_id);
 
-    foreach ( $notes as $note ) {
-        if ( preg_match( '/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match ) ) {
+    foreach ($notes as $note) {
+        if (preg_match('/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match)) {
             $transaction_id = $match[1];
             continue;
         }
     }
 
-    return apply_filters( 'wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id );
+    return apply_filters('wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id);
 }
-add_filter( 'wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1 );
+add_filter('wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1);
 
-function wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice ) {
-    if ( $invoice->is_free_trial() || $transaction_id == $invoice_id ) { // Free trial does not have transaction at PayPal.
+function wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice) {
+    if ($invoice->is_free_trial() || $transaction_id == $invoice_id) { // Free trial does not have transaction at PayPal.
         $transaction_url = $invoice->get_view_url();
     } else {
-        $sandbox = wpinv_is_test_mode( 'paypal' ) ? '.sandbox' : '';
+        $sandbox = wpinv_is_test_mode('paypal') ? '.sandbox' : '';
         $transaction_url = 'https://www' . $sandbox . '.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=' . $transaction_id;
     }
 
-    $transaction_link = '<a href="' . esc_url( $transaction_url ) . '" target="_blank">' . $transaction_id . '</a>';
+    $transaction_link = '<a href="' . esc_url($transaction_url) . '" target="_blank">' . $transaction_id . '</a>';
 
-    return apply_filters( 'wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $invoice );
+    return apply_filters('wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $invoice);
 }
-add_filter( 'wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3 );
+add_filter('wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3);
 
 function wpinv_gateway_paypal_button_label($label) {
-    return __( 'Proceed to PayPal', 'invoicing' );
+    return __('Proceed to PayPal', 'invoicing');
 }
-add_filter( 'wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1 );
\ No newline at end of file
+add_filter('wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1);
\ No newline at end of file

includes/libraries/wpinv-euvat/class-wpinv-euvat.php

Spacing +710 added lines, -710 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 class WPInv_EUVat {
     private static $is_ajax = false;
@@ -8,7 +8,7 @@ 
     private static $instance = false;
     
     public static function get_instance() {
-        if ( !self::$instance ) {
+        if (!self::$instance) {
             self::$instance = new self();
             self::$instance->actions();
         }
@@ -17,132 +17,132 @@ 
     }
     
     public function __construct() {
-        self::$is_ajax          = defined( 'DOING_AJAX' ) && DOING_AJAX;
+        self::$is_ajax          = defined('DOING_AJAX') && DOING_AJAX;
         self::$default_country  = wpinv_get_default_country();
     }
     
     public static function actions() {
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( self::$instance, 'enqueue_admin_scripts' ) );
-            add_action( 'wpinv_settings_sections_taxes', array( self::$instance, 'section_vat_settings' ) ); 
-            add_action( 'wpinv_settings_taxes', array( self::$instance, 'vat_settings' ) );
-            add_filter( 'wpinv_settings_taxes-vat_sanitize', array( self::$instance, 'sanitize_vat_settings' ) );
-            add_filter( 'wpinv_settings_taxes-vat_rates_sanitize', array( self::$instance, 'sanitize_vat_rates' ) );
-            add_action( 'wp_ajax_wpinv_add_vat_class', array( self::$instance, 'add_class' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_add_vat_class', array( self::$instance, 'add_class' ) );
-            add_action( 'wp_ajax_wpinv_delete_vat_class', array( self::$instance, 'delete_class' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_delete_vat_class', array( self::$instance, 'delete_class' ) );
-            add_action( 'wp_ajax_wpinv_update_vat_rates', array( self::$instance, 'update_eu_rates' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_update_vat_rates', array( self::$instance, 'update_eu_rates' ) );
-            add_action( 'wp_ajax_wpinv_geoip2', array( self::$instance, 'geoip2_download_database' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_geoip2', array( self::$instance, 'geoip2_download_database' ) );
-        }
-        
-        add_action( 'wp_enqueue_scripts', array( self::$instance, 'enqueue_vat_scripts' ) );
-        add_filter( 'wpinv_default_billing_country', array( self::$instance, 'get_user_country' ), 10 );
-        add_filter( 'wpinv_get_user_country', array( self::$instance, 'set_user_country' ), 10 );
-        add_action( 'wp_ajax_wpinv_vat_validate', array( self::$instance, 'ajax_vat_validate' ) );
-        add_action( 'wp_ajax_nopriv_wpinv_vat_validate', array( self::$instance, 'ajax_vat_validate' ) );
-        add_action( 'wp_ajax_wpinv_vat_reset', array( self::$instance, 'ajax_vat_reset' ) );
-        add_action( 'wp_ajax_nopriv_wpinv_vat_reset', array( self::$instance, 'ajax_vat_reset' ) );
-        add_action( 'wpinv_invoice_print_after_line_items', array( self::$instance, 'show_vat_notice' ), 999, 1 );
-        if ( wpinv_use_taxes() ) {
-            add_action( 'wpinv_after_billing_fields', array( self::$instance, 'checkout_vat_fields' ) );
-            if ( self::allow_vat_rules() ) {
-                add_action( 'wpinv_checkout_error_checks', array( self::$instance, 'checkout_vat_validate' ), 10, 2 );
-                add_filter( 'wpinv_tax_rate', array( self::$instance, 'get_rate' ), 10, 4 );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(self::$instance, 'enqueue_admin_scripts'));
+            add_action('wpinv_settings_sections_taxes', array(self::$instance, 'section_vat_settings')); 
+            add_action('wpinv_settings_taxes', array(self::$instance, 'vat_settings'));
+            add_filter('wpinv_settings_taxes-vat_sanitize', array(self::$instance, 'sanitize_vat_settings'));
+            add_filter('wpinv_settings_taxes-vat_rates_sanitize', array(self::$instance, 'sanitize_vat_rates'));
+            add_action('wp_ajax_wpinv_add_vat_class', array(self::$instance, 'add_class'));
+            add_action('wp_ajax_nopriv_wpinv_add_vat_class', array(self::$instance, 'add_class'));
+            add_action('wp_ajax_wpinv_delete_vat_class', array(self::$instance, 'delete_class'));
+            add_action('wp_ajax_nopriv_wpinv_delete_vat_class', array(self::$instance, 'delete_class'));
+            add_action('wp_ajax_wpinv_update_vat_rates', array(self::$instance, 'update_eu_rates'));
+            add_action('wp_ajax_nopriv_wpinv_update_vat_rates', array(self::$instance, 'update_eu_rates'));
+            add_action('wp_ajax_wpinv_geoip2', array(self::$instance, 'geoip2_download_database'));
+            add_action('wp_ajax_nopriv_wpinv_geoip2', array(self::$instance, 'geoip2_download_database'));
+        }
+        
+        add_action('wp_enqueue_scripts', array(self::$instance, 'enqueue_vat_scripts'));
+        add_filter('wpinv_default_billing_country', array(self::$instance, 'get_user_country'), 10);
+        add_filter('wpinv_get_user_country', array(self::$instance, 'set_user_country'), 10);
+        add_action('wp_ajax_wpinv_vat_validate', array(self::$instance, 'ajax_vat_validate'));
+        add_action('wp_ajax_nopriv_wpinv_vat_validate', array(self::$instance, 'ajax_vat_validate'));
+        add_action('wp_ajax_wpinv_vat_reset', array(self::$instance, 'ajax_vat_reset'));
+        add_action('wp_ajax_nopriv_wpinv_vat_reset', array(self::$instance, 'ajax_vat_reset'));
+        add_action('wpinv_invoice_print_after_line_items', array(self::$instance, 'show_vat_notice'), 999, 1);
+        if (wpinv_use_taxes()) {
+            add_action('wpinv_after_billing_fields', array(self::$instance, 'checkout_vat_fields'));
+            if (self::allow_vat_rules()) {
+                add_action('wpinv_checkout_error_checks', array(self::$instance, 'checkout_vat_validate'), 10, 2);
+                add_filter('wpinv_tax_rate', array(self::$instance, 'get_rate'), 10, 4);
             }
         }
     }        
     
-    public static function get_eu_states( $sort = true ) {
-        $eu_states = array( 'AT', 'BE', 'BG', 'HR', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GB', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE' );
-        if ( $sort ) {
-            $sort = sort( $eu_states );
+    public static function get_eu_states($sort = true) {
+        $eu_states = array('AT', 'BE', 'BG', 'HR', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GB', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE');
+        if ($sort) {
+            $sort = sort($eu_states);
         }
         
-        return apply_filters( 'wpinv_get_eu_states', $eu_states, $sort );
+        return apply_filters('wpinv_get_eu_states', $eu_states, $sort);
     }
     
-    public static function get_gst_countries( $sort = true ) {
-        $gst_countries  = array( 'AU', 'NZ', 'CA', 'CN' );
+    public static function get_gst_countries($sort = true) {
+        $gst_countries = array('AU', 'NZ', 'CA', 'CN');
         
-        if ( $sort ) {
-            $sort = sort( $gst_countries );
+        if ($sort) {
+            $sort = sort($gst_countries);
         }
         
-        return apply_filters( 'wpinv_get_gst_countries', $gst_countries, $sort );
+        return apply_filters('wpinv_get_gst_countries', $gst_countries, $sort);
     }
     
-    public static function is_eu_state( $country_code ) {
-        $return = !empty( $country_code ) && in_array( strtoupper( $country_code ), self::get_eu_states() ) ? true : false;
+    public static function is_eu_state($country_code) {
+        $return = !empty($country_code) && in_array(strtoupper($country_code), self::get_eu_states()) ? true : false;
                 
-        return apply_filters( 'wpinv_is_eu_state', $return, $country_code );
+        return apply_filters('wpinv_is_eu_state', $return, $country_code);
     }
     
-    public static function is_gst_country( $country_code ) {
-        $return = !empty( $country_code ) && in_array( strtoupper( $country_code ), self::get_gst_countries() ) ? true : false;
+    public static function is_gst_country($country_code) {
+        $return = !empty($country_code) && in_array(strtoupper($country_code), self::get_gst_countries()) ? true : false;
                 
-        return apply_filters( 'wpinv_is_gst_country', $return, $country_code );
+        return apply_filters('wpinv_is_gst_country', $return, $country_code);
     }
     
     public static function enqueue_vat_scripts() {
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_register_script( 'wpinv-vat-validation-script', WPINV_PLUGIN_URL . 'assets/js/jsvat' . $suffix . '.js', array( 'jquery' ),  WPINV_VERSION );
-        wp_register_script( 'wpinv-vat-script', WPINV_PLUGIN_URL . 'assets/js/euvat' . $suffix . '.js', array( 'jquery' ),  WPINV_VERSION );
+        wp_register_script('wpinv-vat-validation-script', WPINV_PLUGIN_URL . 'assets/js/jsvat' . $suffix . '.js', array('jquery'), WPINV_VERSION);
+        wp_register_script('wpinv-vat-script', WPINV_PLUGIN_URL . 'assets/js/euvat' . $suffix . '.js', array('jquery'), WPINV_VERSION);
         
-        $vat_name   = self::get_vat_name();
+        $vat_name = self::get_vat_name();
         
         $vars = array();
         $vars['UseTaxes'] = wpinv_use_taxes();
         $vars['EUStates'] = self::get_eu_states();
-        $vars['NoRateSet'] = __( 'You have not set a rate. Do you want to continue?', 'invoicing' );
-        $vars['EmptyCompany'] = __( 'Please enter your registered company name!', 'invoicing' );
-        $vars['EmptyVAT'] = wp_sprintf( __( 'Please enter your %s number!', 'invoicing' ), $vat_name );
-        $vars['TotalsRefreshed'] = wp_sprintf( __( 'The invoice totals will be refreshed to update the %s.', 'invoicing' ), $vat_name );
-        $vars['ErrValidateVAT'] = wp_sprintf( __( 'Fail to validate the %s number!', 'invoicing' ), $vat_name );
-        $vars['ErrResetVAT'] = wp_sprintf( __( 'Fail to reset the %s number!', 'invoicing' ), $vat_name );
-        $vars['ErrInvalidVat'] = wp_sprintf( __( 'The %s number supplied does not have a valid format!', 'invoicing' ), $vat_name );
-        $vars['ErrInvalidResponse'] = __( 'An invalid response has been received from the server!', 'invoicing' );
+        $vars['NoRateSet'] = __('You have not set a rate. Do you want to continue?', 'invoicing');
+        $vars['EmptyCompany'] = __('Please enter your registered company name!', 'invoicing');
+        $vars['EmptyVAT'] = wp_sprintf(__('Please enter your %s number!', 'invoicing'), $vat_name);
+        $vars['TotalsRefreshed'] = wp_sprintf(__('The invoice totals will be refreshed to update the %s.', 'invoicing'), $vat_name);
+        $vars['ErrValidateVAT'] = wp_sprintf(__('Fail to validate the %s number!', 'invoicing'), $vat_name);
+        $vars['ErrResetVAT'] = wp_sprintf(__('Fail to reset the %s number!', 'invoicing'), $vat_name);
+        $vars['ErrInvalidVat'] = wp_sprintf(__('The %s number supplied does not have a valid format!', 'invoicing'), $vat_name);
+        $vars['ErrInvalidResponse'] = __('An invalid response has been received from the server!', 'invoicing');
         $vars['ApplyVATRules'] = $vars['UseTaxes'] ? self::allow_vat_rules() : false;
         $vars['HideVatFields'] = $vars['ApplyVATRules'] ? self::hide_vat_fields() : true;
-        $vars['ErrResponse'] = __( 'The request response is invalid!', 'invoicing' );
-        $vars['ErrRateResponse'] = __( 'The get rate request response is invalid', 'invoicing' );
-        $vars['PageRefresh'] = __( 'The page will be refreshed in 10 seconds to show the new options.', 'invoicing' );
-        $vars['RequestResponseNotValidJSON'] = __( 'The get rate request response is not valid JSON', 'invoicing' );
-        $vars['GetRateRequestFailed'] = __( 'The get rate request failed: ', 'invoicing' );
-        $vars['NoRateInformationInResponse'] = __( 'The get rate request response does not contain any rate information', 'invoicing' );
-        $vars['RatesUpdated'] = __( 'The rates have been updated. Press the save button to record these new rates.', 'invoicing' );
-        $vars['IPAddressInformation'] = __( 'IP Address Information', 'invoicing' );
-        $vars['VatValidating'] = wp_sprintf( __( 'Validating %s number...', 'invoicing' ), $vat_name );
-        $vars['VatReseting'] = __( 'Reseting...', 'invoicing' );
-        $vars['VatValidated'] = wp_sprintf( __( '%s number validated', 'invoicing' ), $vat_name );
-        $vars['VatNotValidated'] = wp_sprintf( __( '%s number not validated', 'invoicing' ), $vat_name );
-        $vars['ConfirmDeleteClass'] = __( 'Are you sure you wish to delete this rates class?', 'invoicing' );
+        $vars['ErrResponse'] = __('The request response is invalid!', 'invoicing');
+        $vars['ErrRateResponse'] = __('The get rate request response is invalid', 'invoicing');
+        $vars['PageRefresh'] = __('The page will be refreshed in 10 seconds to show the new options.', 'invoicing');
+        $vars['RequestResponseNotValidJSON'] = __('The get rate request response is not valid JSON', 'invoicing');
+        $vars['GetRateRequestFailed'] = __('The get rate request failed: ', 'invoicing');
+        $vars['NoRateInformationInResponse'] = __('The get rate request response does not contain any rate information', 'invoicing');
+        $vars['RatesUpdated'] = __('The rates have been updated. Press the save button to record these new rates.', 'invoicing');
+        $vars['IPAddressInformation'] = __('IP Address Information', 'invoicing');
+        $vars['VatValidating'] = wp_sprintf(__('Validating %s number...', 'invoicing'), $vat_name);
+        $vars['VatReseting'] = __('Reseting...', 'invoicing');
+        $vars['VatValidated'] = wp_sprintf(__('%s number validated', 'invoicing'), $vat_name);
+        $vars['VatNotValidated'] = wp_sprintf(__('%s number not validated', 'invoicing'), $vat_name);
+        $vars['ConfirmDeleteClass'] = __('Are you sure you wish to delete this rates class?', 'invoicing');
         $vars['isFront'] = is_admin() ? false : true;
-        $vars['checkoutNonce'] = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $vars['checkoutNonce'] = wp_create_nonce('wpinv_checkout_nonce');
         $vars['baseCountry'] = wpinv_get_default_country();
-        $vars['disableVATSameCountry'] = ( self::same_country_rule() == 'no' ? true : false );
-        $vars['disableVATSimpleCheck'] = wpinv_get_option( 'vat_offline_check' ) ? true : false;
+        $vars['disableVATSameCountry'] = (self::same_country_rule() == 'no' ? true : false);
+        $vars['disableVATSimpleCheck'] = wpinv_get_option('vat_offline_check') ? true : false;
         
-        wp_enqueue_script( 'wpinv-vat-validation-script' );
-        wp_enqueue_script( 'wpinv-vat-script' );
-        wp_localize_script( 'wpinv-vat-script', 'WPInv_VAT_Vars', $vars );
+        wp_enqueue_script('wpinv-vat-validation-script');
+        wp_enqueue_script('wpinv-vat-script');
+        wp_localize_script('wpinv-vat-script', 'WPInv_VAT_Vars', $vars);
     }
 
     public static function enqueue_admin_scripts() {
-        if( isset( $_GET['page'] ) && 'wpinv-settings' == $_GET['page'] ) {
+        if (isset($_GET['page']) && 'wpinv-settings' == $_GET['page']) {
             self::enqueue_vat_scripts();
         }
     }
     
-    public static function section_vat_settings( $sections ) {
-        if ( !empty( $sections ) ) {
-            $sections['vat'] = __( 'EU VAT Settings', 'invoicing' );
+    public static function section_vat_settings($sections) {
+        if (!empty($sections)) {
+            $sections['vat'] = __('EU VAT Settings', 'invoicing');
             
-            if ( self::allow_vat_classes() ) {
-                $sections['vat_rates'] = __( 'EU VAT Rates', 'invoicing' );
+            if (self::allow_vat_classes()) {
+                $sections['vat_rates'] = __('EU VAT Rates', 'invoicing');
             }
         }
         return $sections;
@@ -151,52 +151,52 @@ 
     public static function vat_rates_settings() {
         $vat_classes = self::get_rate_classes();
         $vat_rates = array();
-        $vat_class = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '_new';
-        $current_url = remove_query_arg( 'wpi_sub' );
+        $vat_class = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '_new';
+        $current_url = remove_query_arg('wpi_sub');
         
         $vat_rates['vat_rates_header'] = array(
             'id' => 'vat_rates_header',
-            'name' => '<h3>' . __( 'Manage VAT Rates', 'invoicing' ) . '</h3>',
+            'name' => '<h3>' . __('Manage VAT Rates', 'invoicing') . '</h3>',
             'desc' => '',
             'type' => 'header',
             'size' => 'regular'
         );
         $vat_rates['vat_rates_class'] = array(
             'id'          => 'vat_rates_class',
-            'name'        => __( 'Edit VAT Rates', 'invoicing' ),
-            'desc'        => __( 'The standard rate will apply where no explicit rate is provided.', 'invoicing' ),
+            'name'        => __('Edit VAT Rates', 'invoicing'),
+            'desc'        => __('The standard rate will apply where no explicit rate is provided.', 'invoicing'),
             'type'        => 'select',
-            'options'     => array_merge( $vat_classes, array( '_new' => __( 'Add New Rate Class', 'invoicing' ) ) ),
+            'options'     => array_merge($vat_classes, array('_new' => __('Add New Rate Class', 'invoicing'))),
             'chosen'      => true,
-            'placeholder' => __( 'Select a VAT Rate', 'invoicing' ),
+            'placeholder' => __('Select a VAT Rate', 'invoicing'),
             'selected'    => $vat_class,
             'onchange'    => 'document.location.href="' . $current_url . '&wpi_sub=" + this.value;',
         );
         
-        if ( $vat_class != '_standard' && $vat_class != '_new' ) {
+        if ($vat_class != '_standard' && $vat_class != '_new') {
             $vat_rates['vat_rate_delete'] = array(
                 'id'   => 'vat_rate_delete',
                 'type' => 'vat_rate_delete',
             );
         }
                     
-        if ( $vat_class == '_new' ) {
+        if ($vat_class == '_new') {
             $vat_rates['vat_rates_settings'] = array(
                 'id' => 'vat_rates_settings',
-                'name' => '<h3>' . __( 'Add New Rate Class', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Add New Rate Class', 'invoicing') . '</h3>',
                 'type' => 'header',
             );
             $vat_rates['vat_rate_name'] = array(
                 'id'   => 'vat_rate_name',
-                'name' => __( 'Name', 'invoicing' ),
-                'desc' => __( 'A short name for the new VAT Rate class', 'invoicing' ),
+                'name' => __('Name', 'invoicing'),
+                'desc' => __('A short name for the new VAT Rate class', 'invoicing'),
                 'type' => 'text',
                 'size' => 'regular',
             );
             $vat_rates['vat_rate_desc'] = array(
                 'id'   => 'vat_rate_desc',
-                'name' => __( 'Description', 'invoicing' ),
-                'desc' => __( 'Manage VAT Rate class', 'invoicing' ),
+                'name' => __('Description', 'invoicing'),
+                'desc' => __('Manage VAT Rate class', 'invoicing'),
                 'type' => 'text',
                 'size' => 'regular',
             );
@@ -208,7 +208,7 @@ 
             $vat_rates['vat_rates'] = array(
                 'id'   => 'vat_rates',
                 'name' => '<h3>' . $vat_classes[$vat_class] . '</h3>',
-                'desc' => self::get_class_desc( $vat_class ),
+                'desc' => self::get_class_desc($vat_class),
                 'type' => 'vat_rates',
             );
         }
@@ -216,12 +216,12 @@ 
         return $vat_rates;
     }
     
-    public static function vat_settings( $settings ) {
-        if ( !empty( $settings ) ) {    
+    public static function vat_settings($settings) {
+        if (!empty($settings)) {    
             $vat_settings = array();
             $vat_settings['vat_company_title'] = array(
                 'id' => 'vat_company_title',
-                'name' => '<h3>' . __( 'Your Company Details', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Your Company Details', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -229,22 +229,22 @@ 
             
             $vat_settings['vat_company_name'] = array(
                 'id' => 'vat_company_name',
-                'name' => __( 'Your Company Name', 'invoicing' ),
-                'desc' => wp_sprintf(__( 'Your company name as it appears on your VAT return, you can verify it via your VAT ID on the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                'name' => __('Your Company Name', 'invoicing'),
+                'desc' => wp_sprintf(__('Your company name as it appears on your VAT return, you can verify it via your VAT ID on the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                 'type' => 'text',
                 'size' => 'regular',
             );
             
             $vat_settings['vat_number'] = array(
                 'id'   => 'vat_number',
-                'name' => __( 'Your VAT Number', 'invoicing' ),
+                'name' => __('Your VAT Number', 'invoicing'),
                 'type' => 'vat_number',
                 'size' => 'regular',
             );
 
             $vat_settings['vat_settings_title'] = array(
                 'id' => 'vat_settings_title',
-                'name' => '<h3>' . __( 'Apply VAT Settings', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Apply VAT Settings', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -252,8 +252,8 @@ 
 
             $vat_settings['apply_vat_rules'] = array(
                 'id' => 'apply_vat_rules',
-                'name' => __( 'Enable VAT Rules', 'invoicing' ),
-                'desc' => __( 'Apply VAT to consumer sales from IP addresses within the EU, even if the billing address is outside the EU.', 'invoicing' ) . '<br><font style="color:red">' . __( 'Do not disable unless you know what you are doing.', 'invoicing' ) . '</font>',
+                'name' => __('Enable VAT Rules', 'invoicing'),
+                'desc' => __('Apply VAT to consumer sales from IP addresses within the EU, even if the billing address is outside the EU.', 'invoicing') . '<br><font style="color:red">' . __('Do not disable unless you know what you are doing.', 'invoicing') . '</font>',
                 'type' => 'checkbox',
                 'std' => '1'
             );
@@ -269,8 +269,8 @@ 
 
             $vat_settings['vat_prevent_b2c_purchase'] = array(
                 'id' => 'vat_prevent_b2c_purchase',
-                'name' => __( 'Prevent EU B2C Sales', 'invoicing' ),
-                'desc' => __( 'Enable this option if you are not registered for VAT in the EU.', 'invoicing' ),
+                'name' => __('Prevent EU B2C Sales', 'invoicing'),
+                'desc' => __('Enable this option if you are not registered for VAT in the EU.', 'invoicing'),
                 'type' => 'checkbox'
             );
 
@@ -278,21 +278,21 @@ 
 
             $vat_settings['vat_same_country_rule'] = array(
                 'id'          => 'vat_same_country_rule',
-                'name'        => __( 'Same Country Rule', 'invoicing' ),
-                'desc'        => __( 'Select how you want to handle VAT charge if sales are in the same country as the base country.', 'invoicing' ),
+                'name'        => __('Same Country Rule', 'invoicing'),
+                'desc'        => __('Select how you want to handle VAT charge if sales are in the same country as the base country.', 'invoicing'),
                 'type'        => 'select',
                 'options'     => array(
-                    ''          => __( 'Normal', 'invoicing' ),
-                    'no'        => __( 'No VAT', 'invoicing' ),
-                    'always'    => __( 'Always apply VAT', 'invoicing' ),
+                    ''          => __('Normal', 'invoicing'),
+                    'no'        => __('No VAT', 'invoicing'),
+                    'always'    => __('Always apply VAT', 'invoicing'),
                 ),
-                'placeholder' => __( 'Select an option', 'invoicing' ),
+                'placeholder' => __('Select an option', 'invoicing'),
                 'std'         => ''
             );
 
             $vat_settings['vat_checkout_title'] = array(
                 'id' => 'vat_checkout_title',
-                'name' => '<h3>' . __( 'Checkout Fields', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Checkout Fields', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -300,14 +300,14 @@ 
 
             $vat_settings['vat_disable_fields'] = array(
                 'id' => 'vat_disable_fields',
-                'name' => __( 'Disable VAT Fields', 'invoicing' ),
-                'desc' => __( 'Disable VAT fields if Invoicing is being used for GST.', 'invoicing' ) . '<br><font style="color:red">' . __( 'Do not disable if you have enabled Prevent EU B2C sales, otherwise Prevent EU B2C sales setting will not work.', 'invoicing' ) . '</font>',
+                'name' => __('Disable VAT Fields', 'invoicing'),
+                'desc' => __('Disable VAT fields if Invoicing is being used for GST.', 'invoicing') . '<br><font style="color:red">' . __('Do not disable if you have enabled Prevent EU B2C sales, otherwise Prevent EU B2C sales setting will not work.', 'invoicing') . '</font>',
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_ip_lookup'] = array(
                 'id'   => 'vat_ip_lookup',
-                'name' => __( 'IP Country Look-up', 'invoicing' ),
+                'name' => __('IP Country Look-up', 'invoicing'),
                 'type' => 'vat_ip_lookup',
                 'size' => 'regular',
                 'std' => 'default'
@@ -315,21 +315,21 @@ 
 
             $vat_settings['hide_ip_address'] = array(
                 'id' => 'hide_ip_address',
-                'name' => __( 'Hide IP Info at Checkout', 'invoicing' ),
-                'desc' => __( 'Hide the user IP info at checkout.', 'invoicing' ),
+                'name' => __('Hide IP Info at Checkout', 'invoicing'),
+                'desc' => __('Hide the user IP info at checkout.', 'invoicing'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_ip_country_default'] = array(
                 'id' => 'vat_ip_country_default',
-                'name' => __( 'Enable IP Country as Default', 'invoicing' ),
-                'desc' => __( 'Show the country of the users IP as the default country, otherwise the site default country will be used.', 'invoicing' ),
+                'name' => __('Enable IP Country as Default', 'invoicing'),
+                'desc' => __('Show the country of the users IP as the default country, otherwise the site default country will be used.', 'invoicing'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vies_validation_title'] = array(
                 'id' => 'vies_validation_title',
-                'name' => '<h3>' . __( 'VIES Validation', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('VIES Validation', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -337,37 +337,37 @@ 
 
             $vat_settings['vat_vies_check'] = array(
                 'id' => 'vat_vies_check',
-                'name' => __( 'Disable VIES VAT ID Check', 'invoicing' ),
-                'desc' => wp_sprintf( __( 'Prevent VAT numbers from being validated by the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                'name' => __('Disable VIES VAT ID Check', 'invoicing'),
+                'desc' => wp_sprintf(__('Prevent VAT numbers from being validated by the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_disable_company_name_check'] = array(
                 'id' => 'vat_disable_company_name_check',
-                'name' => __( 'Disable VIES Name Check', 'invoicing' ),
-                'desc' => wp_sprintf( __( 'Prevent company name from being validated by the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                'name' => __('Disable VIES Name Check', 'invoicing'),
+                'desc' => wp_sprintf(__('Prevent company name from being validated by the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_offline_check'] = array(
                 'id' => 'vat_offline_check',
-                'name' => __( 'Disable Basic Checks', 'invoicing' ),
-                'desc' => __( 'This will disable basic JS correct format validation attempts, it is very rare this should need to be disabled.', 'invoicing' ),
+                'name' => __('Disable Basic Checks', 'invoicing'),
+                'desc' => __('This will disable basic JS correct format validation attempts, it is very rare this should need to be disabled.', 'invoicing'),
                 'type' => 'checkbox'
             );
             
 
             $settings['vat'] = $vat_settings;
             
-            if ( self::allow_vat_classes() ) {
+            if (self::allow_vat_classes()) {
                 $settings['vat_rates'] = self::vat_rates_settings();
             }
             
             $eu_fallback_rate = array(
                 'id'   => 'eu_fallback_rate',
-                'name' => '<h3>' . __( 'VAT rate for EU member states', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('VAT rate for EU member states', 'invoicing') . '</h3>',
                 'type' => 'eu_fallback_rate',
-                'desc' => __( 'Enter the VAT rate to be charged for EU member states. You can edit the rates for each member state when a country rate has been set up by pressing this button.', 'invoicing' ),
+                'desc' => __('Enter the VAT rate to be charged for EU member states. You can edit the rates for each member state when a country rate has been set up by pressing this button.', 'invoicing'),
                 'std'  => '20',
                 'size' => 'small'
             );
@@ -383,11 +383,11 @@ 
         $database_url       = 'http' . (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === 'on' ? 's' : '') . '://geolite.maxmind.com/download/geoip/database/';
         $destination_dir    = $upload_dir['basedir'] . '/invoicing';
         
-        if ( !is_dir( $destination_dir ) ) { 
-            mkdir( $destination_dir );
+        if (!is_dir($destination_dir)) { 
+            mkdir($destination_dir);
         }
         
-        $database_files     = array(
+        $database_files = array(
             'country'   => array(
                 'source'        => $database_url . 'GeoLite2-Country.mmdb.gz',
                 'destination'   => $destination_dir . '/GeoLite2-Country.mmdb',
@@ -398,57 +398,57 @@ 
             )
         );
 
-        foreach( $database_files as $database => $files ) {
-            $result = self::geoip2_download_file( $files['source'], $files['destination'] );
+        foreach ($database_files as $database => $files) {
+            $result = self::geoip2_download_file($files['source'], $files['destination']);
             
-            if ( empty( $result['success'] ) ) {
+            if (empty($result['success'])) {
                 echo $result['message'];
                 exit;
             }
             
-            wpinv_update_option( 'wpinv_geoip2_date_updated', current_time( 'timestamp' ) );
-            echo sprintf(__( 'GeoIp2 %s database updated successfully.', 'invoicing' ), $database ) . ' ';
+            wpinv_update_option('wpinv_geoip2_date_updated', current_time('timestamp'));
+            echo sprintf(__('GeoIp2 %s database updated successfully.', 'invoicing'), $database) . ' ';
         }
         
         exit;
     }
     
-    public static function geoip2_download_file( $source_url, $destination_file ) {
+    public static function geoip2_download_file($source_url, $destination_file) {
         $success    = false;
         $message    = '';
         
-        if ( !function_exists( 'download_url' ) ) {
-            require_once( ABSPATH . 'wp-admin/includes/file.php' );
+        if (!function_exists('download_url')) {
+            require_once(ABSPATH . 'wp-admin/includes/file.php');
         }
 
-        $temp_file  = download_url( $source_url );
+        $temp_file = download_url($source_url);
         
-        if ( is_wp_error( $temp_file ) ) {
-            $message = sprintf( __( 'Error while downloading GeoIp2 database( %s ): %s', 'invoicing' ), $source_url, $temp_file->get_error_message() );
+        if (is_wp_error($temp_file)) {
+            $message = sprintf(__('Error while downloading GeoIp2 database( %s ): %s', 'invoicing'), $source_url, $temp_file->get_error_message());
         } else {
-            $handle = gzopen( $temp_file, 'rb' );
+            $handle = gzopen($temp_file, 'rb');
             
-            if ( $handle ) {
-                $fopen  = fopen( $destination_file, 'wb' );
-                if ( $fopen ) {
-                    while ( ( $data = gzread( $handle, 4096 ) ) != false ) {
-                        fwrite( $fopen, $data );
+            if ($handle) {
+                $fopen = fopen($destination_file, 'wb');
+                if ($fopen) {
+                    while (($data = gzread($handle, 4096)) != false) {
+                        fwrite($fopen, $data);
                     }
 
-                    gzclose( $handle );
-                    fclose( $fopen );
+                    gzclose($handle);
+                    fclose($fopen);
                         
                     $success = true;
                 } else {
-                    gzclose( $handle );
-                    $message = sprintf( __( 'Error could not open destination GeoIp2 database file for writing: %s', 'invoicing' ), $destination_file );
+                    gzclose($handle);
+                    $message = sprintf(__('Error could not open destination GeoIp2 database file for writing: %s', 'invoicing'), $destination_file);
                 }
             } else {
-                $message = sprintf( __( 'Error could not open GeoIp2 database file for reading: %s', 'invoicing' ), $temp_file );
+                $message = sprintf(__('Error could not open GeoIp2 database file for reading: %s', 'invoicing'), $temp_file);
             }
             
-            if ( file_exists( $temp_file ) ) {
-                unlink( $temp_file );
+            if (file_exists($temp_file)) {
+                unlink($temp_file);
             }
         }
         
@@ -460,11 +460,11 @@ 
     }
     
     public static function load_geoip2() {
-        if ( defined( 'WPINV_GEOIP2_LODDED' ) ) {
+        if (defined('WPINV_GEOIP2_LODDED')) {
             return;
         }
         
-        if ( !class_exists( '\MaxMind\Db\Reader' ) ) {
+        if (!class_exists('\MaxMind\Db\Reader')) {
             $maxmind_db_files = array(
                 'Reader/Decoder.php',
                 'Reader/InvalidDatabaseException.php',
@@ -473,12 +473,12 @@ 
                 'Reader.php',
             );
             
-            foreach ( $maxmind_db_files as $key => $file ) {
-                require_once( WPINV_PLUGIN_DIR . 'includes/libraries/MaxMind/Db/' . $file );
+            foreach ($maxmind_db_files as $key => $file) {
+                require_once(WPINV_PLUGIN_DIR . 'includes/libraries/MaxMind/Db/' . $file);
             }
         }
         
-        if ( !class_exists( '\GeoIp2\Database\Reader' ) ) {        
+        if (!class_exists('\GeoIp2\Database\Reader')) {        
             $geoip2_files = array(
                 'ProviderInterface.php',
                 'Compat/JsonSerializable.php',
@@ -512,23 +512,23 @@ 
                 'WebService/Client.php',
             );
             
-            foreach ( $geoip2_files as $key => $file ) {
-                require_once( WPINV_PLUGIN_DIR . 'includes/libraries/GeoIp2/' . $file );
+            foreach ($geoip2_files as $key => $file) {
+                require_once(WPINV_PLUGIN_DIR . 'includes/libraries/GeoIp2/' . $file);
             }
         }
 
-        define( 'WPINV_GEOIP2_LODDED', true );
+        define('WPINV_GEOIP2_LODDED', true);
     }
 
     public static function geoip2_country_dbfile() {
         $upload_dir = wp_upload_dir();
 
-        if ( !isset( $upload_dir['basedir'] ) ) {
+        if (!isset($upload_dir['basedir'])) {
             return false;
         }
 
         $filename = $upload_dir['basedir'] . '/invoicing/GeoLite2-Country.mmdb';
-        if ( !file_exists( $filename ) ) {
+        if (!file_exists($filename)) {
             return false;
         }
         
@@ -538,12 +538,12 @@ 
     public static function geoip2_city_dbfile() {
         $upload_dir = wp_upload_dir();
 
-        if ( !isset( $upload_dir['basedir'] ) ) {
+        if (!isset($upload_dir['basedir'])) {
             return false;
         }
 
         $filename = $upload_dir['basedir'] . '/invoicing/GeoLite2-City.mmdb';
-        if ( !file_exists( $filename ) ) {
+        if (!file_exists($filename)) {
             return false;
         }
         
@@ -554,10 +554,10 @@ 
         try {
             self::load_geoip2();
 
-            if ( $filename = self::geoip2_country_dbfile() ) {
-                return new \GeoIp2\Database\Reader( $filename );
+            if ($filename = self::geoip2_country_dbfile()) {
+                return new \GeoIp2\Database\Reader($filename);
             }
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
         
@@ -568,173 +568,173 @@ 
         try {
             self::load_geoip2();
 
-            if ( $filename = self::geoip2_city_dbfile() ) {
-                return new \GeoIp2\Database\Reader( $filename );
+            if ($filename = self::geoip2_city_dbfile()) {
+                return new \GeoIp2\Database\Reader($filename);
             }
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
         
         return false;
     }
 
-    public static function geoip2_country_record( $ip_address ) {
+    public static function geoip2_country_record($ip_address) {
         try {
             $reader = self::geoip2_country_reader();
 
-            if ( $reader ) {
-                $record = $reader->country( $ip_address );
+            if ($reader) {
+                $record = $reader->country($ip_address);
                 
-                if ( !empty( $record->country->isoCode ) ) {
+                if (!empty($record->country->isoCode)) {
                     return $record;
                 }
             }
-        } catch(\InvalidArgumentException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\InvalidArgumentException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
             
             return false;
-        } catch(\GeoIp2\Exception\AddressNotFoundException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\GeoIp2\Exception\AddressNotFoundException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
             
             return false;
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
         
         return false;
     }
 
-    public static function geoip2_city_record( $ip_address ) {
+    public static function geoip2_city_record($ip_address) {
         try {
             $reader = self::geoip2_city_reader();
 
-            if ( $reader ) {
-                $record = $reader->city( $ip_address );
+            if ($reader) {
+                $record = $reader->city($ip_address);
                 
-                if ( !empty( $record->country->isoCode ) ) {
+                if (!empty($record->country->isoCode)) {
                     return $record;
                 }
             }
-        } catch(\InvalidArgumentException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\InvalidArgumentException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
             
             return false;
-        } catch(\GeoIp2\Exception\AddressNotFoundException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\GeoIp2\Exception\AddressNotFoundException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
             
             return false;
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
         
         return false;
     }
 
-    public static function geoip2_country_code( $ip_address ) {
-        $record = self::geoip2_country_record( $ip_address );
-        return !empty( $record->country->isoCode ) ? $record->country->isoCode : wpinv_get_default_country();
+    public static function geoip2_country_code($ip_address) {
+        $record = self::geoip2_country_record($ip_address);
+        return !empty($record->country->isoCode) ? $record->country->isoCode : wpinv_get_default_country();
     }
 
     // Find country by IP address.
-    public static function get_country_by_ip( $ip = '' ) {
+    public static function get_country_by_ip($ip = '') {
         global $wpinv_ip_address_country;
         
-        if ( !empty( $wpinv_ip_address_country ) ) {
+        if (!empty($wpinv_ip_address_country)) {
             return $wpinv_ip_address_country;
         }
         
-        if ( empty( $ip ) ) {
+        if (empty($ip)) {
             $ip = wpinv_get_ip();
         }
 
-        $ip_country_service = wpinv_get_option( 'vat_ip_lookup' );
-        $is_default         = empty( $ip_country_service ) || $ip_country_service === 'default' ? true : false;
+        $ip_country_service = wpinv_get_option('vat_ip_lookup');
+        $is_default         = empty($ip_country_service) || $ip_country_service === 'default' ? true : false;
 
-        if ( !empty( $ip ) && $ip !== '127.0.0.1' ) { // For 127.0.0.1(localhost) use default country.
-            if ( function_exists( 'geoip_country_code_by_name') && ( $ip_country_service === 'geoip' || $is_default ) ) {
+        if (!empty($ip) && $ip !== '127.0.0.1') { // For 127.0.0.1(localhost) use default country.
+            if (function_exists('geoip_country_code_by_name') && ($ip_country_service === 'geoip' || $is_default)) {
                 try {
-                    $wpinv_ip_address_country = geoip_country_code_by_name( $ip );
-                } catch( Exception $e ) {
-                    wpinv_error_log( $e->getMessage(), 'GeoIP Lookup( ' . $ip . ' )' );
+                    $wpinv_ip_address_country = geoip_country_code_by_name($ip);
+                } catch (Exception $e) {
+                    wpinv_error_log($e->getMessage(), 'GeoIP Lookup( ' . $ip . ' )');
                 }
-            } else if ( self::geoip2_country_dbfile() && ( $ip_country_service === 'geoip2' || $is_default ) ) {
-                $wpinv_ip_address_country = self::geoip2_country_code( $ip );
-            } else if ( function_exists( 'simplexml_load_file' ) && ( $ip_country_service === 'geoplugin' || $is_default ) ) {
-                $load_xml = simplexml_load_file( 'http://www.geoplugin.net/xml.gp?ip=' . $ip );
+            } else if (self::geoip2_country_dbfile() && ($ip_country_service === 'geoip2' || $is_default)) {
+                $wpinv_ip_address_country = self::geoip2_country_code($ip);
+            } else if (function_exists('simplexml_load_file') && ($ip_country_service === 'geoplugin' || $is_default)) {
+                $load_xml = simplexml_load_file('http://www.geoplugin.net/xml.gp?ip=' . $ip);
                 
-                if ( !empty( $load_xml ) && !empty( $load_xml->geoplugin_countryCode ) ) {
+                if (!empty($load_xml) && !empty($load_xml->geoplugin_countryCode)) {
                     $wpinv_ip_address_country = (string)$load_xml->geoplugin_countryCode;
                 }
             }
         }
 
-        if ( empty( $wpinv_ip_address_country ) ) {
+        if (empty($wpinv_ip_address_country)) {
             $wpinv_ip_address_country = wpinv_get_default_country();
         }
 
         return $wpinv_ip_address_country;
     }
     
-    public static function sanitize_vat_settings( $input ) {
+    public static function sanitize_vat_settings($input) {
         global $wpinv_options;
         
         $valid      = false;
         $message    = '';
         
-        if ( !empty( $wpinv_options['vat_vies_check'] ) ) {
-            if ( empty( $wpinv_options['vat_offline_check'] ) ) {
-                $valid = self::offline_check( $input['vat_number'] );
+        if (!empty($wpinv_options['vat_vies_check'])) {
+            if (empty($wpinv_options['vat_offline_check'])) {
+                $valid = self::offline_check($input['vat_number']);
             } else {
                 $valid = true;
             }
             
-            $message = $valid ? '' : __( 'VAT number not validated', 'invoicing' );
+            $message = $valid ? '' : __('VAT number not validated', 'invoicing');
         } else {
-            $result = self::check_vat( $input['vat_number'] );
+            $result = self::check_vat($input['vat_number']);
             
-            if ( empty( $result['valid'] ) ) {
+            if (empty($result['valid'])) {
                 $valid      = false;
                 $message    = $result['message'];
             } else {
-                $valid      = ( isset( $result['company'] ) && ( $result['company'] == '---' || ( strcasecmp( trim( $result['company'] ), trim( $input['vat_company_name'] ) ) == 0 ) ) ) || !empty( $wpinv_options['vat_disable_company_name_check'] );
-                $message    = $valid ? '' : __( 'The company name associated with the VAT number provided is not the same as the company name provided.', 'invoicing' );
+                $valid      = (isset($result['company']) && ($result['company'] == '---' || (strcasecmp(trim($result['company']), trim($input['vat_company_name'])) == 0))) || !empty($wpinv_options['vat_disable_company_name_check']);
+                $message    = $valid ? '' : __('The company name associated with the VAT number provided is not the same as the company name provided.', 'invoicing');
             }
         }
 
-        if ( $message && self::is_vat_validated() != $valid ) {
-            add_settings_error( 'wpinv-notices', '', $message, ( $valid ? 'updated' : 'error' ) );
+        if ($message && self::is_vat_validated() != $valid) {
+            add_settings_error('wpinv-notices', '', $message, ($valid ? 'updated' : 'error'));
         }
 
         $input['vat_valid'] = $valid;
         return $input;
     }
     
-    public static function sanitize_vat_rates( $input ) {
-        if( !current_user_can( 'manage_options' ) ) {
-            add_settings_error( 'wpinv-notices', '', __( 'Your account does not have permission to add rate classes.', 'invoicing' ), 'error' );
+    public static function sanitize_vat_rates($input) {
+        if (!current_user_can('manage_options')) {
+            add_settings_error('wpinv-notices', '', __('Your account does not have permission to add rate classes.', 'invoicing'), 'error');
             return $input;
         }
         
         $vat_classes = self::get_rate_classes();
-        $vat_class = !empty( $_REQUEST['wpi_vat_class'] ) && isset( $vat_classes[$_REQUEST['wpi_vat_class']] )? sanitize_text_field( $_REQUEST['wpi_vat_class'] ) : '';
+        $vat_class = !empty($_REQUEST['wpi_vat_class']) && isset($vat_classes[$_REQUEST['wpi_vat_class']]) ? sanitize_text_field($_REQUEST['wpi_vat_class']) : '';
         
-        if ( empty( $vat_class ) ) {
-            add_settings_error( 'wpinv-notices', '', __( 'No valid VAT rates class contained in the request to save rates.', 'invoicing' ), 'error' );
+        if (empty($vat_class)) {
+            add_settings_error('wpinv-notices', '', __('No valid VAT rates class contained in the request to save rates.', 'invoicing'), 'error');
             
             return $input;
         }
 
-        $new_rates = ! empty( $_POST['vat_rates'] ) ? array_values( $_POST['vat_rates'] ) : array();
+        $new_rates = !empty($_POST['vat_rates']) ? array_values($_POST['vat_rates']) : array();
 
-        if ( $vat_class === '_standard' ) {
+        if ($vat_class === '_standard') {
             // Save the active rates in the invoice settings
-            update_option( 'wpinv_tax_rates', $new_rates );
+            update_option('wpinv_tax_rates', $new_rates);
         } else {
             // Get the existing set of rates
             $rates = self::get_non_standard_rates();
             $rates[$vat_class] = $new_rates;
 
-            update_option( 'wpinv_vat_rates', $rates );
+            update_option('wpinv_vat_rates', $rates);
         }
         
         return $input;
@@ -744,71 +744,71 @@ 
         $response = array();
         $response['success'] = false;
         
-        if ( !current_user_can( 'manage_options' ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!current_user_can('manage_options')) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
         
-        $vat_class_name = !empty( $_POST['name'] ) ? sanitize_text_field( $_POST['name'] ) : false;
-        $vat_class_desc = !empty( $_POST['desc'] ) ? sanitize_text_field( $_POST['desc'] ) : false;
+        $vat_class_name = !empty($_POST['name']) ? sanitize_text_field($_POST['name']) : false;
+        $vat_class_desc = !empty($_POST['desc']) ? sanitize_text_field($_POST['desc']) : false;
         
-        if ( empty( $vat_class_name ) ) {
-            $response['error'] = __( 'Select the VAT rate name', 'invoicing' );
-            wp_send_json( $response );
+        if (empty($vat_class_name)) {
+            $response['error'] = __('Select the VAT rate name', 'invoicing');
+            wp_send_json($response);
         }
         
         $vat_classes = (array)self::get_rate_classes();
 
-        if ( !empty( $vat_classes ) && in_array( strtolower( $vat_class_name ), array_map( 'strtolower', array_values( $vat_classes ) ) ) ) {
-            $response['error'] = wp_sprintf( __( 'A VAT Rate name "%s" already exists', 'invoicing' ), $vat_class_name );
-            wp_send_json( $response );
+        if (!empty($vat_classes) && in_array(strtolower($vat_class_name), array_map('strtolower', array_values($vat_classes)))) {
+            $response['error'] = wp_sprintf(__('A VAT Rate name "%s" already exists', 'invoicing'), $vat_class_name);
+            wp_send_json($response);
         }
         
-        $rate_class_key = normalize_whitespace( 'wpi-' . $vat_class_name );
-        $rate_class_key = sanitize_key( str_replace( " ", "-", $rate_class_key ) );
+        $rate_class_key = normalize_whitespace('wpi-' . $vat_class_name);
+        $rate_class_key = sanitize_key(str_replace(" ", "-", $rate_class_key));
         
-        $vat_classes = (array)self::get_rate_classes( true );
-        $vat_classes[$rate_class_key] = array( 'name' => $vat_class_name, 'desc' => $vat_class_desc );
+        $vat_classes = (array)self::get_rate_classes(true);
+        $vat_classes[$rate_class_key] = array('name' => $vat_class_name, 'desc' => $vat_class_desc);
         
-        update_option( '_wpinv_vat_rate_classes', $vat_classes );
+        update_option('_wpinv_vat_rate_classes', $vat_classes);
         
         $response['success'] = true;
-        $response['redirect'] = admin_url( 'admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=' . $rate_class_key );
+        $response['redirect'] = admin_url('admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=' . $rate_class_key);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function delete_class() {
         $response = array();
         $response['success'] = false;
         
-        if ( !current_user_can( 'manage_options' ) || !isset( $_POST['class'] ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!current_user_can('manage_options') || !isset($_POST['class'])) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
         
-        $vat_class = isset( $_POST['class'] ) && $_POST['class'] !== '' ? sanitize_text_field( $_POST['class'] ) : false;
+        $vat_class = isset($_POST['class']) && $_POST['class'] !== '' ? sanitize_text_field($_POST['class']) : false;
         $vat_classes = (array)self::get_rate_classes();
 
-        if ( !isset( $vat_classes[$vat_class] ) ) {
-            $response['error'] = __( 'Requested class does not exists', 'invoicing' );
-            wp_send_json( $response );
+        if (!isset($vat_classes[$vat_class])) {
+            $response['error'] = __('Requested class does not exists', 'invoicing');
+            wp_send_json($response);
         }
         
-        if ( $vat_class == '_new' || $vat_class == '_standard' ) {
-            $response['error'] = __( 'You can not delete standard rates class', 'invoicing' );
-            wp_send_json( $response );
+        if ($vat_class == '_new' || $vat_class == '_standard') {
+            $response['error'] = __('You can not delete standard rates class', 'invoicing');
+            wp_send_json($response);
         }
             
-        $vat_classes = (array)self::get_rate_classes( true );
-        unset( $vat_classes[$vat_class] );
+        $vat_classes = (array)self::get_rate_classes(true);
+        unset($vat_classes[$vat_class]);
         
-        update_option( '_wpinv_vat_rate_classes', $vat_classes );
+        update_option('_wpinv_vat_rate_classes', $vat_classes);
         
         $response['success'] = true;
-        $response['redirect'] = admin_url( 'admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=_new' );
+        $response['redirect'] = admin_url('admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=_new');
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function update_eu_rates() {        
@@ -817,72 +817,72 @@ 
         $response['error']      = null;
         $response['data']       = null;
         
-        if ( !current_user_can( 'manage_options' ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!current_user_can('manage_options')) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
         
-        $group      = !empty( $_POST['group'] ) ? sanitize_text_field( $_POST['group'] ) : '';
-        $euvatrates = self::request_euvatrates( $group );
+        $group      = !empty($_POST['group']) ? sanitize_text_field($_POST['group']) : '';
+        $euvatrates = self::request_euvatrates($group);
         
-        if ( !empty( $euvatrates ) ) {
-            if ( !empty( $euvatrates['success'] ) && !empty( $euvatrates['rates'] ) ) {
+        if (!empty($euvatrates)) {
+            if (!empty($euvatrates['success']) && !empty($euvatrates['rates'])) {
                 $response['success']        = true;
                 $response['data']['rates']  = $euvatrates['rates'];
-            } else if ( !empty( $euvatrates['error'] ) ) {
+            } else if (!empty($euvatrates['error'])) {
                 $response['error']          = $euvatrates['error'];
             }
         }
             
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function hide_vat_fields() {
-        $hide = wpinv_get_option( 'vat_disable_fields' );
+        $hide = wpinv_get_option('vat_disable_fields');
         
-        return apply_filters( 'wpinv_hide_vat_fields', $hide );
+        return apply_filters('wpinv_hide_vat_fields', $hide);
     }
     
     public static function same_country_rule() {
-        $same_country_rule = wpinv_get_option( 'vat_same_country_rule' );
+        $same_country_rule = wpinv_get_option('vat_same_country_rule');
         
-        return apply_filters( 'wpinv_vat_same_country_rule', $same_country_rule );
+        return apply_filters('wpinv_vat_same_country_rule', $same_country_rule);
     }
     
     public static function get_vat_name() {
-        $vat_name   = wpinv_get_option( 'vat_name' );
-        $vat_name   = !empty( $vat_name ) ? $vat_name : 'VAT';
+        $vat_name   = wpinv_get_option('vat_name');
+        $vat_name   = !empty($vat_name) ? $vat_name : 'VAT';
         
-        return apply_filters( 'wpinv_get_owner_vat_name', $vat_name );
+        return apply_filters('wpinv_get_owner_vat_name', $vat_name);
     }
     
     public static function get_company_name() {
-        $company_name = wpinv_get_option( 'vat_company_name' );
+        $company_name = wpinv_get_option('vat_company_name');
         
-        return apply_filters( 'wpinv_get_owner_company_name', $company_name );
+        return apply_filters('wpinv_get_owner_company_name', $company_name);
     }
     
     public static function get_vat_number() {
-        $vat_number = wpinv_get_option( 'vat_number' );
+        $vat_number = wpinv_get_option('vat_number');
         
-        return apply_filters( 'wpinv_get_owner_vat_number', $vat_number );
+        return apply_filters('wpinv_get_owner_vat_number', $vat_number);
     }
     
     public static function is_vat_validated() {
-        $validated = self::get_vat_number() && wpinv_get_option( 'vat_valid' );
+        $validated = self::get_vat_number() && wpinv_get_option('vat_valid');
         
-        return apply_filters( 'wpinv_is_owner_vat_validated', $validated );
+        return apply_filters('wpinv_is_owner_vat_validated', $validated);
     }
     
-    public static function sanitize_vat( $vat_number, $country_code = '' ) {        
-        $vat_number = str_replace( array(' ', '.', '-', '_', ',' ), '', strtoupper( trim( $vat_number ) ) );
+    public static function sanitize_vat($vat_number, $country_code = '') {        
+        $vat_number = str_replace(array(' ', '.', '-', '_', ','), '', strtoupper(trim($vat_number)));
         
-        if ( empty( $country_code ) ) {
-            $country_code = substr( $vat_number, 0, 2 );
+        if (empty($country_code)) {
+            $country_code = substr($vat_number, 0, 2);
         }
         
-        if ( strpos( $vat_number , $country_code ) === 0 ) {
-            $vat = str_replace( $country_code, '', $vat_number );
+        if (strpos($vat_number, $country_code) === 0) {
+            $vat = str_replace($country_code, '', $vat_number);
         } else {
             $vat = $country_code . $vat_number;
         }
@@ -895,140 +895,140 @@ 
         return $return;
     }
     
-    public static function offline_check( $vat_number, $country_code = '', $formatted = false ) {
-        $vat            = self::sanitize_vat( $vat_number, $country_code );
+    public static function offline_check($vat_number, $country_code = '', $formatted = false) {
+        $vat            = self::sanitize_vat($vat_number, $country_code);
         $vat_number     = $vat['vat_number'];
         $country_code   = $vat['iso'];
         $regex          = array();
         
-        switch ( $country_code ) {
+        switch ($country_code) {
             case 'AT':
-                $regex[] = '/^(AT)U(\d{8})$/';                           // Austria
+                $regex[] = '/^(AT)U(\d{8})$/'; // Austria
                 break;
             case 'BE':
-                $regex[] = '/^(BE)(0?\d{9})$/';                          // Belgium
+                $regex[] = '/^(BE)(0?\d{9})$/'; // Belgium
                 break;
             case 'BG':
-                $regex[] = '/^(BG)(\d{9,10})$/';                         // Bulgaria
+                $regex[] = '/^(BG)(\d{9,10})$/'; // Bulgaria
                 break;
             case 'CH':
             case 'CHE':
-                $regex[] = '/^(CHE)(\d{9})MWST$/';                       // Switzerland (Not EU)
+                $regex[] = '/^(CHE)(\d{9})MWST$/'; // Switzerland (Not EU)
                 break;
             case 'CY':
-                $regex[] = '/^(CY)([0-5|9]\d{7}[A-Z])$/';                // Cyprus
+                $regex[] = '/^(CY)([0-5|9]\d{7}[A-Z])$/'; // Cyprus
                 break;
             case 'CZ':
-                $regex[] = '/^(CZ)(\d{8,13})$/';                         // Czech Republic
+                $regex[] = '/^(CZ)(\d{8,13})$/'; // Czech Republic
                 break;
             case 'DE':
-                $regex[] = '/^(DE)([1-9]\d{8})$/';                       // Germany
+                $regex[] = '/^(DE)([1-9]\d{8})$/'; // Germany
                 break;
             case 'DK':
-                $regex[] = '/^(DK)(\d{8})$/';                            // Denmark
+                $regex[] = '/^(DK)(\d{8})$/'; // Denmark
                 break;
             case 'EE':
-                $regex[] = '/^(EE)(10\d{7})$/';                          // Estonia
+                $regex[] = '/^(EE)(10\d{7})$/'; // Estonia
                 break;
             case 'EL':
-                $regex[] = '/^(EL)(\d{9})$/';                            // Greece
+                $regex[] = '/^(EL)(\d{9})$/'; // Greece
                 break;
             case 'ES':
-                $regex[] = '/^(ES)([A-Z]\d{8})$/';                       // Spain (National juridical entities)
-                $regex[] = '/^(ES)([A-H|N-S|W]\d{7}[A-J])$/';            // Spain (Other juridical entities)
-                $regex[] = '/^(ES)([0-9|Y|Z]\d{7}[A-Z])$/';              // Spain (Personal entities type 1)
-                $regex[] = '/^(ES)([K|L|M|X]\d{7}[A-Z])$/';              // Spain (Personal entities type 2)
+                $regex[] = '/^(ES)([A-Z]\d{8})$/'; // Spain (National juridical entities)
+                $regex[] = '/^(ES)([A-H|N-S|W]\d{7}[A-J])$/'; // Spain (Other juridical entities)
+                $regex[] = '/^(ES)([0-9|Y|Z]\d{7}[A-Z])$/'; // Spain (Personal entities type 1)
+                $regex[] = '/^(ES)([K|L|M|X]\d{7}[A-Z])$/'; // Spain (Personal entities type 2)
                 break;
             case 'EU':
-                $regex[] = '/^(EU)(\d{9})$/';                            // EU-type
+                $regex[] = '/^(EU)(\d{9})$/'; // EU-type
                 break;
             case 'FI':
-                $regex[] = '/^(FI)(\d{8})$/';                            // Finland
+                $regex[] = '/^(FI)(\d{8})$/'; // Finland
                 break;
             case 'FR':
-                $regex[] = '/^(FR)(\d{11})$/';                           // France (1)
-                $regex[] = '/^(FR)[(A-H)|(J-N)|(P-Z)](\d{10})$/';        // France (2)
-                $regex[] = '/^(FR)\d[(A-H)|(J-N)|(P-Z)](\d{9})$/';       // France (3)
-                $regex[] = '/^(FR)[(A-H)|(J-N)|(P-Z)]{2}(\d{9})$/';      // France (4)
+                $regex[] = '/^(FR)(\d{11})$/'; // France (1)
+                $regex[] = '/^(FR)[(A-H)|(J-N)|(P-Z)](\d{10})$/'; // France (2)
+                $regex[] = '/^(FR)\d[(A-H)|(J-N)|(P-Z)](\d{9})$/'; // France (3)
+                $regex[] = '/^(FR)[(A-H)|(J-N)|(P-Z)]{2}(\d{9})$/'; // France (4)
                 break;
             case 'GB':
-                $regex[] = '/^(GB)?(\d{9})$/';                           // UK (Standard)
-                $regex[] = '/^(GB)?(\d{12})$/';                          // UK (Branches)
-                $regex[] = '/^(GB)?(GD\d{3})$/';                         // UK (Government)
-                $regex[] = '/^(GB)?(HA\d{3})$/';                         // UK (Health authority)
+                $regex[] = '/^(GB)?(\d{9})$/'; // UK (Standard)
+                $regex[] = '/^(GB)?(\d{12})$/'; // UK (Branches)
+                $regex[] = '/^(GB)?(GD\d{3})$/'; // UK (Government)
+                $regex[] = '/^(GB)?(HA\d{3})$/'; // UK (Health authority)
                 break;
             case 'GR':
-                $regex[] = '/^(GR)(\d{8,9})$/';                          // Greece
+                $regex[] = '/^(GR)(\d{8,9})$/'; // Greece
                 break;
             case 'HR':
-                $regex[] = '/^(HR)(\d{11})$/';                           // Croatia
+                $regex[] = '/^(HR)(\d{11})$/'; // Croatia
                 break;
             case 'HU':
-                $regex[] = '/^(HU)(\d{8})$/';                            // Hungary
+                $regex[] = '/^(HU)(\d{8})$/'; // Hungary
                 break;
             case 'IE':
-                $regex[] = '/^(IE)(\d{7}[A-W])$/';                       // Ireland (1)
-                $regex[] = '/^(IE)([7-9][A-Z\*\+)]\d{5}[A-W])$/';        // Ireland (2)
-                $regex[] = '/^(IE)(\d{7}[A-Z][AH])$/';                   // Ireland (3) (new format from 1 Jan 2013)
+                $regex[] = '/^(IE)(\d{7}[A-W])$/'; // Ireland (1)
+                $regex[] = '/^(IE)([7-9][A-Z\*\+)]\d{5}[A-W])$/'; // Ireland (2)
+                $regex[] = '/^(IE)(\d{7}[A-Z][AH])$/'; // Ireland (3) (new format from 1 Jan 2013)
                 break;
             case 'IT':
-                $regex[] = '/^(IT)(\d{11})$/';                           // Italy
+                $regex[] = '/^(IT)(\d{11})$/'; // Italy
                 break;
             case 'LV':
-                $regex[] = '/^(LV)(\d{11})$/';                           // Latvia
+                $regex[] = '/^(LV)(\d{11})$/'; // Latvia
                 break;
             case 'LT':
-                $regex[] = '/^(LT)(\d{9}|\d{12})$/';                     // Lithuania
+                $regex[] = '/^(LT)(\d{9}|\d{12})$/'; // Lithuania
                 break;
             case 'LU':
-                $regex[] = '/^(LU)(\d{8})$/';                            // Luxembourg
+                $regex[] = '/^(LU)(\d{8})$/'; // Luxembourg
                 break;
             case 'MT':
-                $regex[] = '/^(MT)([1-9]\d{7})$/';                       // Malta
+                $regex[] = '/^(MT)([1-9]\d{7})$/'; // Malta
                 break;
             case 'NL':
-                $regex[] = '/^(NL)(\d{9})B\d{2}$/';                      // Netherlands
+                $regex[] = '/^(NL)(\d{9})B\d{2}$/'; // Netherlands
                 break;
             case 'NO':
-                $regex[] = '/^(NO)(\d{9})$/';                            // Norway (Not EU)
+                $regex[] = '/^(NO)(\d{9})$/'; // Norway (Not EU)
                 break;
             case 'PL':
-                $regex[] = '/^(PL)(\d{10})$/';                           // Poland
+                $regex[] = '/^(PL)(\d{10})$/'; // Poland
                 break;
             case 'PT':
-                $regex[] = '/^(PT)(\d{9})$/';                            // Portugal
+                $regex[] = '/^(PT)(\d{9})$/'; // Portugal
                 break;
             case 'RO':
-                $regex[] = '/^(RO)([1-9]\d{1,9})$/';                     // Romania
+                $regex[] = '/^(RO)([1-9]\d{1,9})$/'; // Romania
                 break;
             case 'RS':
-                $regex[] = '/^(RS)(\d{9})$/';                            // Serbia (Not EU)
+                $regex[] = '/^(RS)(\d{9})$/'; // Serbia (Not EU)
                 break;
             case 'SI':
-                $regex[] = '/^(SI)([1-9]\d{7})$/';                       // Slovenia
+                $regex[] = '/^(SI)([1-9]\d{7})$/'; // Slovenia
                 break;
             case 'SK':
-                $regex[] = '/^(SK)([1-9]\d[(2-4)|(6-9)]\d{7})$/';        // Slovakia Republic
+                $regex[] = '/^(SK)([1-9]\d[(2-4)|(6-9)]\d{7})$/'; // Slovakia Republic
                 break;
             case 'SE':
-                $regex[] = '/^(SE)(\d{10}01)$/';                         // Sweden
+                $regex[] = '/^(SE)(\d{10}01)$/'; // Sweden
                 break;
             default:
                 $regex = array();
             break;
         }
         
-        if ( empty( $regex ) ) {
+        if (empty($regex)) {
             return false;
         }
         
-        foreach ( $regex as $pattern ) {
+        foreach ($regex as $pattern) {
             $matches = null;
-            preg_match_all( $pattern, $vat_number, $matches );
+            preg_match_all($pattern, $vat_number, $matches);
             
-            if ( !empty( $matches[1][0] ) && !empty( $matches[2][0] ) ) {
-                if ( $formatted ) {
-                    return array( 'code' => $matches[1][0], 'number' => $matches[2][0] );
+            if (!empty($matches[1][0]) && !empty($matches[2][0])) {
+                if ($formatted) {
+                    return array('code' => $matches[1][0], 'number' => $matches[2][0]);
                 } else {
                     return true;
                 }
@@ -1038,75 +1038,75 @@ 
         return false;
     }
     
-    public static function vies_check( $vat_number, $country_code = '', $result = false ) {
-        $vat            = self::sanitize_vat( $vat_number, $country_code );
+    public static function vies_check($vat_number, $country_code = '', $result = false) {
+        $vat            = self::sanitize_vat($vat_number, $country_code);
         $vat_number     = $vat['vat'];
         $iso            = $vat['iso'];
         
-        $url = 'http://ec.europa.eu/taxation_customs/vies/viesquer.do?ms=' . urlencode( $iso ) . '&iso=' . urlencode( $iso ) . '&vat=' . urlencode( $vat_number );
+        $url = 'http://ec.europa.eu/taxation_customs/vies/viesquer.do?ms=' . urlencode($iso) . '&iso=' . urlencode($iso) . '&vat=' . urlencode($vat_number);
         
-        if ( ini_get( 'allow_url_fopen' ) ) {
-            $response = file_get_contents( $url );
-        } else if ( function_exists( 'curl_init' ) ) {
+        if (ini_get('allow_url_fopen')) {
+            $response = file_get_contents($url);
+        } else if (function_exists('curl_init')) {
             $ch = curl_init();
             
-            curl_setopt( $ch, CURLOPT_URL, $url );
-            curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, 30 );
-            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-            curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, 0 );
-            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, 0 );
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
             
-            $response = curl_exec( $ch );
+            $response = curl_exec($ch);
             
-            if ( curl_errno( $ch ) ) {
-                wpinv_error_log( curl_error( $ch ), 'VIES CHECK ERROR' );
+            if (curl_errno($ch)) {
+                wpinv_error_log(curl_error($ch), 'VIES CHECK ERROR');
                 $response = '';
             }
             
-            curl_close( $ch );
+            curl_close($ch);
         } else {
-            wpinv_error_log( 'To use VIES CHECK you must have allow_url_fopen is ON or cURL installed & active on your server.', 'VIES CHECK ERROR' );
+            wpinv_error_log('To use VIES CHECK you must have allow_url_fopen is ON or cURL installed & active on your server.', 'VIES CHECK ERROR');
         }
         
-        if ( empty( $response ) ) {
+        if (empty($response)) {
             return $result;
         }
 
-        if ( preg_match( '/invalid VAT number/i', $response ) ) {
+        if (preg_match('/invalid VAT number/i', $response)) {
             return false;
-        } else if ( preg_match( '/valid VAT number/i', $response, $matches ) ) {
-            $content = explode( "valid VAT number", htmlentities( $response ) );
+        } else if (preg_match('/valid VAT number/i', $response, $matches)) {
+            $content = explode("valid VAT number", htmlentities($response));
             
-            if ( !empty( $content[1] ) ) {
-                preg_match_all( '/<tr>(.*?)<td.*?>(.*?)<\/td>(.*?)<\/tr>/si', html_entity_decode( $content[1] ), $matches );
+            if (!empty($content[1])) {
+                preg_match_all('/<tr>(.*?)<td.*?>(.*?)<\/td>(.*?)<\/tr>/si', html_entity_decode($content[1]), $matches);
                 
-                if ( !empty( $matches[2] ) && $matches[3] ) {
+                if (!empty($matches[2]) && $matches[3]) {
                     $return = array();
                     
-                    foreach ( $matches[2] as $key => $label ) {
-                        $label = trim( $label );
+                    foreach ($matches[2] as $key => $label) {
+                        $label = trim($label);
                         
-                        switch ( strtolower( $label ) ) {
+                        switch (strtolower($label)) {
                             case 'member state':
-                                $return['state'] = trim( strip_tags( $matches[3][$key] ) );
+                                $return['state'] = trim(strip_tags($matches[3][$key]));
                             break;
                             case 'vat number':
-                                $return['number'] = trim( strip_tags( $matches[3][$key] ) );
+                                $return['number'] = trim(strip_tags($matches[3][$key]));
                             break;
                             case 'name':
-                                $return['company'] = trim( strip_tags( $matches[3][$key] ) );
+                                $return['company'] = trim(strip_tags($matches[3][$key]));
                             break;
                             case 'address':
-                                $address           = str_replace( array( "<br><br>", "<br /><br />", "<br/><br/>" ), "<br>", html_entity_decode( trim( $matches[3][$key] ) ) );
-                                $return['address'] = trim( strip_tags( $address, '<br>' ) );
+                                $address           = str_replace(array("<br><br>", "<br /><br />", "<br/><br/>"), "<br>", html_entity_decode(trim($matches[3][$key])));
+                                $return['address'] = trim(strip_tags($address, '<br>'));
                             break;
                             case 'consultation number':
-                                $return['consultation'] = trim( strip_tags( $matches[3][$key] ) );
+                                $return['consultation'] = trim(strip_tags($matches[3][$key]));
                             break;
                         }
                     }
                     
-                    if ( !empty( $return ) ) {
+                    if (!empty($return)) {
                         return $return;
                     }
                 }
@@ -1118,55 +1118,55 @@ 
         }
     }
     
-    public static function check_vat( $vat_number, $country_code = '' ) {        
+    public static function check_vat($vat_number, $country_code = '') {        
         $vat_name           = self::get_vat_name();
         
         $return             = array();
         $return['valid']    = false;
-        $return['message']  = wp_sprintf( __( '%s number not validated', 'invoicing' ), $vat_name );
+        $return['message']  = wp_sprintf(__('%s number not validated', 'invoicing'), $vat_name);
                 
-        if ( !wpinv_get_option( 'vat_offline_check' ) && !self::offline_check( $vat_number, $country_code ) ) {
+        if (!wpinv_get_option('vat_offline_check') && !self::offline_check($vat_number, $country_code)) {
             return $return;
         }
             
-        $response = self::vies_check( $vat_number, $country_code );
+        $response = self::vies_check($vat_number, $country_code);
         
-        if ( $response ) {
-            $return['valid']    = true;
+        if ($response) {
+            $return['valid'] = true;
             
-            if ( is_array( $response ) ) {
-                $return['company'] = isset( $response['company'] ) ? $response['company'] : '';
-                $return['address'] = isset( $response['address'] ) ? $response['address'] : '';
+            if (is_array($response)) {
+                $return['company'] = isset($response['company']) ? $response['company'] : '';
+                $return['address'] = isset($response['address']) ? $response['address'] : '';
                 $return['message'] = $return['company'] . '<br/>' . $return['address'];
             }
         } else {
             $return['valid']    = false;
-            $return['message']  = wp_sprintf( __( 'Fail to validate the %s number: EU Commission VAT server (VIES) check fails.', 'invoicing' ), $vat_name );
+            $return['message']  = wp_sprintf(__('Fail to validate the %s number: EU Commission VAT server (VIES) check fails.', 'invoicing'), $vat_name);
         }
         
         return $return;
     }
     
-    public static function request_euvatrates( $group ) {
+    public static function request_euvatrates($group) {
         $response               = array();
         $response['success']    = false;
         $response['error']      = null;
         $response['eurates']    = null;
         
         $euvatrates_url = 'https://euvatrates.com/rates.json';
-        $euvatrates_url = apply_filters( 'wpinv_euvatrates_url', $euvatrates_url );
-        $api_response   = wp_remote_get( $euvatrates_url );
+        $euvatrates_url = apply_filters('wpinv_euvatrates_url', $euvatrates_url);
+        $api_response   = wp_remote_get($euvatrates_url);
     
         try {
-            if ( is_wp_error( $api_response ) ) {
-                $response['error']      = __( $api_response->get_error_message(), 'invoicing' );
+            if (is_wp_error($api_response)) {
+                $response['error'] = __($api_response->get_error_message(), 'invoicing');
             } else {
-                $body = json_decode( $api_response['body'] );
+                $body = json_decode($api_response['body']);
                 
-                if ( isset( $body->rates ) ) {
+                if (isset($body->rates)) {
                     $rates = array();
                     
-                    foreach ( $body->rates as $country_code => $rate ) {
+                    foreach ($body->rates as $country_code => $rate) {
                         $vat_rate = array();
                         $vat_rate['country']        = $rate->country;
                         $vat_rate['standard']       = (float)$rate->standard_rate;
@@ -1174,7 +1174,7 @@ 
                         $vat_rate['superreduced']   = (float)$rate->super_reduced_rate;
                         $vat_rate['parking']        = (float)$rate->parking_rate;
                         
-                        if ( $group !== '' && in_array( $group, array( 'standard', 'reduced', 'superreduced', 'parking' ) ) ) {
+                        if ($group !== '' && in_array($group, array('standard', 'reduced', 'superreduced', 'parking'))) {
                             $vat_rate_group = array();
                             $vat_rate_group['country'] = $rate->country;
                             $vat_rate_group[$group]    = $vat_rate[$group];
@@ -1186,79 +1186,79 @@ 
                     }
                     
                     $response['success']    = true;                                
-                    $response['rates']      = apply_filters( 'wpinv_process_euvatrates', $rates, $api_response, $group );
+                    $response['rates']      = apply_filters('wpinv_process_euvatrates', $rates, $api_response, $group);
                 } else {
-                    $response['error']      = __( 'No EU rates found!', 'invoicing' );
+                    $response['error']      = __('No EU rates found!', 'invoicing');
                 }
             }
-        } catch ( Exception $e ) {
-            $response['error'] = __( $e->getMessage(), 'invoicing' );
+        } catch (Exception $e) {
+            $response['error'] = __($e->getMessage(), 'invoicing');
         }
         
-        return apply_filters( 'wpinv_response_euvatrates', $response, $group );
+        return apply_filters('wpinv_response_euvatrates', $response, $group);
     }    
     
-    public static function requires_vat( $requires_vat = false, $user_id = 0, $is_digital = null ) {
+    public static function requires_vat($requires_vat = false, $user_id = 0, $is_digital = null) {
         global $wpi_item_id, $wpi_country;
         
-        if ( !empty( $_POST['wpinv_country'] ) ) {
-            $country_code = trim( $_POST['wpinv_country'] );
-        } else if ( !empty( $_POST['country'] ) ) {
-            $country_code = trim( $_POST['country'] );
-        } else if ( !empty( $wpi_country ) ) {
+        if (!empty($_POST['wpinv_country'])) {
+            $country_code = trim($_POST['wpinv_country']);
+        } else if (!empty($_POST['country'])) {
+            $country_code = trim($_POST['country']);
+        } else if (!empty($wpi_country)) {
             $country_code = $wpi_country;
         } else {
-            $country_code = self::get_user_country( '', $user_id );
+            $country_code = self::get_user_country('', $user_id);
         }
         
-        if ( $is_digital === null && $wpi_item_id ) {
-            $is_digital = $wpi_item_id ? self::item_has_digital_rule( $wpi_item_id ) : self::allow_vat_rules();
+        if ($is_digital === null && $wpi_item_id) {
+            $is_digital = $wpi_item_id ? self::item_has_digital_rule($wpi_item_id) : self::allow_vat_rules();
         }
         
-        if ( !empty( $country_code ) ) {
-            $requires_vat = ( self::is_eu_state( $country_code ) && ( self::is_eu_state( self::$default_country ) || $is_digital ) ) || ( self::is_gst_country( $country_code ) && self::is_gst_country( self::$default_country ) );
+        if (!empty($country_code)) {
+            $requires_vat = (self::is_eu_state($country_code) && (self::is_eu_state(self::$default_country) || $is_digital)) || (self::is_gst_country($country_code) && self::is_gst_country(self::$default_country));
         }
         
-        return apply_filters( 'wpinv_requires_vat', $requires_vat, $user_id );
+        return apply_filters('wpinv_requires_vat', $requires_vat, $user_id);
     }
     
-    public static function tax_label( $label = '' ) {
+    public static function tax_label($label = '') {
         global $wpi_requires_vat;
         
-        if ( !( $wpi_requires_vat !== 0 && $wpi_requires_vat ) ) {
-            $wpi_requires_vat = self::requires_vat( 0, false );
+        if (!($wpi_requires_vat !== 0 && $wpi_requires_vat)) {
+            $wpi_requires_vat = self::requires_vat(0, false);
         }
         
-        return $wpi_requires_vat ? __( self::get_vat_name(), 'invoicing' ) : ( $label ? $label : __( 'Tax', 'invoicing' ) );
+        return $wpi_requires_vat ? __(self::get_vat_name(), 'invoicing') : ($label ? $label : __('Tax', 'invoicing'));
     }
     
     public static function standard_rates_label() {
-        return __( 'Standard Rates', 'invoicing' );
+        return __('Standard Rates', 'invoicing');
     }
     
-    public static function get_rate_classes( $with_desc = false ) {        
-        $rate_classes_option = get_option( '_wpinv_vat_rate_classes', true );
-        $classes = maybe_unserialize( $rate_classes_option );
+    public static function get_rate_classes($with_desc = false) {        
+        $rate_classes_option = get_option('_wpinv_vat_rate_classes', true);
+        $classes = maybe_unserialize($rate_classes_option);
         
-        if ( empty( $classes ) || !is_array( $classes ) ) {
+        if (empty($classes) || !is_array($classes)) {
             $classes = array();
         }
 
         $rate_classes = array();
-        if ( !array_key_exists( '_standard', $classes ) ) {
-            if ( $with_desc ) {
-                $rate_classes['_standard'] = array( 'name' => self::standard_rates_label(), 'desc' => __( 'EU member states standard VAT rates', 'invoicing' ) );
+        if (!array_key_exists('_standard', $classes)) {
+            if ($with_desc) {
+                $rate_classes['_standard'] = array('name' => self::standard_rates_label(), 'desc' => __('EU member states standard VAT rates', 'invoicing'));
             } else {
                 $rate_classes['_standard'] = self::standard_rates_label();
             }
         }
         
-        foreach ( $classes as $key => $class ) {
-            $name = !empty( $class['name'] ) ? __( $class['name'], 'invoicing' ) : $key;
-            $desc = !empty( $class['desc'] ) ? __( $class['desc'], 'invoicing' ) : '';
+        foreach ($classes as $key => $class) {
+            $name = !empty($class['name']) ? __($class['name'], 'invoicing') : $key;
+            $desc = !empty($class['desc']) ? __($class['desc'], 'invoicing') : '';
             
-            if ( $with_desc ) {
-                $rate_classes[$key] = array( 'name' => $name, 'desc' => $desc );
+            if ($with_desc) {
+                $rate_classes[$key] = array('name' => $name, 'desc' => $desc);
             } else {
                 $rate_classes[$key] = $name;
             }
@@ -1269,15 +1269,15 @@ 
     
     public static function get_all_classes() {        
         $classes            = self::get_rate_classes();
-        $classes['_exempt'] = __( 'Exempt (0%)', 'invoicing' );
+        $classes['_exempt'] = __('Exempt (0%)', 'invoicing');
         
-        return apply_filters( 'wpinv_vat_get_all_classes', $classes );
+        return apply_filters('wpinv_vat_get_all_classes', $classes);
     }
     
-    public static function get_class_desc( $rate_class ) {        
-        $rate_classes = self::get_rate_classes( true );
+    public static function get_class_desc($rate_class) {        
+        $rate_classes = self::get_rate_classes(true);
 
-        if ( !empty( $rate_classes ) && isset( $rate_classes[$rate_class] ) && isset( $rate_classes[$rate_class]['desc'] ) ) {
+        if (!empty($rate_classes) && isset($rate_classes[$rate_class]) && isset($rate_classes[$rate_class]['desc'])) {
             return $rate_classes[$rate_class]['desc'];
         }
         
@@ -1293,106 +1293,106 @@ 
             'increased'     => 'Increased'
         );
         
-        return apply_filters( 'wpinv_get_vat_groups', $vat_groups );
+        return apply_filters('wpinv_get_vat_groups', $vat_groups);
     }
 
     public static function get_rules() {
         $vat_rules = array(
-            'digital' => __( 'Digital Product', 'invoicing' ),
-            'physical' => __( 'Physical Product', 'invoicing' )
+            'digital' => __('Digital Product', 'invoicing'),
+            'physical' => __('Physical Product', 'invoicing')
         );
-        return apply_filters( 'wpinv_get_vat_rules', $vat_rules );
+        return apply_filters('wpinv_get_vat_rules', $vat_rules);
     }
 
-    public static function get_vat_rates( $class ) {
-        if ( $class === '_standard' ) {
+    public static function get_vat_rates($class) {
+        if ($class === '_standard') {
             return wpinv_get_tax_rates();
         }
 
         $rates = self::get_non_standard_rates();
 
-        return array_key_exists( $class, $rates ) ? $rates[$class] : array();
+        return array_key_exists($class, $rates) ? $rates[$class] : array();
     }
 
     public static function get_non_standard_rates() {
-        $option = get_option( 'wpinv_vat_rates', array());
-        return is_array( $option ) ? $option : array();
+        $option = get_option('wpinv_vat_rates', array());
+        return is_array($option) ? $option : array();
     }
     
     public static function allow_vat_rules() {
-        return ( wpinv_use_taxes() && wpinv_get_option( 'apply_vat_rules' ) ? true : false );
+        return (wpinv_use_taxes() && wpinv_get_option('apply_vat_rules') ? true : false);
     }
     
     public static function allow_vat_classes() {
         return false; // TODO
-        return ( wpinv_get_option( 'vat_allow_classes' ) ? true : false );
+        return (wpinv_get_option('vat_allow_classes') ? true : false);
     }
     
-    public static function get_item_class( $postID ) {
-        $class = get_post_meta( $postID, '_wpinv_vat_class', true );
+    public static function get_item_class($postID) {
+        $class = get_post_meta($postID, '_wpinv_vat_class', true);
 
-        if ( empty( $class ) ) {
+        if (empty($class)) {
             $class = '_standard';
         }
         
-        return apply_filters( 'wpinv_get_item_vat_class', $class, $postID );
+        return apply_filters('wpinv_get_item_vat_class', $class, $postID);
     }
     
-    public static function item_class_label( $postID ) {        
+    public static function item_class_label($postID) {        
         $vat_classes = self::get_all_classes();
         
-        $class = self::get_item_class( $postID );
-        $class = isset( $vat_classes[$class] ) ? $vat_classes[$class] : __( $class, 'invoicing' );
+        $class = self::get_item_class($postID);
+        $class = isset($vat_classes[$class]) ? $vat_classes[$class] : __($class, 'invoicing');
         
-        return apply_filters( 'wpinv_item_class_label', $class, $postID );
+        return apply_filters('wpinv_item_class_label', $class, $postID);
     }
     
-    public static function get_item_rule( $postID ) {        
-        $rule_type = get_post_meta( $postID, '_wpinv_vat_rule', true );
+    public static function get_item_rule($postID) {        
+        $rule_type = get_post_meta($postID, '_wpinv_vat_rule', true);
         
-        if ( empty( $rule_type ) ) {        
+        if (empty($rule_type)) {        
             $rule_type = self::allow_vat_rules() ? 'digital' : 'physical';
         }
         
-        return apply_filters( 'wpinv_item_get_vat_rule', $rule_type, $postID );
+        return apply_filters('wpinv_item_get_vat_rule', $rule_type, $postID);
     }
     
-    public static function item_rule_label( $postID ) {
+    public static function item_rule_label($postID) {
         $vat_rules  = self::get_rules();
-        $vat_rule   = self::get_item_rule( $postID );
-        $vat_rule   = isset( $vat_rules[$vat_rule] ) ? $vat_rules[$vat_rule] : $vat_rule;
+        $vat_rule   = self::get_item_rule($postID);
+        $vat_rule   = isset($vat_rules[$vat_rule]) ? $vat_rules[$vat_rule] : $vat_rule;
         
-        return apply_filters( 'wpinv_item_rule_label', $vat_rule, $postID );
+        return apply_filters('wpinv_item_rule_label', $vat_rule, $postID);
     }
     
-    public static function item_has_digital_rule( $item_id = 0 ) {        
-        return self::get_item_rule( $item_id ) == 'digital' ? true : false;
+    public static function item_has_digital_rule($item_id = 0) {        
+        return self::get_item_rule($item_id) == 'digital' ? true : false;
     }
     
-    public static function invoice_has_digital_rule( $invoice = 0 ) {        
-        if ( !self::allow_vat_rules() ) {
+    public static function invoice_has_digital_rule($invoice = 0) {        
+        if (!self::allow_vat_rules()) {
             return false;
         }
         
-        if ( empty( $invoice ) ) {
+        if (empty($invoice)) {
             return true;
         }
         
-        if ( is_int( $invoice ) ) {
-            $invoice = new WPInv_Invoice( $invoice );
+        if (is_int($invoice)) {
+            $invoice = new WPInv_Invoice($invoice);
         }
         
-        if ( !( is_object( $invoice ) && is_a( $invoice, 'WPInv_Invoice' ) ) ) {
+        if (!(is_object($invoice) && is_a($invoice, 'WPInv_Invoice'))) {
             return true;
         }
         
-        $cart_items  = $invoice->get_cart_details();
+        $cart_items = $invoice->get_cart_details();
         
-        if ( !empty( $cart_items ) ) {
+        if (!empty($cart_items)) {
             $has_digital_rule = false;
             
-            foreach ( $cart_items as $key => $item ) {
-                if ( self::item_has_digital_rule( $item['id'] ) ) {
+            foreach ($cart_items as $key => $item) {
+                if (self::item_has_digital_rule($item['id'])) {
                     $has_digital_rule = true;
                     break;
                 }
@@ -1404,67 +1404,67 @@ 
         return $has_digital_rule;
     }
     
-    public static function item_is_taxable( $item_id = 0, $country = false, $state = false ) {        
-        if ( !wpinv_use_taxes() ) {
+    public static function item_is_taxable($item_id = 0, $country = false, $state = false) {        
+        if (!wpinv_use_taxes()) {
             return false;
         }
         
         $is_taxable = true;
 
-        if ( !empty( $item_id ) && self::get_item_class( $item_id ) == '_exempt' ) {
+        if (!empty($item_id) && self::get_item_class($item_id) == '_exempt') {
             $is_taxable = false;
         }
         
-        return apply_filters( 'wpinv_item_is_taxable', $is_taxable, $item_id, $country , $state );
+        return apply_filters('wpinv_item_is_taxable', $is_taxable, $item_id, $country, $state);
     }
     
-    public static function find_rate( $country, $state, $rate, $class ) {
+    public static function find_rate($country, $state, $rate, $class) {
         global $wpi_zero_tax;
 
-        if ( $class === '_exempt' || $wpi_zero_tax ) {
+        if ($class === '_exempt' || $wpi_zero_tax) {
             return 0;
         }
 
-        $tax_rates   = wpinv_get_tax_rates();
+        $tax_rates = wpinv_get_tax_rates();
         
-        if ( $class !== '_standard' ) {
-            $class_rates = self::get_vat_rates( $class );
+        if ($class !== '_standard') {
+            $class_rates = self::get_vat_rates($class);
             
-            if ( is_array( $class_rates ) ) {
+            if (is_array($class_rates)) {
                 $indexed_class_rates = array();
                 
-                foreach ( $class_rates as $key => $cr ) {
+                foreach ($class_rates as $key => $cr) {
                     $indexed_class_rates[$cr['country']] = $cr;
                 }
 
-                $tax_rates = array_map( function( $tr ) use( $indexed_class_rates ) {
+                $tax_rates = array_map(function($tr) use($indexed_class_rates) {
                     $tr_country = $tr['country'];
-                    if ( !isset( $indexed_class_rates[$tr_country] ) ) {
+                    if (!isset($indexed_class_rates[$tr_country])) {
                         return $tr;
                     }
                     $icr = $indexed_class_rates[$tr_country];
-                    return ( empty( $icr['rate'] ) && $icr['rate'] !== '0' ) ? $tr : $icr;
+                    return (empty($icr['rate']) && $icr['rate'] !== '0') ? $tr : $icr;
 
-                }, $tax_rates, $class_rates );
+                }, $tax_rates, $class_rates);
             }
         }
 
-        if ( !empty( $tax_rates ) ) {
-            foreach ( $tax_rates as $key => $tax_rate ) {
-                if ( $country != $tax_rate['country'] )
+        if (!empty($tax_rates)) {
+            foreach ($tax_rates as $key => $tax_rate) {
+                if ($country != $tax_rate['country'])
                     continue;
 
-                if ( !empty( $tax_rate['global'] ) ) {
-                    if ( 0 !== $tax_rate['rate'] || !empty( $tax_rate['rate'] ) ) {
-                        $rate = number_format( $tax_rate['rate'], 4 );
+                if (!empty($tax_rate['global'])) {
+                    if (0 !== $tax_rate['rate'] || !empty($tax_rate['rate'])) {
+                        $rate = number_format($tax_rate['rate'], 4);
                     }
                 } else {
-                    if ( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) )
+                    if (empty($tax_rate['state']) || strtolower($state) != strtolower($tax_rate['state']))
                         continue;
 
                     $state_rate = $tax_rate['rate'];
-                    if ( 0 !== $state_rate || !empty( $state_rate ) ) {
-                        $rate = number_format( $state_rate, 4 );
+                    if (0 !== $state_rate || !empty($state_rate)) {
+                        $rate = number_format($state_rate, 4);
                     }
                 }
             }
@@ -1473,84 +1473,84 @@ 
         return $rate;
     }
     
-    public static function get_rate( $rate = 1, $country = '', $state = '', $item_id = 0 ) {
+    public static function get_rate($rate = 1, $country = '', $state = '', $item_id = 0) {
         global $wpinv_options, $wpi_session, $wpi_item_id, $wpi_zero_tax;
         
         $item_id = $item_id > 0 ? $item_id : $wpi_item_id;
         $allow_vat_classes = self::allow_vat_classes();
-        $class = $item_id ? self::get_item_class( $item_id ) : '_standard';
+        $class = $item_id ? self::get_item_class($item_id) : '_standard';
 
-        if ( $class === '_exempt' || $wpi_zero_tax ) {
+        if ($class === '_exempt' || $wpi_zero_tax) {
             return 0;
-        } else if ( !$allow_vat_classes ) {
+        } else if (!$allow_vat_classes) {
             $class = '_standard';
         }
 
-        if( !empty( $_POST['wpinv_country'] ) ) {
+        if (!empty($_POST['wpinv_country'])) {
             $post_country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['wpinv_country'] ) ) {
+        } elseif (!empty($_POST['wpinv_country'])) {
             $post_country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['country'] ) ) {
+        } elseif (!empty($_POST['country'])) {
             $post_country = $_POST['country'];
         } else {
             $post_country = '';
         }
 
-        $country        = !empty( $post_country ) ? $post_country : wpinv_default_billing_country( $country );
-        $base_country   = wpinv_is_base_country( $country );
+        $country        = !empty($post_country) ? $post_country : wpinv_default_billing_country($country);
+        $base_country   = wpinv_is_base_country($country);
         
-        $requires_vat   = self::requires_vat( 0, false );
-        $is_digital     = self::get_item_rule( $item_id ) == 'digital' ;
-        $rate           = $requires_vat && isset( $wpinv_options['eu_fallback_rate'] ) ? $wpinv_options['eu_fallback_rate'] : $rate;
+        $requires_vat   = self::requires_vat(0, false);
+        $is_digital     = self::get_item_rule($item_id) == 'digital';
+        $rate           = $requires_vat && isset($wpinv_options['eu_fallback_rate']) ? $wpinv_options['eu_fallback_rate'] : $rate;
           
-        if ( self::same_country_rule() == 'no' && $base_country ) { // Disable VAT to same country
+        if (self::same_country_rule() == 'no' && $base_country) { // Disable VAT to same country
             $rate = 0;
-        } else if ( $requires_vat ) {
-            $vat_number = self::get_user_vat_number( '', 0, true );
+        } else if ($requires_vat) {
+            $vat_number = self::get_user_vat_number('', 0, true);
             $vat_info   = self::current_vat_data();
             
-            if ( is_array( $vat_info ) ) {
-                $vat_number = isset( $vat_info['number'] ) && !empty( $vat_info['valid'] ) ? $vat_info['number'] : "";
+            if (is_array($vat_info)) {
+                $vat_number = isset($vat_info['number']) && !empty($vat_info['valid']) ? $vat_info['number'] : "";
             }
             
-            if ( $country == 'UK' ) {
+            if ($country == 'UK') {
                 $country = 'GB';
             }
 
-            if ( !empty( $vat_number ) ) {
+            if (!empty($vat_number)) {
                 $rate = 0;
             } else {
-                $rate = self::find_rate( $country, $state, $rate, $class ); // Fix if there are no tax rated and you try to pay an invoice it does not add the fallback tax rate
+                $rate = self::find_rate($country, $state, $rate, $class); // Fix if there are no tax rated and you try to pay an invoice it does not add the fallback tax rate
             }
 
-            if ( empty( $vat_number ) && !$is_digital ) {
-                if ( $base_country ) {
-                    $rate = self::find_rate( $country, null, $rate, $class );
+            if (empty($vat_number) && !$is_digital) {
+                if ($base_country) {
+                    $rate = self::find_rate($country, null, $rate, $class);
                 } else {
-                    if ( empty( $country ) && isset( $wpinv_options['eu_fallback_rate'] ) ) {
+                    if (empty($country) && isset($wpinv_options['eu_fallback_rate'])) {
                         $rate = $wpinv_options['eu_fallback_rate'];
-                    } else if( !empty( $country ) ) {
-                        $rate = self::find_rate( $country, $state, $rate, $class );
+                    } else if (!empty($country)) {
+                        $rate = self::find_rate($country, $state, $rate, $class);
                     }
                 }
-            } else if ( empty( $vat_number ) || ( self::same_country_rule() == 'always' && $base_country ) ) {
-                if ( empty( $country ) && isset( $wpinv_options['eu_fallback_rate'] ) ) {
+            } else if (empty($vat_number) || (self::same_country_rule() == 'always' && $base_country)) {
+                if (empty($country) && isset($wpinv_options['eu_fallback_rate'])) {
                     $rate = $wpinv_options['eu_fallback_rate'];
-                } else if( !empty( $country ) ) {
-                    $rate = self::find_rate( $country, $state, $rate, $class );
+                } else if (!empty($country)) {
+                    $rate = self::find_rate($country, $state, $rate, $class);
                 }
             }
         } else {
-            if ( $is_digital ) {
+            if ($is_digital) {
                 $ip_country_code = self::get_country_by_ip();
                 
-                if ( $ip_country_code && self::is_eu_state( $ip_country_code ) ) {
-                    $rate = self::find_rate( $ip_country_code, '', 0, $class );
+                if ($ip_country_code && self::is_eu_state($ip_country_code)) {
+                    $rate = self::find_rate($ip_country_code, '', 0, $class);
                 } else {
-                    $rate = self::find_rate( $country, $state, $rate, $class );
+                    $rate = self::find_rate($country, $state, $rate, $class);
                 }
             } else {
-                $rate = self::find_rate( $country, $state, $rate, $class );
+                $rate = self::find_rate($country, $state, $rate, $class);
             }
         }
 
@@ -1560,48 +1560,48 @@ 
     public static function current_vat_data() {
         global $wpi_session;
         
-        return $wpi_session->get( 'user_vat_data' );
+        return $wpi_session->get('user_vat_data');
     }
     
-    public static function get_user_country( $country = '', $user_id = 0 ) {
-        $user_address = wpinv_get_user_address( $user_id, false );
+    public static function get_user_country($country = '', $user_id = 0) {
+        $user_address = wpinv_get_user_address($user_id, false);
         
-        if ( wpinv_get_option( 'vat_ip_country_default' ) ) {
+        if (wpinv_get_option('vat_ip_country_default')) {
             $country = '';
         }
         
-        $country    = empty( $user_address ) || !isset( $user_address['country'] ) || empty( $user_address['country'] ) ? $country : $user_address['country'];
-        $result     = apply_filters( 'wpinv_get_user_country', $country, $user_id );
+        $country    = empty($user_address) || !isset($user_address['country']) || empty($user_address['country']) ? $country : $user_address['country'];
+        $result     = apply_filters('wpinv_get_user_country', $country, $user_id);
 
-        if ( empty( $result ) ) {
+        if (empty($result)) {
             $result = self::get_country_by_ip();
         }
 
         return $result;
     }
     
-    public static function set_user_country( $country = '', $user_id = 0 ) {
+    public static function set_user_country($country = '', $user_id = 0) {
         global $wpi_userID;
         
-        if ( empty($country) && !empty($wpi_userID) && get_current_user_id() != $wpi_userID ) {
+        if (empty($country) && !empty($wpi_userID) && get_current_user_id() != $wpi_userID) {
             $country = wpinv_get_default_country();
         }
         
         return $country;
     }
     
-    public static function get_user_vat_number( $vat_number = '', $user_id = 0, $is_valid = false ) {
+    public static function get_user_vat_number($vat_number = '', $user_id = 0, $is_valid = false) {
         global $wpi_current_id, $wpi_userID;
         
-        if ( !empty( $_POST['new_user'] ) ) {
+        if (!empty($_POST['new_user'])) {
             return '';
         }
         
-        if ( empty( $user_id ) ) {
-            $user_id = !empty( $wpi_userID ) ? $wpi_userID : ( $wpi_current_id ? wpinv_get_user_id( $wpi_current_id ) : get_current_user_id() );
+        if (empty($user_id)) {
+            $user_id = !empty($wpi_userID) ? $wpi_userID : ($wpi_current_id ? wpinv_get_user_id($wpi_current_id) : get_current_user_id());
         }
 
-        $vat_number = empty( $user_id ) ? '' : get_user_meta( $user_id, '_wpinv_vat_number', true );
+        $vat_number = empty($user_id) ? '' : get_user_meta($user_id, '_wpinv_vat_number', true);
         
         /* TODO
         if ( $is_valid && $vat_number ) {
@@ -1612,38 +1612,38 @@ 
         }
         */
 
-        return apply_filters('wpinv_get_user_vat_number', $vat_number, $user_id, $is_valid );
+        return apply_filters('wpinv_get_user_vat_number', $vat_number, $user_id, $is_valid);
     }
     
-    public static function get_user_company( $company = '', $user_id = 0 ) {
+    public static function get_user_company($company = '', $user_id = 0) {
         global $wpi_current_id, $wpi_userID;
         
-        if ( empty( $user_id ) ) {
-            $user_id = !empty( $wpi_userID ) ? $wpi_userID : ( $wpi_current_id ? wpinv_get_user_id( $wpi_current_id ) : get_current_user_id() );
+        if (empty($user_id)) {
+            $user_id = !empty($wpi_userID) ? $wpi_userID : ($wpi_current_id ? wpinv_get_user_id($wpi_current_id) : get_current_user_id());
         }
 
-        $company = empty( $user_id ) ? "" : get_user_meta( $user_id, '_wpinv_company', true );
+        $company = empty($user_id) ? "" : get_user_meta($user_id, '_wpinv_company', true);
 
-        return apply_filters( 'wpinv_user_company', $company, $user_id );
+        return apply_filters('wpinv_user_company', $company, $user_id);
     }
     
-    public static function save_user_vat_details( $company = '', $vat_number = '' ) {
-        $save = apply_filters( 'wpinv_allow_save_user_vat_details', true );
+    public static function save_user_vat_details($company = '', $vat_number = '') {
+        $save = apply_filters('wpinv_allow_save_user_vat_details', true);
 
-        if ( is_user_logged_in() && $save ) {
+        if (is_user_logged_in() && $save) {
             $user_id = get_current_user_id();
 
-            if ( !empty( $vat_number ) ) {
-                update_user_meta( $user_id, '_wpinv_vat_number', $vat_number );
+            if (!empty($vat_number)) {
+                update_user_meta($user_id, '_wpinv_vat_number', $vat_number);
             } else {
-                delete_user_meta( $user_id, '_wpinv_vat_number');
+                delete_user_meta($user_id, '_wpinv_vat_number');
             }
 
-            if ( !empty( $company ) ) {
-                update_user_meta( $user_id, '_wpinv_company', $company );
+            if (!empty($company)) {
+                update_user_meta($user_id, '_wpinv_company', $company);
             } else {
-                delete_user_meta( $user_id, '_wpinv_company');
-                delete_user_meta( $user_id, '_wpinv_vat_number');
+                delete_user_meta($user_id, '_wpinv_company');
+                delete_user_meta($user_id, '_wpinv_vat_number');
             }
         }
 
@@ -1653,113 +1653,113 @@ 
     public static function ajax_vat_validate() {
         global $wpinv_options, $wpi_session;
         
-        $is_checkout            = ( !empty( $_POST['source'] ) && $_POST['source'] == 'checkout' ) ? true : false;
+        $is_checkout            = (!empty($_POST['source']) && $_POST['source'] == 'checkout') ? true : false;
         $response               = array();
         $response['success']    = false;
         
-        if ( empty( $_REQUEST['_wpi_nonce'] ) || ( !empty( $_REQUEST['_wpi_nonce'] ) && !wp_verify_nonce( $_REQUEST['_wpi_nonce'], 'vat_validation' ) ) ) {
-            $response['error'] = __( 'Invalid security nonce', 'invoicing' );
-            wp_send_json( $response );
+        if (empty($_REQUEST['_wpi_nonce']) || (!empty($_REQUEST['_wpi_nonce']) && !wp_verify_nonce($_REQUEST['_wpi_nonce'], 'vat_validation'))) {
+            $response['error'] = __('Invalid security nonce', 'invoicing');
+            wp_send_json($response);
         }
         
-        $vat_name   = self::get_vat_name();
+        $vat_name = self::get_vat_name();
         
-        if ( $is_checkout ) {
+        if ($is_checkout) {
             $invoice = wpinv_get_invoice_cart();
             
-            if ( !self::requires_vat( false, 0, self::invoice_has_digital_rule( $invoice ) ) ) {
+            if (!self::requires_vat(false, 0, self::invoice_has_digital_rule($invoice))) {
                 $vat_info = array();
-                $wpi_session->set( 'user_vat_data', $vat_info );
+                $wpi_session->set('user_vat_data', $vat_info);
 
                 self::save_user_vat_details();
                 
                 $response['success'] = true;
-                $response['message'] = wp_sprintf( __( 'Ignore %s', 'invoicing' ), $vat_name );
-                wp_send_json( $response );
+                $response['message'] = wp_sprintf(__('Ignore %s', 'invoicing'), $vat_name);
+                wp_send_json($response);
             }
         }
         
-        $company    = !empty( $_POST['company'] ) ? sanitize_text_field( $_POST['company'] ) : '';
-        $vat_number = !empty( $_POST['number'] ) ? sanitize_text_field( $_POST['number'] ) : '';
+        $company    = !empty($_POST['company']) ? sanitize_text_field($_POST['company']) : '';
+        $vat_number = !empty($_POST['number']) ? sanitize_text_field($_POST['number']) : '';
         
-        $vat_info = $wpi_session->get( 'user_vat_data' );
-        if ( !is_array( $vat_info ) || empty( $vat_info ) ) {
-            $vat_info = array( 'company'=> $company, 'number' => '', 'valid' => true );
+        $vat_info = $wpi_session->get('user_vat_data');
+        if (!is_array($vat_info) || empty($vat_info)) {
+            $vat_info = array('company'=> $company, 'number' => '', 'valid' => true);
         }
         
-        if ( empty( $vat_number ) ) {
-            if ( $is_checkout ) {
+        if (empty($vat_number)) {
+            if ($is_checkout) {
                 $response['success'] = true;
-                $response['message'] = wp_sprintf( __( 'No %s number has been applied. %s will be added to invoice totals', 'invoicing' ), $vat_name, $vat_name );
+                $response['message'] = wp_sprintf(__('No %s number has been applied. %s will be added to invoice totals', 'invoicing'), $vat_name, $vat_name);
                 
-                $vat_info = $wpi_session->get( 'user_vat_data' );
+                $vat_info = $wpi_session->get('user_vat_data');
                 $vat_info['number'] = "";
                 $vat_info['valid'] = true;
                 
-                self::save_user_vat_details( $company );
+                self::save_user_vat_details($company);
             } else {
-                $response['error'] = wp_sprintf( __( 'Please enter your %s number!', 'invoicing' ), $vat_name );
+                $response['error'] = wp_sprintf(__('Please enter your %s number!', 'invoicing'), $vat_name);
                 
                 $vat_info['valid'] = false;
             }
 
-            $wpi_session->set( 'user_vat_data', $vat_info );
-            wp_send_json( $response );
+            $wpi_session->set('user_vat_data', $vat_info);
+            wp_send_json($response);
         }
         
-        if ( empty( $company ) ) {
+        if (empty($company)) {
             $vat_info['valid'] = false;
-            $wpi_session->set( 'user_vat_data', $vat_info );
+            $wpi_session->set('user_vat_data', $vat_info);
             
-            $response['error'] = __( 'Please enter your registered company name!', 'invoicing' );
-            wp_send_json( $response );
+            $response['error'] = __('Please enter your registered company name!', 'invoicing');
+            wp_send_json($response);
         }
         
-        if ( !empty( $wpinv_options['vat_vies_check'] ) ) {
-            if ( empty( $wpinv_options['vat_offline_check'] ) && !self::offline_check( $vat_number ) ) {
+        if (!empty($wpinv_options['vat_vies_check'])) {
+            if (empty($wpinv_options['vat_offline_check']) && !self::offline_check($vat_number)) {
                 $vat_info['valid'] = false;
-                $wpi_session->set( 'user_vat_data', $vat_info );
+                $wpi_session->set('user_vat_data', $vat_info);
                 
-                $response['error'] = wp_sprintf( __( '%s number not validated', 'invoicing' ), $vat_name );
-                wp_send_json( $response );
+                $response['error'] = wp_sprintf(__('%s number not validated', 'invoicing'), $vat_name);
+                wp_send_json($response);
             }
             
             $response['success'] = true;
-            $response['message'] = wp_sprintf( __( '%s number validated', 'invoicing' ), $vat_name );
+            $response['message'] = wp_sprintf(__('%s number validated', 'invoicing'), $vat_name);
         } else {
-            $result = self::check_vat( $vat_number );
+            $result = self::check_vat($vat_number);
             
-            if ( empty( $result['valid'] ) ) {
+            if (empty($result['valid'])) {
                 $response['error'] = $result['message'];
-                wp_send_json( $response );
+                wp_send_json($response);
             }
             
-            $vies_company = !empty( $result['company'] ) ? $result['company'] : '';
-            $vies_company = apply_filters( 'wpinv_vies_company_name', $vies_company );
+            $vies_company = !empty($result['company']) ? $result['company'] : '';
+            $vies_company = apply_filters('wpinv_vies_company_name', $vies_company);
             
-            $valid_company = $vies_company && $company && ( $vies_company == '---' || strcasecmp( trim( $vies_company ), trim( $company ) ) == 0 ) ? true : false;
+            $valid_company = $vies_company && $company && ($vies_company == '---' || strcasecmp(trim($vies_company), trim($company)) == 0) ? true : false;
 
-            if ( !empty( $wpinv_options['vat_disable_company_name_check'] ) || $valid_company ) {
+            if (!empty($wpinv_options['vat_disable_company_name_check']) || $valid_company) {
                 $response['success'] = true;
-                $response['message'] = wp_sprintf( __( '%s number validated', 'invoicing' ), $vat_name );
+                $response['message'] = wp_sprintf(__('%s number validated', 'invoicing'), $vat_name);
             } else {           
                 $vat_info['valid'] = false;
-                $wpi_session->set( 'user_vat_data', $vat_info );
+                $wpi_session->set('user_vat_data', $vat_info);
                 
                 $response['success'] = false;
-                $response['message'] = wp_sprintf( __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ), $vat_name );
-                wp_send_json( $response );
+                $response['message'] = wp_sprintf(__('The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing'), $vat_name);
+                wp_send_json($response);
             }
         }
         
-        if ( $is_checkout ) {
-            self::save_user_vat_details( $company, $vat_number );
+        if ($is_checkout) {
+            self::save_user_vat_details($company, $vat_number);
 
-            $vat_info = array('company' => $company, 'number' => $vat_number, 'valid' => true );
-            $wpi_session->set( 'user_vat_data', $vat_info );
+            $vat_info = array('company' => $company, 'number' => $vat_number, 'valid' => true);
+            $wpi_session->set('user_vat_data', $vat_info);
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function ajax_vat_reset() {
@@ -1768,161 +1768,161 @@ 
         $company    = is_user_logged_in() ? self::get_user_company() : '';
         $vat_number = self::get_user_vat_number();
         
-        $vat_info   = array('company' => $company, 'number' => $vat_number, 'valid' => false );
-        $wpi_session->set( 'user_vat_data', $vat_info );
+        $vat_info   = array('company' => $company, 'number' => $vat_number, 'valid' => false);
+        $wpi_session->set('user_vat_data', $vat_info);
         
         $response                       = array();
         $response['success']            = true;
         $response['data']['company']    = $company;
         $response['data']['number']     = $vat_number;
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
-    public static function checkout_vat_validate( $valid_data, $post ) {
+    public static function checkout_vat_validate($valid_data, $post) {
         global $wpinv_options, $wpi_session;
         
-        $vat_name  = __( self::get_vat_name(), 'invoicing' );
+        $vat_name = __(self::get_vat_name(), 'invoicing');
         
-        if ( !isset( $_POST['_wpi_nonce'] ) || !wp_verify_nonce( $_POST['_wpi_nonce'], 'vat_validation' ) ) {
-            wpinv_set_error( 'vat_validation', wp_sprintf( __( "Invalid %s validation request.", 'invoicing' ), $vat_name ) );
+        if (!isset($_POST['_wpi_nonce']) || !wp_verify_nonce($_POST['_wpi_nonce'], 'vat_validation')) {
+            wpinv_set_error('vat_validation', wp_sprintf(__("Invalid %s validation request.", 'invoicing'), $vat_name));
             return;
         }
         
-        $vat_saved = $wpi_session->get( 'user_vat_data' );
-        $wpi_session->set( 'user_vat_data', null );
+        $vat_saved = $wpi_session->get('user_vat_data');
+        $wpi_session->set('user_vat_data', null);
         
         $invoice        = wpinv_get_invoice_cart();
         $amount         = $invoice->get_total();
-        $is_digital     = self::invoice_has_digital_rule( $invoice );
-        $no_vat         = !self::requires_vat( 0, false, $is_digital );
+        $is_digital     = self::invoice_has_digital_rule($invoice);
+        $no_vat         = !self::requires_vat(0, false, $is_digital);
         
-        $company        = !empty( $_POST['wpinv_company'] ) ? $_POST['wpinv_company'] : null;
-        $vat_number     = !empty( $_POST['wpinv_vat_number'] ) ? $_POST['wpinv_vat_number'] : null;
-        $country        = !empty( $_POST['wpinv_country'] ) ? $_POST['wpinv_country'] : $invoice->country;
-        if ( empty( $country ) ) {
+        $company        = !empty($_POST['wpinv_company']) ? $_POST['wpinv_company'] : null;
+        $vat_number     = !empty($_POST['wpinv_vat_number']) ? $_POST['wpinv_vat_number'] : null;
+        $country        = !empty($_POST['wpinv_country']) ? $_POST['wpinv_country'] : $invoice->country;
+        if (empty($country)) {
             $country = wpinv_default_billing_country();
         }
         
-        if ( !$is_digital && $no_vat ) {
+        if (!$is_digital && $no_vat) {
             return;
         }
             
-        $vat_data           = array( 'company' => '', 'number' => '', 'valid' => false );
+        $vat_data           = array('company' => '', 'number' => '', 'valid' => false);
         
         $ip_country_code    = self::get_country_by_ip();
-        $is_eu_state        = self::is_eu_state( $country );
-        $is_eu_state_ip     = self::is_eu_state( $ip_country_code );
+        $is_eu_state        = self::is_eu_state($country);
+        $is_eu_state_ip     = self::is_eu_state($ip_country_code);
         $is_non_eu_user     = !$is_eu_state && !$is_eu_state_ip;
         
-        if ( $is_digital && !$is_non_eu_user && empty( $vat_number ) && apply_filters( 'wpinv_checkout_requires_country', true, $amount ) ) {
+        if ($is_digital && !$is_non_eu_user && empty($vat_number) && apply_filters('wpinv_checkout_requires_country', true, $amount)) {
             $vat_data['adddress_confirmed'] = false;
             
-            if ( !isset( $_POST['wpinv_adddress_confirmed'] ) ) {
-                if ( $ip_country_code != $country ) {
-                    wpinv_set_error( 'vat_validation', sprintf( __( 'The country of your current location must be the same as the country of your billing location or you must %s confirm %s the billing address is your home country.', 'invoicing' ), '<a href="#wpinv_adddress_confirm">', '</a>' ) );
+            if (!isset($_POST['wpinv_adddress_confirmed'])) {
+                if ($ip_country_code != $country) {
+                    wpinv_set_error('vat_validation', sprintf(__('The country of your current location must be the same as the country of your billing location or you must %s confirm %s the billing address is your home country.', 'invoicing'), '<a href="#wpinv_adddress_confirm">', '</a>'));
                 }
             } else {
                 $vat_data['adddress_confirmed'] = true;
             }
         }
         
-        if ( !empty( $wpinv_options['vat_prevent_b2c_purchase'] ) && !$is_non_eu_user && ( empty( $vat_number ) || $no_vat ) ) {
-            if ( $is_eu_state ) {
-                wpinv_set_error( 'vat_validation', wp_sprintf( __( 'Please enter and validate your %s number to verify your purchase is by an EU business.', 'invoicing' ), $vat_name ) );
-            } else if ( $is_digital && $is_eu_state_ip ) {
-                wpinv_set_error( 'vat_validation', wp_sprintf( __( 'Sales to non-EU countries cannot be completed because %s must be applied.', 'invoicing' ), $vat_name ) );
+        if (!empty($wpinv_options['vat_prevent_b2c_purchase']) && !$is_non_eu_user && (empty($vat_number) || $no_vat)) {
+            if ($is_eu_state) {
+                wpinv_set_error('vat_validation', wp_sprintf(__('Please enter and validate your %s number to verify your purchase is by an EU business.', 'invoicing'), $vat_name));
+            } else if ($is_digital && $is_eu_state_ip) {
+                wpinv_set_error('vat_validation', wp_sprintf(__('Sales to non-EU countries cannot be completed because %s must be applied.', 'invoicing'), $vat_name));
             }
         }
         
-        if ( !$is_eu_state || $no_vat || empty( $vat_number ) ) {
+        if (!$is_eu_state || $no_vat || empty($vat_number)) {
             return;
         }
 
-        if ( !empty( $vat_saved ) && isset( $vat_saved['valid'] ) ) {
-            $vat_data['valid']  = $vat_saved['valid'];
+        if (!empty($vat_saved) && isset($vat_saved['valid'])) {
+            $vat_data['valid'] = $vat_saved['valid'];
         }
             
-        if ( $company !== null ) {
+        if ($company !== null) {
             $vat_data['company'] = $company;
         }
 
         $message = '';
-        if ( $vat_number !== null ) {
+        if ($vat_number !== null) {
             $vat_data['number'] = $vat_number;
             
-            if ( !$vat_data['valid'] || ( $vat_saved['number'] !== $vat_data['number'] ) || ( $vat_saved['company'] !== $vat_data['company'] ) ) {
-                if ( !empty( $wpinv_options['vat_vies_check'] ) ) {            
-                    if ( empty( $wpinv_options['vat_offline_check'] ) && !self::offline_check( $vat_number ) ) {
+            if (!$vat_data['valid'] || ($vat_saved['number'] !== $vat_data['number']) || ($vat_saved['company'] !== $vat_data['company'])) {
+                if (!empty($wpinv_options['vat_vies_check'])) {            
+                    if (empty($wpinv_options['vat_offline_check']) && !self::offline_check($vat_number)) {
                         $vat_data['valid'] = false;
                     }
                 } else {
-                    $result = self::check_vat( $vat_number );
+                    $result = self::check_vat($vat_number);
                     
-                    if ( !empty( $result['valid'] ) ) {                
+                    if (!empty($result['valid'])) {                
                         $vat_data['valid'] = true;
-                        $vies_company = !empty( $result['company'] ) ? $result['company'] : '';
-                        $vies_company = apply_filters( 'wpinv_vies_company_name', $vies_company );
+                        $vies_company = !empty($result['company']) ? $result['company'] : '';
+                        $vies_company = apply_filters('wpinv_vies_company_name', $vies_company);
                     
-                        $valid_company = $vies_company && $company && ( $vies_company == '---' || strcasecmp( trim( $vies_company ), trim( $company ) ) == 0 ) ? true : false;
+                        $valid_company = $vies_company && $company && ($vies_company == '---' || strcasecmp(trim($vies_company), trim($company)) == 0) ? true : false;
 
-                        if ( !( !empty( $wpinv_options['vat_disable_company_name_check'] ) || $valid_company ) ) {         
+                        if (!(!empty($wpinv_options['vat_disable_company_name_check']) || $valid_company)) {         
                             $vat_data['valid'] = false;
                             
-                            $message = wp_sprintf( __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ), $vat_name );
+                            $message = wp_sprintf(__('The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing'), $vat_name);
                         }
                     } else {
-                        $message = wp_sprintf( __( 'Fail to validate the %s number: EU Commission VAT server (VIES) check fails.', 'invoicing' ), $vat_name );
+                        $message = wp_sprintf(__('Fail to validate the %s number: EU Commission VAT server (VIES) check fails.', 'invoicing'), $vat_name);
                     }
                 }
                 
-                if ( !$vat_data['valid'] ) {
-                    $error = wp_sprintf( __( 'The %s %s number %s you have entered has not been validated', 'invoicing' ), '<a href="#wpi-vat-details">', $vat_name, '</a>' ) . ( $message ? ' ( ' . $message . ' )' : '' );
-                    wpinv_set_error( 'vat_validation', $error );
+                if (!$vat_data['valid']) {
+                    $error = wp_sprintf(__('The %s %s number %s you have entered has not been validated', 'invoicing'), '<a href="#wpi-vat-details">', $vat_name, '</a>') . ($message ? ' ( ' . $message . ' )' : '');
+                    wpinv_set_error('vat_validation', $error);
                 }
             }
         }
 
-        $wpi_session->set( 'user_vat_data', $vat_data );
+        $wpi_session->set('user_vat_data', $vat_data);
     }
     
-    public static function checkout_vat_fields( $billing_details ) {
+    public static function checkout_vat_fields($billing_details) {
         global $wpi_session, $wpinv_options, $wpi_country, $wpi_requires_vat;
         
         $ip_address         = wpinv_get_ip();
         $ip_country_code    = self::get_country_by_ip();
         
-        $tax_label          = __( self::get_vat_name(), 'invoicing' );
+        $tax_label          = __(self::get_vat_name(), 'invoicing');
         $invoice            = wpinv_get_invoice_cart();
-        $is_digital         = self::invoice_has_digital_rule( $invoice );
+        $is_digital         = self::invoice_has_digital_rule($invoice);
         $wpi_country        = $invoice->country;
         
-        $requires_vat       = !self::hide_vat_fields() && !$invoice->is_free() && self::requires_vat( 0, false, $is_digital );
+        $requires_vat       = !self::hide_vat_fields() && !$invoice->is_free() && self::requires_vat(0, false, $is_digital);
         $wpi_requires_vat   = $requires_vat;
         
         $company            = self::get_user_company();
         $vat_number         = self::get_user_vat_number();
         
-        $validated          = $vat_number ? self::get_user_vat_number( '', 0, true ) : 1;
-        $vat_info           = $wpi_session->get( 'user_vat_data' );
+        $validated          = $vat_number ? self::get_user_vat_number('', 0, true) : 1;
+        $vat_info           = $wpi_session->get('user_vat_data');
 
-        if ( is_array( $vat_info ) ) {
-            $company    = isset( $vat_info['company'] ) ? $vat_info['company'] : '';
-            $vat_number = isset( $vat_info['number'] ) ? $vat_info['number'] : '';
-            $validated  = isset( $vat_info['valid'] ) ? $vat_info['valid'] : false;
+        if (is_array($vat_info)) {
+            $company    = isset($vat_info['company']) ? $vat_info['company'] : '';
+            $vat_number = isset($vat_info['number']) ? $vat_info['number'] : '';
+            $validated  = isset($vat_info['valid']) ? $vat_info['valid'] : false;
         }
         
         $selected_country = $invoice->country ? $invoice->country : wpinv_default_billing_country();
 
-        if ( $ip_country_code == 'UK' ) {
+        if ($ip_country_code == 'UK') {
             $ip_country_code = 'GB';
         }
         
-        if ( $selected_country == 'UK' ) {
+        if ($selected_country == 'UK') {
             $selected_country = 'GB';
         }
         
-        if ( $requires_vat && ( self::same_country_rule() == 'no' && wpinv_is_base_country( $selected_country ) || !self::allow_vat_rules() ) ) {
+        if ($requires_vat && (self::same_country_rule() == 'no' && wpinv_is_base_country($selected_country) || !self::allow_vat_rules())) {
             $requires_vat = false;
         }
 
@@ -1930,52 +1930,52 @@ 
         $display_validate_btn   = 'none';
         $display_reset_btn      = 'none';
         
-        if ( !empty( $vat_number ) && $validated ) {
-            $vat_vailidated_text    = wp_sprintf( __( '%s number validated', 'invoicing' ), $tax_label );
+        if (!empty($vat_number) && $validated) {
+            $vat_vailidated_text    = wp_sprintf(__('%s number validated', 'invoicing'), $tax_label);
             $vat_vailidated_class   = 'wpinv-vat-stat-1';
             $display_reset_btn      = 'block';
         } else {
-            $vat_vailidated_text    = empty( $vat_number ) ? '' : wp_sprintf( __( '%s number not validated', 'invoicing' ), $tax_label );
-            $vat_vailidated_class   = empty( $vat_number ) ? '' : 'wpinv-vat-stat-0';
+            $vat_vailidated_text    = empty($vat_number) ? '' : wp_sprintf(__('%s number not validated', 'invoicing'), $tax_label);
+            $vat_vailidated_class   = empty($vat_number) ? '' : 'wpinv-vat-stat-0';
             $display_validate_btn   = 'block';
         }
         
-        $show_ip_country        = $is_digital && ( empty( $vat_number ) || !$requires_vat ) && $ip_country_code != $selected_country ? 'block' : 'none';
+        $show_ip_country = $is_digital && (empty($vat_number) || !$requires_vat) && $ip_country_code != $selected_country ? 'block' : 'none';
         ?>
         <div id="wpi-vat-details" class="wpi-vat-details clearfix" style="display:<?php echo $display_vat_details; ?>">
             <div id="wpi_vat_info" class="clearfix panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php echo wp_sprintf( __( '%s Details', 'invoicing' ), $tax_label );?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php echo wp_sprintf(__('%s Details', 'invoicing'), $tax_label); ?></h3></div>
                 <div id="wpinv-fields-box" class="panel-body">
                     <p id="wpi_show_vat_note">
-                        <?php echo wp_sprintf( __( 'Validate your registered %s number to exclude tax.', 'invoicing' ), $tax_label ); ?>
+                        <?php echo wp_sprintf(__('Validate your registered %s number to exclude tax.', 'invoicing'), $tax_label); ?>
                     </p>
                     <div id="wpi_vat_fields" class="wpi_vat_info">
                         <p class="wpi-cart-field wpi-col2 wpi-colf">
-                            <label for="wpinv_company" class="wpi-label"><?php _e( 'Company Name', 'invoicing' );?></label>
+                            <label for="wpinv_company" class="wpi-label"><?php _e('Company Name', 'invoicing'); ?></label>
                             <?php
-                            echo wpinv_html_text( array(
+                            echo wpinv_html_text(array(
                                     'id'            => 'wpinv_company',
                                     'name'          => 'wpinv_company',
                                     'value'         => $company,
                                     'class'         => 'wpi-input form-control',
-                                    'placeholder'   => __( 'Company name', 'invoicing' ),
-                                ) );
+                                    'placeholder'   => __('Company name', 'invoicing'),
+                                ));
                             ?>
                         </p>
                         <p class="wpi-cart-field wpi-col2 wpi-coll wpi-cart-field-vat">
-                            <label for="wpinv_vat_number" class="wpi-label"><?php echo wp_sprintf( __( '%s Number', 'invoicing' ), $tax_label );?></label>
+                            <label for="wpinv_vat_number" class="wpi-label"><?php echo wp_sprintf(__('%s Number', 'invoicing'), $tax_label); ?></label>
                             <span id="wpinv_vat_number-wrap">
                                 <label for="wpinv_vat_number" class="wpinv-label"></label>
-                                <input type="text" class="wpi-input form-control" placeholder="<?php echo esc_attr( wp_sprintf( __( '%s number', 'invoicing' ), $tax_label ) );?>" value="<?php esc_attr_e( $vat_number );?>" id="wpinv_vat_number" name="wpinv_vat_number">
-                                <span class="wpinv-vat-stat <?php echo $vat_vailidated_class;?>"><i class="fa"></i>&nbsp;<font><?php echo $vat_vailidated_text;?></font></span>
+                                <input type="text" class="wpi-input form-control" placeholder="<?php echo esc_attr(wp_sprintf(__('%s number', 'invoicing'), $tax_label)); ?>" value="<?php esc_attr_e($vat_number); ?>" id="wpinv_vat_number" name="wpinv_vat_number">
+                                <span class="wpinv-vat-stat <?php echo $vat_vailidated_class; ?>"><i class="fa"></i>&nbsp;<font><?php echo $vat_vailidated_text; ?></font></span>
                             </span>
                         </p>
                         <p class="wpi-cart-field wpi-col wpi-colf wpi-cart-field-actions">
-                            <button class="btn btn-success btn-sm wpinv-vat-validate" type="button" id="wpinv_vat_validate" style="display:<?php echo $display_validate_btn; ?>"><?php echo wp_sprintf( __("Validate %s Number", 'invoicing'), $tax_label ); ?></button>
-                            <button class="btn btn-danger btn-sm wpinv-vat-reset" type="button" id="wpinv_vat_reset" style="display:<?php echo $display_reset_btn; ?>"><?php echo wp_sprintf( __("Reset %s", 'invoicing'), $tax_label ); ?></button>
+                            <button class="btn btn-success btn-sm wpinv-vat-validate" type="button" id="wpinv_vat_validate" style="display:<?php echo $display_validate_btn; ?>"><?php echo wp_sprintf(__("Validate %s Number", 'invoicing'), $tax_label); ?></button>
+                            <button class="btn btn-danger btn-sm wpinv-vat-reset" type="button" id="wpinv_vat_reset" style="display:<?php echo $display_reset_btn; ?>"><?php echo wp_sprintf(__("Reset %s", 'invoicing'), $tax_label); ?></button>
                             <span class="wpi-vat-box wpi-vat-box-info"><span id="text"></span></span>
                             <span class="wpi-vat-box wpi-vat-box-error"><span id="text"></span></span>
-                            <input type="hidden" name="_wpi_nonce" value="<?php echo wp_create_nonce( 'vat_validation' ) ?>" />
+                            <input type="hidden" name="_wpi_nonce" value="<?php echo wp_create_nonce('vat_validation') ?>" />
                         </p>
                     </div>
                 </div>
@@ -1989,32 +1989,32 @@ 
                 </span>
             </div>
         </div>
-        <?php if ( empty( $wpinv_options['hide_ip_address'] ) ) { 
-            $ip_link = '<a title="' . esc_attr( __( 'View more details on map', 'invoicing' ) ) . '" target="_blank" href="' . esc_url( admin_url( 'admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $ip_address ) ) . '" class="wpi-ip-address-link">' . $ip_address . '&nbsp;&nbsp;<i class="fa fa-external-link-square" aria-hidden="true"></i></a>';
+        <?php if (empty($wpinv_options['hide_ip_address'])) { 
+            $ip_link = '<a title="' . esc_attr(__('View more details on map', 'invoicing')) . '" target="_blank" href="' . esc_url(admin_url('admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $ip_address)) . '" class="wpi-ip-address-link">' . $ip_address . '&nbsp;&nbsp;<i class="fa fa-external-link-square" aria-hidden="true"></i></a>';
         ?>
         <div class="wpi-ip-info clearfix panel panel-info">
             <div id="wpinv-fields-box" class="panel-body">
-                <span><?php echo wp_sprintf( __( "Your IP address is: %s", 'invoicing' ), $ip_link ); ?></span>
+                <span><?php echo wp_sprintf(__("Your IP address is: %s", 'invoicing'), $ip_link); ?></span>
             </div>
         </div>
         <?php }
     }
     
-    public static function show_vat_notice( $invoice ) {
-        if ( empty( $invoice ) ) {
+    public static function show_vat_notice($invoice) {
+        if (empty($invoice)) {
             return NULL;
         }
         
-        $label      = wpinv_get_option( 'vat_invoice_notice_label' );
-        $notice     = wpinv_get_option( 'vat_invoice_notice' );
-        if ( $label || $notice ) {
+        $label      = wpinv_get_option('vat_invoice_notice_label');
+        $notice     = wpinv_get_option('vat_invoice_notice');
+        if ($label || $notice) {
         ?>
         <div class="row wpinv-vat-notice">
             <div class="col-sm-12">
-                <?php if ( $label ) { ?>
-                <strong><?php _e( $label, 'invoicing' ); ?></strong>
-                <?php } if ( $notice ) { ?>
-                <?php echo wpautop( wptexturize( __( $notice, 'invoicing' ) ) ) ?>
+                <?php if ($label) { ?>
+                <strong><?php _e($label, 'invoicing'); ?></strong>
+                <?php } if ($notice) { ?>
+                <?php echo wpautop(wptexturize(__($notice, 'invoicing'))) ?>
                 <?php } ?>
             </div>
         </div>