AyeCode / invoicing

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,256 +72,256 @@ 
             $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 ] ) ) {
-                    if ( $field == '_wpinv_price' ) {
-                        if ( get_post_meta( $post_id, '_wpinv_type', true ) === 'package' ) {
-                            $value = wpinv_sanitize_amount( get_post_meta( $post_id, '_wpinv_price', true ) ); // Don't allow edit GD package item price.
+            foreach ($fields as $field => $name) {
+                if (isset($_POST[$name])) {
+                    if ($field == '_wpinv_price') {
+                        if (get_post_meta($post_id, '_wpinv_type', true) === 'package') {
+                            $value = wpinv_sanitize_amount(get_post_meta($post_id, '_wpinv_price', true)); // Don't allow edit GD package item price.
                         } else {
-                            $value = wpinv_sanitize_amount( $_POST[ $name ] );
+                            $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

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

Spacing +709 added lines, -709 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,36 +1612,36 @@ 
         }
         */
 
-        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 ) {
-        if ( empty( $user_id ) ) {
+    public static function get_user_company($company = '', $user_id = 0) {
+        if (empty($user_id)) {
             $user_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');
             }
         }
 
@@ -1651,113 +1651,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() {
@@ -1766,161 +1766,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->get_total() > 0 && self::requires_vat( 0, false, $is_digital );
+        $requires_vat       = !self::hide_vat_fields() && $invoice->get_total() > 0 && self::requires_vat(0, false, $is_digital);
         $wpi_requires_vat   = $requires_vat;
         
         $company            = is_user_logged_in() ? 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;
         }
 
@@ -1928,52 +1928,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>
@@ -1987,32 +1987,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>

includes/admin/register-settings.php

Spacing +490 added lines, -490 removed lines

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