AyeCode / invoicing

includes/admin/register-settings.php

Spacing +540 added lines, -540 removed lines

@@ -1,66 +1,66 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
     global $wpinv_options;
 
-    $value = isset( $wpinv_options[ $key ] ) ? $wpinv_options[ $key ] : $default;
-    $value = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value = isset($wpinv_options[$key]) ? $wpinv_options[$key] : $default;
+    $value = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
-    if ( empty( $value ) ) {
-        $remove_option = wpinv_delete_option( $key );
+    if (empty($value)) {
+        $remove_option = wpinv_delete_option($key);
         return $remove_option;
     }
 
     // First let's grab the current settings
-    $options = get_option( 'wpinv_settings' );
+    $options = get_option('wpinv_settings');
 
     // Let other plugin alter the value
-    $value = apply_filters( 'wpinv_update_option', $value, $key );
+    $value = apply_filters('wpinv_update_option', $value, $key);
 
     // Next let's try to update the value
-    $options[ $key ] = $value;
-    $did_update = update_option( 'wpinv_settings', $options );
+    $options[$key] = $value;
+    $did_update = update_option('wpinv_settings', $options);
 
     // If it's updated, let's update the global variable
-    if ( $did_update ) {
+    if ($did_update) {
         global $wpinv_options;
-        $wpinv_options[ $key ] = $value;
+        $wpinv_options[$key] = $value;
     }
 
     return $did_update;
 }
 
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // First let's grab the current settings
-    $options = get_option( 'wpinv_settings' );
+    $options = get_option('wpinv_settings');
 
     // Next let's try to update the value
-    if( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
+    if (isset($options[$key])) {
+        unset($options[$key]);
     }
 
-    $did_update = update_option( 'wpinv_settings', $options );
+    $did_update = update_option('wpinv_settings', $options);
 
     // If it updated, let's update the global variable
-    if ( $did_update ){
+    if ($did_update) {
         global $wpinv_options;
         $wpinv_options = $options;
     }
@@ -69,37 +69,37 @@ 
 }
 
 function wpinv_get_settings() {
-    $settings = get_option( 'wpinv_settings' );
+    $settings = get_option('wpinv_settings');
 
-    if ( empty( $settings ) ) {
+    if (empty($settings)) {
         // Update old settings with new single option
-        $general_settings   = is_array( get_option( 'wpinv_settings_general' ) )    ? get_option( 'wpinv_settings_general' )    : array();
-        $gateways_settings  = is_array( get_option( 'wpinv_settings_gateways' ) )   ? get_option( 'wpinv_settings_gateways' )   : array();
-        $email_settings     = is_array( get_option( 'wpinv_settings_emails' ) )     ? get_option( 'wpinv_settings_emails' )     : array();
-        $tax_settings       = is_array( get_option( 'wpinv_settings_taxes' ) )      ? get_option( 'wpinv_settings_taxes' )      : array();
-        $misc_settings      = is_array( get_option( 'wpinv_settings_misc' ) )       ? get_option( 'wpinv_settings_misc' )       : array();
-        $tool_settings      = is_array( get_option( 'wpinv_settings_tools' ) )      ? get_option( 'wpinv_settings_tools' )      : array();
+        $general_settings   = is_array(get_option('wpinv_settings_general')) ? get_option('wpinv_settings_general') : array();
+        $gateways_settings  = is_array(get_option('wpinv_settings_gateways')) ? get_option('wpinv_settings_gateways') : array();
+        $email_settings     = is_array(get_option('wpinv_settings_emails')) ? get_option('wpinv_settings_emails') : array();
+        $tax_settings       = is_array(get_option('wpinv_settings_taxes')) ? get_option('wpinv_settings_taxes') : array();
+        $misc_settings      = is_array(get_option('wpinv_settings_misc')) ? get_option('wpinv_settings_misc') : array();
+        $tool_settings      = is_array(get_option('wpinv_settings_tools')) ? get_option('wpinv_settings_tools') : array();
 
-        $settings = array_merge( $general_settings, $gateways_settings, $email_settings, $tax_settings, $misc_settings, $tool_settings );
+        $settings = array_merge($general_settings, $gateways_settings, $email_settings, $tax_settings, $misc_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,41 +111,41 @@ 
                 '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,
-                        '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,
+                        '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,
                     )
                 );
             }
@@ -153,203 +153,203 @@ 
     }
 
     // Creates our settings in the options table
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 function wpinv_get_registered_settings() {
-    $pages = wpinv_get_pages( true );
+    $pages = wpinv_get_pages(true);
     
     $currencies = wpinv_get_currencies();
     
     $currency_code_options = array();
-    foreach ( $currencies as $code => $name ) {
-        $currency_code_options[ $code ] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol( $code ) . ')';
+    foreach ($currencies as $code => $name) {
+        $currency_code_options[$code] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol($code) . ')';
     }
     
     $due_payment_options       = array();
-    $due_payment_options[0]    = __( 'Now', 'invoicing' );
-    for ( $i = 1; $i <= 30; $i++ ) {
+    $due_payment_options[0]    = __('Now', 'invoicing');
+    for ($i = 1; $i <= 30; $i++) {
         $due_payment_options[$i] = $i;
     }
     
     $invoice_number_padd_options = array();
-    for ( $i = 0; $i <= 20; $i++ ) {
+    for ($i = 0; $i <= 20; $i++) {
         $invoice_number_padd_options[$i] = $i;
     }
     
     $currency_symbol = wpinv_currency_symbol();
     
     $last_number = $reset_number = '';
-    if ( $last_invoice_number = get_option( 'wpinv_last_invoice_number' ) ) {
-        $last_invoice_number = is_numeric( $last_invoice_number ) ? $last_invoice_number : wpinv_clean_invoice_number( $last_invoice_number );
+    if ($last_invoice_number = get_option('wpinv_last_invoice_number')) {
+        $last_invoice_number = is_numeric($last_invoice_number) ? $last_invoice_number : wpinv_clean_invoice_number($last_invoice_number);
 
-        if ( !empty( $last_invoice_number ) ) {
-            $last_number = ' ' . wp_sprintf( __( "( Last Invoice's sequential number: <b>%s</b> )", 'invoicing' ), $last_invoice_number );
+        if (!empty($last_invoice_number)) {
+            $last_number = ' ' . wp_sprintf(__("( Last Invoice's sequential number: <b>%s</b> )", 'invoicing'), $last_invoice_number);
         }
 
         $nonce = wp_create_nonce('reset_invoice_count');
-        $reset_number = '<a href="'.add_query_arg(array('reset_invoice_count' => 1, '_nonce' => $nonce)).'" class="btn button">'.__('Force Reset Sequence', 'invoicing' ). '</a>';
+        $reset_number = '<a href="' . add_query_arg(array('reset_invoice_count' => 1, '_nonce' => $nonce)) . '" class="btn button">' . __('Force Reset Sequence', 'invoicing') . '</a>';
     }
     
     $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',
                         'class'   => 'wpi_select2',
-                        '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',
                         'class'   => 'wpi_select2',
-                        '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,
                         'class'       => 'wpi_select2',
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'tandc_page' => array(
                         'id'          => 'tandc_page',
-                        'name'        => __( 'Terms & Conditions', 'invoicing' ),
-                        'desc'        => __( 'If you select a "Terms & Conditions" page here the customer will be asked to accept them on checkout.', 'invoicing' ),
+                        'name'        => __('Terms & Conditions', 'invoicing'),
+                        'desc'        => __('If you select a "Terms & Conditions" page here the customer will be asked to accept them on checkout.', 'invoicing'),
                         'type'        => 'select',
-                        'options'     => wpinv_get_pages( true,  __( 'Select a page', 'invoicing' )),
+                        'options'     => wpinv_get_pages(true, __('Select a page', 'invoicing')),
                         'class'       => 'wpi_select2',
-                        '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,
                         'class'       => 'wpi_select2',
-                        '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,
                         'class'       => 'wpi_select2',
-                        '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. The <b>[wpinv_history]</b> short code should be on this page.', 'invoicing' ),
+                        'name'        => __('Invoice History Page', 'invoicing'),
+                        'desc'        => __('This page shows an invoice history for the current user. The <b>[wpinv_history]</b> short code should be on this page.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'class'       => 'wpi_select2',
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'invoice_subscription_page' => array(
                         'id'          => 'invoice_subscription_page',
-                        'name'        => __( 'Invoice Subscriptions Page', 'invoicing' ),
-                        'desc'        => __( 'This page shows subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing' ),
+                        'name'        => __('Invoice Subscriptions Page', 'invoicing'),
+                        'desc'        => __('This page shows subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'class'       => 'wpi_select2',
-                        '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',
                         'class'       => 'wpi_select2',
                         'options' => $currency_code_options,
                     ),
                     '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',
                         'class'   => 'wpi_select2',
                         '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',
@@ -361,29 +361,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', 'invoicing' ),
+                        'std' => __('VAT', 'invoicing'),
                     ),
                     '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',
                     ),
@@ -395,22 +395,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',
                         'class'   => 'wpi_select2',
@@ -425,19 +425,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',
@@ -449,8 +449,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',
                     ),
                 )
@@ -462,68 +462,68 @@ 
                 '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',
                     ),
                     'admin_email' => array(
                         'id'   => 'admin_email',
-                        'name' => __( 'Admin Email', 'invoicing' ),
-                        'desc' => __( 'Where should we send admin notifications?', 'invoicing' ),
-                        'std' => get_option( 'admin_email' ),
+                        'name' => __('Admin Email', 'invoicing'),
+                        'desc' => __('Where should we send admin notifications?', 'invoicing'),
+                        '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,
                         '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,
@@ -531,29 +531,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',
                     ),
@@ -572,17 +572,17 @@ 
                 'main' => array(
                     'invoicing_privacy_policy_settings' => array(
                         'id'   => 'invoicing_privacy_policy_settings',
-                        'name' => '<h3>' . __( 'Privacy Policy', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Privacy Policy', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'privacy_page' => array(
                         'id'          => 'privacy_page',
-                        'name'        => __( 'Privacy Page', 'invoicing' ),
-                        'desc'        => __( 'If no privacy policy page set in Settings->Privacy default settings, this page will be used on checkout page.', 'invoicing' ),
+                        'name'        => __('Privacy Page', 'invoicing'),
+                        'desc'        => __('If no privacy policy page set in Settings->Privacy default settings, this page will be used on checkout page.', 'invoicing'),
                         'type'        => 'select',
-                        'options'     => wpinv_get_pages( true,  __( 'Select a page', 'invoicing' )),
+                        'options'     => wpinv_get_pages(true, __('Select a page', 'invoicing')),
                         'class'       => 'wpi_select2',
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                 ),
             )
@@ -593,19 +593,19 @@ 
                 'main' => array(
                     'invoice_number_format_settings' => array(
                         'id'   => 'invoice_number_format_settings',
-                        'name' => '<h3>' . __( 'Invoice Number', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Invoice Number', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'sequential_invoice_number' => array(
                         'id'   => 'sequential_invoice_number',
-                        'name' => __( 'Sequential Invoice Numbers', 'invoicing' ),
-                        'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing' ) . $reset_number,
+                        'name' => __('Sequential Invoice Numbers', 'invoicing'),
+                        'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing') . $reset_number,
                         'type' => 'checkbox',
                     ),
                     'invoice_sequence_start' => array(
                         'id'   => 'invoice_sequence_start',
-                        'name' => __( 'Sequential Starting Number', 'invoicing' ),
-                        'desc' => __( 'The number at which the invoice number sequence should begin.', 'invoicing' ) . $last_number,
+                        'name' => __('Sequential Starting Number', 'invoicing'),
+                        'desc' => __('The number at which the invoice number sequence should begin.', 'invoicing') . $last_number,
                         'type' => 'number',
                         'size' => 'small',
                         'std'  => '1',
@@ -613,8 +613,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,
@@ -622,8 +622,8 @@ 
                     ),
                     'invoice_number_prefix' => array(
                         'id' => 'invoice_number_prefix',
-                        'name' => __( 'Invoice Number Prefix', 'invoicing' ),
-                        'desc' => __( 'Prefix for all invoice numbers. Ex: INV-', 'invoicing' ),
+                        'name' => __('Invoice Number Prefix', 'invoicing'),
+                        'desc' => __('Prefix for all invoice numbers. Ex: INV-', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => 'INV-',
@@ -631,32 +631,32 @@ 
                     ),
                     'invoice_number_postfix' => array(
                         'id' => 'invoice_number_postfix',
-                        'name' => __( 'Invoice Number Postfix', 'invoicing' ),
-                        'desc' => __( 'Postfix for all invoice numbers.', 'invoicing' ),
+                        'name' => __('Invoice Number Postfix', 'invoicing'),
+                        'desc' => __('Postfix for all invoice numbers.', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => ''
                     ),
                     'checkout_settings' => array(
                         'id'   => 'checkout_settings',
-                        'name' => '<h3>' . __( 'Checkout Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Checkout Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'login_to_checkout' => array(
                         'id'   => 'login_to_checkout',
-                        'name' => __( 'Require Login To Checkout', 'invoicing' ),
-                        'desc' => __( 'If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing' ),
+                        'name' => __('Require Login To Checkout', 'invoicing'),
+                        'desc' => __('If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing'),
                         'type' => 'checkbox',
                     ),
                     'uninstall_settings' => array(
                         'id'   => 'uninstall_settings',
-                        'name' => '<h3>' . __( 'Uninstall Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Uninstall Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'remove_data_on_unistall' => array(
                         'id'   => 'remove_data_on_unistall',
-                        'name' => __( 'Remove Data on Uninstall?', 'invoicing' ),
-                        'desc' => __( 'Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing' ),
+                        'name' => __('Remove Data on Uninstall?', 'invoicing'),
+                        'desc' => __('Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => ''
                     ),
@@ -664,20 +664,20 @@ 
                 'fields' => array(
                     'address_autofill_settings' => array(
                         'id'   => 'address_autofill_settings',
-                        'name' => '<h3>' . __( 'Google Address Auto Complete', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Google Address Auto Complete', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'address_autofill_active' => array(
                         'id'   => 'address_autofill_active',
-                        'name' => __( 'Enable/Disable', 'invoicing' ),
-                        'desc' => __( 'Enable google address auto complete', 'invoicing' ),
+                        'name' => __('Enable/Disable', 'invoicing'),
+                        'desc' => __('Enable google address auto complete', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => 0
                     ),
                     'address_autofill_api' => array(
                         'id' => 'address_autofill_api',
-                        'name' => __( 'Google Place API Key', 'invoicing' ),
-                        'desc' => wp_sprintf(__( 'Enter google place API key. For more information go to google place API %sdocumenation%s', 'invoicing' ), '<a href="https://developers.google.com/maps/documentation/javascript/places-autocomplete" target="_blank">', '</a>' ),
+                        'name' => __('Google Place API Key', 'invoicing'),
+                        'desc' => wp_sprintf(__('Enter google place API key. For more information go to google place API %sdocumenation%s', 'invoicing'), '<a href="https://developers.google.com/maps/documentation/javascript/places-autocomplete" target="_blank">', '</a>'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => ''
@@ -686,13 +686,13 @@ 
                 'custom-css' => array(
                     'css_settings' => array(
                         'id'   => 'css_settings',
-                        'name' => '<h3>' . __( 'Custom CSS', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Custom CSS', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'template_custom_css' => array(
                         'id' => 'template_custom_css',
-                        'name' => __( 'Invoice Template CSS', 'invoicing' ),
-                        'desc' => __( 'Add CSS to modify appearance of the print invoice page.', 'invoicing' ),
+                        'name' => __('Invoice Template CSS', 'invoicing'),
+                        'desc' => __('Add CSS to modify appearance of the print invoice page.', 'invoicing'),
                         'type' => 'textarea',
                         'class'=> 'regular-text',
                         'rows' => 10,
@@ -706,8 +706,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',
                     ),
                 ),
@@ -715,136 +715,136 @@ 
         )
     );
 
-    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( wp_get_raw_referer() ) ) {
+    if (empty(wp_get_raw_referer())) {
         return $input;
     }
 
-    wp_parse_str( wp_get_raw_referer(), $referrer );
+    wp_parse_str(wp_get_raw_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 $wpi_session;
 
-    if ( ! wpinv_current_user_can_manage_invoicing() ) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         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( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         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['privacy']  = __( 'Privacy', '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['privacy']  = __('Privacy', '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;
     }
 
@@ -854,143 +854,143 @@ 
 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' ),
-        ) ),
-        'privacy' => apply_filters( 'wpinv_settings_sections_privacy', array(
-            'main' => __( 'Privacy policy', 'invoicing' ),
-        ) ),
-        'misc' => apply_filters( 'wpinv_settings_sections_misc', array(
-            'main' => __( 'Miscellaneous', 'invoicing' ),
-            'fields' => __( 'Fields Settings', 'invoicing' ),
-            'custom-css' => __( 'Custom CSS', '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'),
+        )),
+        'privacy' => apply_filters('wpinv_settings_sections_privacy', array(
+            'main' => __('Privacy policy', 'invoicing'),
+        )),
+        'misc' => apply_filters('wpinv_settings_sections_misc', array(
+            'main' => __('Miscellaneous', 'invoicing'),
+            'fields' => __('Fields Settings', 'invoicing'),
+            'custom-css' => __('Custom CSS', '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'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+	$sanitize_id = wpinv_sanitize_key($args['id']);
+	$class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+	if (!empty($args['options'])) {
 		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
-        foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
+        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 '<div class="wpi-mcheck-row"><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></div>';
+			echo '<div class="wpi-mcheck-row"><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></div>';
 		endforeach;
 		echo '</div>';
 		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;
@@ -998,197 +998,197 @@ 
 
 			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'] );
-    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+    $class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="' . $class . '" >';
 
-	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>'
 	);
 }
@@ -1196,133 +1196,133 @@ 
 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( !empty( $args['onchange'] ) ) {
-        $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $onchange = ' onchange="' . esc_attr($args['onchange']) . '"';
     } else {
         $onchange = '';
     }
 
-    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="' . $class . '"  name="wpinv_settings[' . esc_attr($args['id']) . ']" 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 ), 'media_buttons' => false ) );
+		wp_editor(stripslashes($value), 'wpinv_settings_' . esc_attr($args['id']), array('textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']', 'textarea_rows' => absint($rows), 'media_buttons' => false));
 		$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;
 }
@@ -1330,9 +1330,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 = '';
@@ -1340,16 +1340,16 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$class = empty($states) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+	$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;
 }
@@ -1364,96 +1364,96 @@ 
 	<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'],
 						'show_option_all'  => false,
 						'show_option_none' => false,
 						'class'            => 'wpinv-tax-country wpi_select2',
-						'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,
                             'class'            => 'wpi_select2',
-							'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 wpi_select2',
-						'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();
@@ -1464,76 +1464,76 @@ 
     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 wpinv_get_capability();
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
-function wpinv_settings_sanitize_input( $value, $key ) {
-    if ( $key == 'tax_rate' || $key == 'eu_fallback_rate' ) {
-        $value = wpinv_sanitize_amount( $value, 4 );
+function wpinv_settings_sanitize_input($value, $key) {
+    if ($key == 'tax_rate' || $key == 'eu_fallback_rate') {
+        $value = wpinv_sanitize_amount($value, 4);
         $value = $value >= 100 ? 99 : $value;
     }
         
     return $value;
 }
-add_filter( 'wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2 );
+add_filter('wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2);
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = !empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = !empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
     
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
-add_action( 'wpinv_settings_tab_bottom_emails_new_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_cancelled_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_failed_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_onhold_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_processing_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_completed_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_refunded_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_user_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_user_note', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-add_action( 'wpinv_settings_tab_bottom_emails_overdue', 'wpinv_settings_tab_bottom_emails', 10, 2 );
-
-function wpinv_settings_tab_bottom_emails( $active_tab, $section ) {
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
+add_action('wpinv_settings_tab_bottom_emails_new_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_cancelled_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_failed_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_onhold_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_processing_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_completed_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_refunded_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_user_invoice', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_user_note', 'wpinv_settings_tab_bottom_emails', 10, 2);
+add_action('wpinv_settings_tab_bottom_emails_overdue', 'wpinv_settings_tab_bottom_emails', 10, 2);
+
+function wpinv_settings_tab_bottom_emails($active_tab, $section) {
     ?>
     <div class="wpinv-email-wc-row ">
         <div class="wpinv-email-wc-td">
-            <h3 class="wpinv-email-wc-title"><?php echo apply_filters( 'wpinv_settings_email_wildcards_title', __( 'Wildcards For Emails', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-email-wc-title"><?php echo apply_filters('wpinv_settings_email_wildcards_title', __('Wildcards For Emails', 'invoicing')); ?></h3>
             <p class="wpinv-email-wc-description">
                 <?php
-                $description = __( 'The following wildcards can be used in email subjects, heading and content:<br>
+                $description = __('The following wildcards can be used in email subjects, heading and content:<br>
                     <strong>{site_title} :</strong> Site Title<br>
                     <strong>{name} :</strong> Customer\'s full name<br>
                     <strong>{first_name} :</strong> Customer\'s first name<br>
@@ -1547,7 +1547,7 @@ 
                     <strong>{invoice_due_date} :</strong> The date the invoice is due<br>
                     <strong>{date} :</strong> Today\'s date.<br>
                     <strong>{is_was} :</strong> If due date of invoice is past, displays "was" otherwise displays "is"<br>
-                    <strong>{invoice_label} :</strong> Invoices/quotes singular name. Ex: Invoice/Quote<br>', 'invoicing' );
+                    <strong>{invoice_label} :</strong> Invoices/quotes singular name. Ex: Invoice/Quote<br>', 'invoicing');
                 echo apply_filters('wpinv_settings_email_wildcards_description', $description, $active_tab, $section);
                 ?>
             </p>

includes/wpinv-template-functions.php

Spacing +576 added lines, -576 removed lines

@@ -4,99 +4,99 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Displays an invoice.
  * 
  * @param WPInv_Invoice $invoice.
  */
-function getpaid_invoice( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/invoice.php', compact( 'invoice' ) );
+function getpaid_invoice($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/invoice.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice', 'getpaid_invoice', 10 );
+add_action('getpaid_invoice', 'getpaid_invoice', 10);
 
 /**
  * Displays the invoice footer.
  */
-function getpaid_invoice_footer( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/footer.php', compact( 'invoice' ) );
+function getpaid_invoice_footer($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/footer.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_footer', 'getpaid_invoice_footer', 10 );
+add_action('getpaid_invoice_footer', 'getpaid_invoice_footer', 10);
 
 /**
  * Displays the invoice top bar.
  */
-function getpaid_invoice_header( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/header.php', compact( 'invoice' ) );
+function getpaid_invoice_header($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/header.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_header', 'getpaid_invoice_header', 10 );
+add_action('getpaid_invoice_header', 'getpaid_invoice_header', 10);
 
 /**
  * Displays actions on the left side of the header.
  */
-function getpaid_invoice_header_left_actions( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/header-left-actions.php', compact( 'invoice' ) );
+function getpaid_invoice_header_left_actions($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/header-left-actions.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_header_left', 'getpaid_invoice_header_left_actions', 10 );
+add_action('getpaid_invoice_header_left', 'getpaid_invoice_header_left_actions', 10);
 
 /**
  * Displays actions on the right side of the invoice top bar.
  */
-function getpaid_invoice_header_right_actions( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/header-right-actions.php', compact( 'invoice' ) );
+function getpaid_invoice_header_right_actions($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/header-right-actions.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_header_right', 'getpaid_invoice_header_right_actions', 10 );
+add_action('getpaid_invoice_header_right', 'getpaid_invoice_header_right_actions', 10);
 
 /**
  * Displays the invoice title, watermark, logo etc.
  */
-function getpaid_invoice_details_top( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/details-top.php', compact( 'invoice' ) );
+function getpaid_invoice_details_top($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/details-top.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details', 'getpaid_invoice_details_top', 10 );
+add_action('getpaid_invoice_details', 'getpaid_invoice_details_top', 10);
 
 /**
  * Displays the company logo.
  */
-function getpaid_invoice_logo( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/invoice-logo.php', compact( 'invoice' ) );
+function getpaid_invoice_logo($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/invoice-logo.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details_top_left', 'getpaid_invoice_logo' );
+add_action('getpaid_invoice_details_top_left', 'getpaid_invoice_logo');
 
 /**
  * Displays the type of invoice.
  */
-function getpaid_invoice_type( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/invoice-type.php', compact( 'invoice' ) );
+function getpaid_invoice_type($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/invoice-type.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details_top_right', 'getpaid_invoice_type' );
+add_action('getpaid_invoice_details_top_right', 'getpaid_invoice_type');
 
 /**
  * Displays the invoice details.
  */
-function getpaid_invoice_details_main( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/details.php', compact( 'invoice' ) );
+function getpaid_invoice_details_main($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/details.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details', 'getpaid_invoice_details_main', 50 );
+add_action('getpaid_invoice_details', 'getpaid_invoice_details_main', 50);
 
 /**
  * Returns a path to the templates directory.
@@ -125,30 +125,30 @@ 
  * @param string $template_path The templates directory relative to the theme's root dir. Defaults to 'invoicing'.
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
-function wpinv_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+function wpinv_get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
 
     // Make variables available to the template.
-    if ( ! empty( $args ) && is_array( $args ) ) {
-		extract( $args );
+    if (!empty($args) && is_array($args)) {
+		extract($args);
 	}
 
     // Locate the template.
-	$located = wpinv_locate_template( $template_name, $template_path, $default_path );
+	$located = wpinv_locate_template($template_name, $template_path, $default_path);
 
     // Abort if the file does not exist.
-	if ( ! file_exists( $located ) ) {
-        _doing_it_wrong( __FUNCTION__, sprintf( '<code>%s</code> does not exist.', $located ), '2.1' );
+	if (!file_exists($located)) {
+        _doing_it_wrong(__FUNCTION__, sprintf('<code>%s</code> does not exist.', $located), '2.1');
 		return;
 	}
 
     // Fires before loading a template.
-	do_action( 'wpinv_before_template_part', $template_name, $template_path, $located, $args );
+	do_action('wpinv_before_template_part', $template_name, $template_path, $located, $args);
 
     // Load the template.
-	include( $located );
+	include($located);
 
     // Fires after loading a template.
-	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
+	do_action('wpinv_after_template_part', $template_name, $template_path, $located, $args);
 }
 
 /**
@@ -160,9 +160,9 @@ 
  * @param string $template_path The templates directory relative to the theme's root dir. Defaults to 'invoicing'.
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
-function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+function wpinv_get_template_html($template_name, $args = array(), $template_path = '', $default_path = '') {
 	ob_start();
-	wpinv_get_template( $template_name, $args, $template_path, $default_path );
+	wpinv_get_template($template_name, $args, $template_path, $default_path);
 	return ob_get_clean();
 }
 
@@ -172,7 +172,7 @@ 
  * @return string
  */
 function wpinv_template_path() {
-    return apply_filters( 'wpinv_template_path', wpinv_get_theme_template_dir_name() );
+    return apply_filters('wpinv_template_path', wpinv_get_theme_template_dir_name());
 }
 
 /**
@@ -181,7 +181,7 @@ 
  * @return string
  */
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
+	return trailingslashit(apply_filters('wpinv_templates_dir', 'invoicing'));
 }
 
 /**
@@ -193,72 +193,72 @@ 
  * @param string $template_path The template path relative to the theme's root dir. Defaults to 'invoicing'.
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
-function wpinv_locate_template( $template_name, $template_path = '', $default_path = '' ) {
+function wpinv_locate_template($template_name, $template_path = '', $default_path = '') {
 
     // Load the defaults for the template path and default path.
-    $template_path = empty( $template_path ) ? wpinv_template_path() : $template_path;
-    $default_path  = empty( $default_path ) ? WPINV_PLUGIN_DIR . 'templates/' : $default_path;
+    $template_path = empty($template_path) ? wpinv_template_path() : $template_path;
+    $default_path  = empty($default_path) ? WPINV_PLUGIN_DIR . 'templates/' : $default_path;
 
     // Check if the template was overidden.
     $template = locate_template(
-        array( trailingslashit( $template_path ) . $template_name )
+        array(trailingslashit($template_path) . $template_name)
     );
 
     // Maybe replace it with a default path.
-    if ( empty( $template ) && ! empty( $default_path ) ) {
-        $template = trailingslashit( $default_path ) . $template_name;
+    if (empty($template) && !empty($default_path)) {
+        $template = trailingslashit($default_path) . $template_name;
     }
 
     // Return what we found.
-    return apply_filters( 'wpinv_locate_template', $template, $template_name, $template_path, $default_path );
+    return apply_filters('wpinv_locate_template', $template, $template_name, $template_path, $default_path);
 }
 
-function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+function wpinv_get_template_part($slug, $name = null, $load = true) {
+	do_action('get_template_part_' . $slug, $slug, $name);
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
+	if (isset($name))
 		$templates[] = $slug . '-' . $name . '.php';
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+	$templates = apply_filters('wpinv_get_template_part', $templates, $slug, $name);
 
 	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+	return wpinv_locate_tmpl($templates, $load, false);
 }
 
-function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
+function wpinv_locate_tmpl($template_names, $load = false, $require_once = true) {
 	// No file found yet
 	$located = false;
 
 	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+	foreach ((array) $template_names as $template_name) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
+		if (empty($template_name))
 			continue;
 
 		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+		$template_name = ltrim($template_name, '/');
 
 		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+		foreach (wpinv_get_theme_template_paths() as $template_path) {
 
-			if( file_exists( $template_path . $template_name ) ) {
+			if (file_exists($template_path . $template_name)) {
 				$located = $template_path . $template_name;
 				break;
 			}
 		}
 
-		if( !empty( $located ) ) {
+		if (!empty($located)) {
 			break;
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ((true == $load) && !empty($located))
+		load_template($located, $require_once);
 
 	return $located;
 }
@@ -267,155 +267,155 @@ 
 	$template_dir = wpinv_get_theme_template_dir_name();
 
 	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
+		1 => trailingslashit(get_stylesheet_directory()) . $template_dir,
+		10 => trailingslashit(get_template_directory()) . $template_dir,
 		100 => wpinv_get_templates_dir()
 	);
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+	$file_paths = apply_filters('wpinv_template_paths', $file_paths);
 
 	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+	ksort($file_paths, SORT_NUMERIC);
 
-	return array_map( 'trailingslashit', $file_paths );
+	return array_map('trailingslashit', $file_paths);
 }
 
 function wpinv_checkout_meta_tags() {
 
 	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
-	$pages[] = wpinv_get_option( 'invoice_subscription_page' );
+	$pages[] = wpinv_get_option('success_page');
+	$pages[] = wpinv_get_option('failure_page');
+	$pages[] = wpinv_get_option('invoice_history_page');
+	$pages[] = wpinv_get_option('invoice_subscription_page');
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+	if (!wpinv_is_checkout() && !is_page($pages)) {
 		return;
 	}
 
 	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
-add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
+add_action('wp_head', 'wpinv_checkout_meta_tags');
 
-function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+function wpinv_add_body_classes($class) {
+	$classes = (array) $class;
 
-	if( wpinv_is_checkout() ) {
+	if (wpinv_is_checkout()) {
 		$classes[] = 'wpinv-checkout';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_success_page() ) {
+	if (wpinv_is_success_page()) {
 		$classes[] = 'wpinv-success';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_failed_transaction_page() ) {
+	if (wpinv_is_failed_transaction_page()) {
 		$classes[] = 'wpinv-failed-transaction';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_invoice_history_page() ) {
+	if (wpinv_is_invoice_history_page()) {
 		$classes[] = 'wpinv-history';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_subscriptions_history_page() ) {
+	if (wpinv_is_subscriptions_history_page()) {
 		$classes[] = 'wpinv-subscription';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_test_mode() ) {
+	if (wpinv_is_test_mode()) {
 		$classes[] = 'wpinv-test-mode';
 		$classes[] = 'wpinv-page';
 	}
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
-add_filter( 'body_class', 'wpinv_add_body_classes' );
+add_filter('body_class', 'wpinv_add_body_classes');
 
-function wpinv_html_dropdown( $name = 'wpinv_discounts', $selected = 0, $status = '' ) {
-    $args = array( 'nopaging' => true );
+function wpinv_html_dropdown($name = 'wpinv_discounts', $selected = 0, $status = '') {
+    $args = array('nopaging' => true);
 
-    if ( ! empty( $status ) )
+    if (!empty($status))
         $args['post_status'] = $status;
 
-    $discounts = wpinv_get_discounts( $args );
+    $discounts = wpinv_get_discounts($args);
     $options   = array();
 
-    if ( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $options[ absint( $discount->ID ) ] = esc_html( get_the_title( $discount->ID ) );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $options[absint($discount->ID)] = esc_html(get_the_title($discount->ID));
         }
     } else {
-        $options[0] = __( 'No discounts found', 'invoicing' );
+        $options[0] = __('No discounts found', 'invoicing');
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false,
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_year_dropdown( $name = 'year', $selected = 0, $years_before = 5, $years_after = 0 ) {
-    $current     = date( 'Y' );
-    $start_year  = $current - absint( $years_before );
-    $end_year    = $current + absint( $years_after );
-    $selected    = empty( $selected ) ? date( 'Y' ) : $selected;
+function wpinv_html_year_dropdown($name = 'year', $selected = 0, $years_before = 5, $years_after = 0) {
+    $current     = date('Y');
+    $start_year  = $current - absint($years_before);
+    $end_year    = $current + absint($years_after);
+    $selected    = empty($selected) ? date('Y') : $selected;
     $options     = array();
 
-    while ( $start_year <= $end_year ) {
-        $options[ absint( $start_year ) ] = $start_year;
+    while ($start_year <= $end_year) {
+        $options[absint($start_year)] = $start_year;
         $start_year++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_month_dropdown( $name = 'month', $selected = 0 ) {
+function wpinv_html_month_dropdown($name = 'month', $selected = 0) {
 
     $options = array(
-        '1'  => __( 'January', 'invoicing' ),
-        '2'  => __( 'February', 'invoicing' ),
-        '3'  => __( 'March', 'invoicing' ),
-        '4'  => __( 'April', 'invoicing' ),
-        '5'  => __( 'May', 'invoicing' ),
-        '6'  => __( 'June', 'invoicing' ),
-        '7'  => __( 'July', 'invoicing' ),
-        '8'  => __( 'August', 'invoicing' ),
-        '9'  => __( 'September', 'invoicing' ),
-        '10' => __( 'October', 'invoicing' ),
-        '11' => __( 'November', 'invoicing' ),
-        '12' => __( 'December', 'invoicing' ),
+        '1'  => __('January', 'invoicing'),
+        '2'  => __('February', 'invoicing'),
+        '3'  => __('March', 'invoicing'),
+        '4'  => __('April', 'invoicing'),
+        '5'  => __('May', 'invoicing'),
+        '6'  => __('June', 'invoicing'),
+        '7'  => __('July', 'invoicing'),
+        '8'  => __('August', 'invoicing'),
+        '9'  => __('September', 'invoicing'),
+        '10' => __('October', 'invoicing'),
+        '11' => __('November', 'invoicing'),
+        '12' => __('December', 'invoicing'),
     );
 
     // If no month is selected, default to the current month
-    $selected = empty( $selected ) ? date( 'n' ) : $selected;
+    $selected = empty($selected) ? date('n') : $selected;
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_select( $args = array() ) {
+function wpinv_html_select($args = array()) {
     $defaults = array(
         'options'          => array(),
         'name'             => null,
@@ -424,8 +424,8 @@ 
         'selected'         => 0,
         'placeholder'      => null,
         'multiple'         => false,
-        'show_option_all'  => _x( 'All', 'all dropdown items', 'invoicing' ),
-        'show_option_none' => _x( 'None', 'no dropdown items', 'invoicing' ),
+        'show_option_all'  => _x('All', 'all dropdown items', 'invoicing'),
+        'show_option_none' => _x('None', 'no dropdown items', 'invoicing'),
         'data'             => array(),
         'onchange'         => null,
         'required'         => false,
@@ -433,74 +433,74 @@ 
         'readonly'         => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $data_elements = '';
-    foreach ( $args['data'] as $key => $value ) {
-        $data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+    foreach ($args['data'] as $key => $value) {
+        $data_elements .= ' data-' . esc_attr($key) . '="' . esc_attr($value) . '"';
     }
 
-    if( $args['multiple'] ) {
+    if ($args['multiple']) {
         $multiple = ' MULTIPLE';
     } else {
         $multiple = '';
     }
 
-    if( $args['placeholder'] ) {
+    if ($args['placeholder']) {
         $placeholder = $args['placeholder'];
     } else {
         $placeholder = '';
     }
     
     $options = '';
-    if( !empty( $args['onchange'] ) ) {
-        $options .= ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $options .= ' onchange="' . esc_attr($args['onchange']) . '"';
     }
     
-    if( !empty( $args['required'] ) ) {
+    if (!empty($args['required'])) {
         $options .= ' required="required"';
     }
     
-    if( !empty( $args['disabled'] ) ) {
+    if (!empty($args['disabled'])) {
         $options .= ' disabled';
     }
     
-    if( !empty( $args['readonly'] ) ) {
+    if (!empty($args['readonly'])) {
         $options .= ' readonly';
     }
 
-    $class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-    $output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim( $options ) . $data_elements . '>';
+    $class  = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
+    $output = '<select name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim($options) . $data_elements . '>';
 
-    if ( $args['show_option_all'] ) {
-        if( $args['multiple'] ) {
-            $selected = selected( true, in_array( 0, $args['selected'] ), false );
+    if ($args['show_option_all']) {
+        if ($args['multiple']) {
+            $selected = selected(true, in_array(0, $args['selected']), false);
         } else {
-            $selected = selected( $args['selected'], 0, false );
+            $selected = selected($args['selected'], 0, false);
         }
-        $output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+        $output .= '<option value="all"' . $selected . '>' . esc_html($args['show_option_all']) . '</option>';
     }
 
-    if ( !empty( $args['options'] ) ) {
+    if (!empty($args['options'])) {
 
-        if ( $args['show_option_none'] ) {
-            if( $args['multiple'] ) {
-                $selected = selected( true, in_array( "", $args['selected'] ), false );
+        if ($args['show_option_none']) {
+            if ($args['multiple']) {
+                $selected = selected(true, in_array("", $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'] === "", true, false );
+                $selected = selected($args['selected'] === "", true, false);
             }
-            $output .= '<option value=""' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+            $output .= '<option value=""' . $selected . '>' . esc_html($args['show_option_none']) . '</option>';
         }
 
-        foreach( $args['options'] as $key => $option ) {
+        foreach ($args['options'] as $key => $option) {
 
-            if( $args['multiple'] && is_array( $args['selected'] ) ) {
-                $selected = selected( true, (bool)in_array( $key, $args['selected'] ), false );
+            if ($args['multiple'] && is_array($args['selected'])) {
+                $selected = selected(true, (bool) in_array($key, $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'], $key, false );
+                $selected = selected($args['selected'], $key, false);
             }
 
-            $output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+            $output .= '<option value="' . esc_attr($key) . '"' . $selected . '>' . esc_html($option) . '</option>';
         }
     }
 
@@ -509,7 +509,7 @@ 
     return $output;
 }
 
-function wpinv_item_dropdown( $args = array() ) {
+function wpinv_item_dropdown($args = array()) {
     $defaults = array(
         'name'              => 'wpi_item',
         'id'                => 'wpi_item',
@@ -517,14 +517,14 @@ 
         'multiple'          => false,
         'selected'          => 0,
         'number'            => 100,
-        'placeholder'       => __( 'Choose a item', 'invoicing' ),
-        'data'              => array( 'search-type' => 'item' ),
+        'placeholder'       => __('Choose a item', 'invoicing'),
+        'data'              => array('search-type' => 'item'),
         'show_option_all'   => false,
         'show_option_none'  => false,
         'show_recurring'    => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $item_args = array(
         'post_type'      => 'wpi_item',
@@ -533,44 +533,44 @@ 
         'posts_per_page' => $args['number']
     );
 
-    $item_args  = apply_filters( 'wpinv_item_dropdown_query_args', $item_args, $args, $defaults );
+    $item_args  = apply_filters('wpinv_item_dropdown_query_args', $item_args, $args, $defaults);
 
-    $items      = get_posts( $item_args );
+    $items      = get_posts($item_args);
     $options    = array();
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            $title = esc_html( $item->post_title );
+    if ($items) {
+        foreach ($items as $item) {
+            $title = esc_html($item->post_title);
             
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $item->ID, false );
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($item->ID, false);
             }
             
-            $options[ absint( $item->ID ) ] = $title;
+            $options[absint($item->ID)] = $title;
         }
     }
 
     // This ensures that any selected items are included in the drop down
-    if( is_array( $args['selected'] ) ) {
-        foreach( $args['selected'] as $item ) {
-            if( ! in_array( $item, $options ) ) {
-                $title = get_the_title( $item );
-                if ( !empty( $args['show_recurring'] ) ) {
-                    $title .= wpinv_get_item_suffix( $item, false );
+    if (is_array($args['selected'])) {
+        foreach ($args['selected'] as $item) {
+            if (!in_array($item, $options)) {
+                $title = get_the_title($item);
+                if (!empty($args['show_recurring'])) {
+                    $title .= wpinv_get_item_suffix($item, false);
                 }
                 $options[$item] = $title;
             }
         }
-    } elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-        if ( ! in_array( $args['selected'], $options ) ) {
-            $title = get_the_title( $args['selected'] );
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $args['selected'], false );
+    } elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+        if (!in_array($args['selected'], $options)) {
+            $title = get_the_title($args['selected']);
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($args['selected'], false);
             }
-            $options[$args['selected']] = get_the_title( $args['selected'] );
+            $options[$args['selected']] = get_the_title($args['selected']);
         }
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $args['name'],
         'selected'         => $args['selected'],
         'id'               => $args['id'],
@@ -581,7 +581,7 @@ 
         'show_option_all'  => $args['show_option_all'],
         'show_option_none' => $args['show_option_none'],
         'data'             => $args['data'],
-    ) );
+    ));
 
     return $output;
 }
@@ -601,16 +601,16 @@ 
     );
 
     $options = array();
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            $options[ $item->ID ] = esc_html( $item->post_title ) . wpinv_get_item_suffix( $item->ID, false );
+    if ($items) {
+        foreach ($items as $item) {
+            $options[$item->ID] = esc_html($item->post_title) . wpinv_get_item_suffix($item->ID, false);
         }
     }
 
     return $options;
 }
 
-function wpinv_html_checkbox( $args = array() ) {
+function wpinv_html_checkbox($args = array()) {
     $defaults = array(
         'name'     => null,
         'current'  => null,
@@ -621,17 +621,17 @@ 
         )
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if ( ! empty( $args['options']['disabled'] ) ) {
+    if (!empty($args['options']['disabled'])) {
         $options .= ' disabled="disabled"';
-    } elseif ( ! empty( $args['options']['readonly'] ) ) {
+    } elseif (!empty($args['options']['readonly'])) {
         $options .= ' readonly';
     }
 
-    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $class . ' ' . esc_attr( $args['name'] ) . '" ' . checked( 1, $args['current'], false ) . ' />';
+    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['name']) . '" class="' . $class . ' ' . esc_attr($args['name']) . '" ' . checked(1, $args['current'], false) . ' />';
 
     return $output;
 }
@@ -639,30 +639,30 @@ 
 /**
  * Displays a hidden field.
  */
-function getpaid_hidden_field( $name, $value ) {
-    $name  = sanitize_text_field( $name );
-    $value = esc_attr( $value );
+function getpaid_hidden_field($name, $value) {
+    $name  = sanitize_text_field($name);
+    $value = esc_attr($value);
 
     echo "<input type='hidden' name='$name' value='$value' />";
 }
 
-function wpinv_html_text( $args = array() ) {
+function wpinv_html_text($args = array()) {
     // Backwards compatibility
-    if ( func_num_args() > 1 ) {
+    if (func_num_args() > 1) {
         $args = func_get_args();
 
         $name  = $args[0];
-        $value = isset( $args[1] ) ? $args[1] : '';
-        $label = isset( $args[2] ) ? $args[2] : '';
-        $desc  = isset( $args[3] ) ? $args[3] : '';
+        $value = isset($args[1]) ? $args[1] : '';
+        $label = isset($args[2]) ? $args[2] : '';
+        $desc  = isset($args[3]) ? $args[3] : '';
     }
 
     $defaults = array(
         'id'           => '',
-        'name'         => isset( $name )  ? $name  : 'text',
-        'value'        => isset( $value ) ? $value : null,
-        'label'        => isset( $label ) ? $label : null,
-        'desc'         => isset( $desc )  ? $desc  : null,
+        'name'         => isset($name) ? $name : 'text',
+        'value'        => isset($value) ? $value : null,
+        'label'        => isset($label) ? $label : null,
+        'desc'         => isset($desc) ? $desc : null,
         'placeholder'  => '',
         'class'        => 'regular-text',
         'disabled'     => false,
@@ -672,51 +672,51 @@ 
         'data'         => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if( $args['required'] ) {
+    if ($args['required']) {
         $options .= ' required="required"';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
 
     $data = '';
-    if ( !empty( $args['data'] ) ) {
-        foreach ( $args['data'] as $key => $value ) {
-            $data .= 'data-' . wpinv_sanitize_key( $key ) . '="' . esc_attr( $value ) . '" ';
+    if (!empty($args['data'])) {
+        foreach ($args['data'] as $key => $value) {
+            $data .= 'data-' . wpinv_sanitize_key($key) . '="' . esc_attr($value) . '" ';
         }
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['id'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['id']) . '">' . esc_html($args['label']) . '</label>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
 
-    $output .= '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] )  . '" autocomplete="' . esc_attr( $args['autocomplete'] )  . '" value="' . esc_attr( $args['value'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="' . $class . '" ' . $data . ' ' . trim( $options ) . '/>';
+    $output .= '<input type="text" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" autocomplete="' . esc_attr($args['autocomplete']) . '" value="' . esc_attr($args['value']) . '" placeholder="' . esc_attr($args['placeholder']) . '" class="' . $class . '" ' . $data . ' ' . trim($options) . '/>';
 
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_date_field( $args = array() ) {
-    if( empty( $args['class'] ) ) {
+function wpinv_html_date_field($args = array()) {
+    if (empty($args['class'])) {
         $args['class'] = 'wpiDatepicker';
-    } elseif( ! strpos( $args['class'], 'wpiDatepicker' ) ) {
+    } elseif (!strpos($args['class'], 'wpiDatepicker')) {
         $args['class'] .= ' wpiDatepicker';
     }
 
-    return wpinv_html_text( $args );
+    return wpinv_html_text($args);
 }
 
-function wpinv_html_textarea( $args = array() ) {
+function wpinv_html_textarea($args = array()) {
     $defaults = array(
         'name'        => 'textarea',
         'value'       => null,
@@ -727,31 +727,31 @@ 
         'placeholder' => '',
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $disabled = '';
-    if( $args['disabled'] ) {
+    if ($args['disabled']) {
         $disabled = ' disabled="disabled"';
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    $output .= '<textarea name="' . esc_attr( $args['name'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" id="' . wpinv_sanitize_key( $args['name'] ) . '" class="' . $class . '"' . $disabled . '>' . esc_attr( $args['value'] ) . '</textarea>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['name']) . '">' . esc_html($args['label']) . '</label>';
+    $output .= '<textarea name="' . esc_attr($args['name']) . '" placeholder="' . esc_attr($args['placeholder']) . '" id="' . wpinv_sanitize_key($args['name']) . '" class="' . $class . '"' . $disabled . '>' . esc_attr($args['value']) . '</textarea>';
 
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_ajax_user_search( $args = array() ) {
+function wpinv_html_ajax_user_search($args = array()) {
     $defaults = array(
         'name'        => 'user_id',
         'value'       => null,
-        'placeholder' => __( 'Enter username', 'invoicing' ),
+        'placeholder' => __('Enter username', 'invoicing'),
         'label'       => null,
         'desc'        => null,
         'class'       => '',
@@ -760,13 +760,13 @@ 
         'data'        => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $args['class'] = 'wpinv-ajax-user-search ' . $args['class'];
 
     $output  = '<span class="wpinv_user_search_wrap">';
-        $output .= wpinv_html_text( $args );
-        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __( 'Cancel', 'invoicing' ) . '" aria-label="' . __( 'Cancel', 'invoicing' ) . '" href="#">x</a><span></span></span>';
+        $output .= wpinv_html_text($args);
+        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __('Cancel', 'invoicing') . '" aria-label="' . __('Cancel', 'invoicing') . '" href="#">x</a><span></span></span>';
     $output .= '</span>';
 
     return $output;
@@ -782,20 +782,20 @@ 
  * 
  * @param string $template the template that is currently being used.
  */
-function wpinv_template( $template ) {
+function wpinv_template($template) {
     global $post;
 
-    if ( ! is_admin() && ( is_single() || is_404() ) && ! empty( $post->ID ) && getpaid_is_invoice_post_type( get_post_type( $post->ID ) ) ) {
+    if (!is_admin() && (is_single() || is_404()) && !empty($post->ID) && getpaid_is_invoice_post_type(get_post_type($post->ID))) {
 
         // If the user can view this invoice, display it.
-        if ( wpinv_user_can_view_invoice( $post->ID ) ) {
+        if (wpinv_user_can_view_invoice($post->ID)) {
 
-            return wpinv_get_template_part( 'wpinv-invoice-print', false, false );
+            return wpinv_get_template_part('wpinv-invoice-print', false, false);
 
         // Else display an error message.
         } else {
 
-            return wpinv_get_template_part( 'wpinv-invalid-access', false, false );
+            return wpinv_get_template_part('wpinv-invalid-access', false, false);
 
         }
 
@@ -803,46 +803,46 @@ 
 
     return $template;
 }
-add_filter( 'template_include', 'wpinv_template', 10, 1 );
+add_filter('template_include', 'wpinv_template', 10, 1);
 
 function wpinv_get_business_address() {
     $business_address   = wpinv_store_address();
-    $business_address   = !empty( $business_address ) ? wpautop( wp_kses_post( $business_address ) ) : '';
+    $business_address   = !empty($business_address) ? wpautop(wp_kses_post($business_address)) : '';
     
     $business_address = $business_address ? '<div class="address">' . $business_address . '</div>' : '';
     
-    return apply_filters( 'wpinv_get_business_address', $business_address );
+    return apply_filters('wpinv_get_business_address', $business_address);
 }
 
 /**
  * Displays the company address.
  */
 function wpinv_display_from_address() {
-    wpinv_get_template( 'invoice/company-address.php' );
+    wpinv_get_template('invoice/company-address.php');
 }
-add_action( 'getpaid_invoice_details_left', 'wpinv_display_from_address', 10 );
+add_action('getpaid_invoice_details_left', 'wpinv_display_from_address', 10);
 
-function wpinv_watermark( $id = 0 ) {
-    $output = wpinv_get_watermark( $id );
-    return apply_filters( 'wpinv_get_watermark', $output, $id );
+function wpinv_watermark($id = 0) {
+    $output = wpinv_get_watermark($id);
+    return apply_filters('wpinv_get_watermark', $output, $id);
 }
 
-function wpinv_get_watermark( $id ) {
-    if ( !$id > 0 ) {
+function wpinv_get_watermark($id) {
+    if (!$id > 0) {
         return NULL;
     }
 
-    $invoice = wpinv_get_invoice( $id );
+    $invoice = wpinv_get_invoice($id);
     
-    if ( !empty( $invoice ) && "wpi_invoice" === $invoice->post_type ) {
-        if ( $invoice->is_paid() ) {
-            return __( 'Paid', 'invoicing' );
+    if (!empty($invoice) && "wpi_invoice" === $invoice->post_type) {
+        if ($invoice->is_paid()) {
+            return __('Paid', 'invoicing');
         }
-        if ( $invoice->is_refunded() ) {
-            return __( 'Refunded', 'invoicing' );
+        if ($invoice->is_refunded()) {
+            return __('Refunded', 'invoicing');
         }
-        if ( $invoice->has_status( array( 'wpi-cancelled' ) ) ) {
-            return __( 'Cancelled', 'invoicing' );
+        if ($invoice->has_status(array('wpi-cancelled'))) {
+            return __('Cancelled', 'invoicing');
         }
     }
     
@@ -852,131 +852,131 @@ 
 /**
  * @deprecated
  */
-function wpinv_display_invoice_details( $invoice ) {
-    return getpaid_invoice_meta( $invoice );
+function wpinv_display_invoice_details($invoice) {
+    return getpaid_invoice_meta($invoice);
 }
 
 /**
  * Displays invoice meta.
  */
-function getpaid_invoice_meta( $invoice ) {
+function getpaid_invoice_meta($invoice) {
 
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Ensure that we have an invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return;
     }
 
     // Load the invoice meta.
-    $meta    = array(
+    $meta = array(
 
         'number' => array(
             'label' => sprintf(
-                __( '%s Number', 'invoicing' ),
-                ucfirst( $invoice->get_type() )
+                __('%s Number', 'invoicing'),
+                ucfirst($invoice->get_type())
             ),
-            'value' => sanitize_text_field( $invoice->get_number() ),
+            'value' => sanitize_text_field($invoice->get_number()),
         ),
 
         'status' => array(
             'label' => sprintf(
-                __( '%s Status', 'invoicing' ),
-                ucfirst( $invoice->get_type() )
+                __('%s Status', 'invoicing'),
+                ucfirst($invoice->get_type())
             ),
-            'value' => sanitize_text_field( $invoice->get_status_nicename() ),
+            'value' => sanitize_text_field($invoice->get_status_nicename()),
         ),
 
         'date' => array(
             'label' => sprintf(
-                __( '%s Date', 'invoicing' ),
-                ucfirst( $invoice->get_type() )
+                __('%s Date', 'invoicing'),
+                ucfirst($invoice->get_type())
             ),
-            'value' => getpaid_format_date( $invoice->get_created_date() ),
+            'value' => getpaid_format_date($invoice->get_created_date()),
         ),
 
         'date_paid' => array(
-            'label' => __( 'Paid On', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_completed_date() ),
+            'label' => __('Paid On', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_completed_date()),
         ),
 
         'transaction_id' => array(
-            'label' => __( 'Transaction ID', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_transaction_id() ),
+            'label' => __('Transaction ID', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_transaction_id()),
         ),
 
         'due_date'  => array(
-            'label' => __( 'Due Date', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_due_date() ),
+            'label' => __('Due Date', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_due_date()),
         ),
 
         'vat_number' => array(
             'label' => sprintf(
-                __( '%s Number', 'invoicing' ),
+                __('%s Number', 'invoicing'),
                 getpaid_tax()->get_vat_name()
             ),
-            'value' => sanitize_text_field( $invoice->get_vat_number() ),
+            'value' => sanitize_text_field($invoice->get_vat_number()),
         ),
 
     );
 
     // If it is not paid, remove the date of payment.
-    if ( ! $invoice->is_paid() ) {
-        unset( $meta[ 'date_paid' ] );
-        unset( $meta[ 'transaction_id' ] );
+    if (!$invoice->is_paid()) {
+        unset($meta['date_paid']);
+        unset($meta['transaction_id']);
     }
 
     // Only display the due date if due dates are enabled.
-    if ( ! $invoice->needs_payment() || ! wpinv_get_option( 'overdue_active' ) ) {
-        unset( $meta[ 'due_date' ] );
+    if (!$invoice->needs_payment() || !wpinv_get_option('overdue_active')) {
+        unset($meta['due_date']);
     }
 
     // Only display the vat number if taxes are enabled.
-    if ( ! wpinv_use_taxes() ) {
-        unset( $meta[ 'vat_number' ] );
+    if (!wpinv_use_taxes()) {
+        unset($meta['vat_number']);
     }
 
-    if ( $invoice->is_recurring() ) {
+    if ($invoice->is_recurring()) {
 
         // Link to the parent invoice.
-        if ( $invoice->is_renewal() ) {
+        if ($invoice->is_renewal()) {
 
-            $meta[ 'parent' ] = array(
+            $meta['parent'] = array(
 
                 'label' => sprintf(
-                    __( 'Parent %s', 'invoicing' ),
-                    ucfirst( $invoice->get_type() )
+                    __('Parent %s', 'invoicing'),
+                    ucfirst($invoice->get_type())
                 ),
 
-                'value' => wpinv_invoice_link( $invoice->get_parent_id() ),
+                'value' => wpinv_invoice_link($invoice->get_parent_id()),
 
             );
 
         }
 
-        $subscription = wpinv_get_subscription( $invoice );
+        $subscription = wpinv_get_subscription($invoice);
 
-        if ( ! empty ( $subscription ) ) {
+        if (!empty ($subscription)) {
 
             // Display the renewal date.
-            if ( $subscription->is_active() && 'cancelled' != $subscription->status ) {
+            if ($subscription->is_active() && 'cancelled' != $subscription->status) {
 
-                $meta[ 'renewal_date' ] = array(
+                $meta['renewal_date'] = array(
 
-                    'label' => __( 'Renews On', 'invoicing' ),
-                    'value' => getpaid_format_date( $subscription->expiration ),
+                    'label' => __('Renews On', 'invoicing'),
+                    'value' => getpaid_format_date($subscription->expiration),
         
                 );
 
             }
 
-            if ( $invoice->is_parent() ) {
+            if ($invoice->is_parent()) {
 
                 // Display the recurring amount.
-                $meta[ 'recurring_total' ] = array(
+                $meta['recurring_total'] = array(
 
-                    'label' => __( 'Recurring Amount', 'invoicing' ),
-                    'value' => wpinv_price( wpinv_format_amount( $subscription->recurring_amount ), $invoice->get_currency() ),
+                    'label' => __('Recurring Amount', 'invoicing'),
+                    'value' => wpinv_price(wpinv_format_amount($subscription->recurring_amount), $invoice->get_currency()),
         
                 );
 
@@ -986,20 +986,20 @@ 
     }
 
     // Add the invoice total to the meta.
-    $meta[ 'invoice_total' ] = array(
+    $meta['invoice_total'] = array(
 
-        'label' => __( 'Total Amount', 'invoicing' ),
-        'value' => wpinv_price( wpinv_format_amount( $invoice->get_total() ), $invoice->get_currency() ),
+        'label' => __('Total Amount', 'invoicing'),
+        'value' => wpinv_price(wpinv_format_amount($invoice->get_total()), $invoice->get_currency()),
 
     );
 
     // Provide a way for third party plugins to filter the meta.
-    $meta = apply_filters( 'getpaid_invoice_meta_data', $meta, $invoice );
+    $meta = apply_filters('getpaid_invoice_meta_data', $meta, $invoice);
 
-    wpinv_get_template( 'invoice/invoice-meta.php', compact( 'invoice', 'meta' ) );
+    wpinv_get_template('invoice/invoice-meta.php', compact('invoice', 'meta'));
 
 }
-add_action( 'getpaid_invoice_details_right', 'getpaid_invoice_meta', 10 );
+add_action('getpaid_invoice_details_right', 'getpaid_invoice_meta', 10);
 
 /**
  * Retrieves the address markup to use on Invoices.
@@ -1011,29 +1011,29 @@ 
  * @param  string $separator How to separate address lines.
  * @return string
  */
-function wpinv_get_invoice_address_markup( $billing_details, $separator = '<br/>' ) {
+function wpinv_get_invoice_address_markup($billing_details, $separator = '<br/>') {
 
     // Retrieve the address markup...
-    $country= empty( $billing_details['country'] ) ? '' : $billing_details['country'];
-    $format = wpinv_get_full_address_format( $country );
+    $country = empty($billing_details['country']) ? '' : $billing_details['country'];
+    $format = wpinv_get_full_address_format($country);
 
     // ... and the replacements.
-    $replacements = wpinv_get_invoice_address_replacements( $billing_details );
+    $replacements = wpinv_get_invoice_address_replacements($billing_details);
 
-    $formatted_address = str_ireplace( array_keys( $replacements ), $replacements, $format );
+    $formatted_address = str_ireplace(array_keys($replacements), $replacements, $format);
     
 	// Remove unavailable tags.
-    $formatted_address = preg_replace( "/\{\{\w+\}\}/", '', $formatted_address );
+    $formatted_address = preg_replace("/\{\{\w+\}\}/", '', $formatted_address);
 
     // Clean up white space.
-	$formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
-    $formatted_address = preg_replace( '/\n\n+/', "\n", $formatted_address );
+	$formatted_address = preg_replace('/  +/', ' ', trim($formatted_address));
+    $formatted_address = preg_replace('/\n\n+/', "\n", $formatted_address);
     
     // Break newlines apart and remove empty lines/trim commas and white space.
-	$formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
+	$formatted_address = array_filter(array_map('wpinv_trim_formatted_address_line', explode("\n", $formatted_address)));
 
     // Add html breaks.
-	$formatted_address = implode( $separator, $formatted_address );
+	$formatted_address = implode($separator, $formatted_address);
 
 	// We're done!
 	return $formatted_address;
@@ -1045,88 +1045,88 @@ 
  * 
  * @param WPInv_Invoice $invoice
  */
-function wpinv_display_to_address( $invoice = 0 ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/billing-address.php', compact( 'invoice' ) );
+function wpinv_display_to_address($invoice = 0) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/billing-address.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details_left', 'wpinv_display_to_address', 40 );
+add_action('getpaid_invoice_details_left', 'wpinv_display_to_address', 40);
 
 
 /**
  * Displays invoice line items.
  */
-function wpinv_display_line_items( $invoice_id = 0 ) {
+function wpinv_display_line_items($invoice_id = 0) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return;
     }
 
     // Line item columns.
-    $columns = getpaid_invoice_item_columns( $invoice );
-    $columns = apply_filters( 'getpaid_invoice_line_items_table_columns', $columns, $invoice );
+    $columns = getpaid_invoice_item_columns($invoice);
+    $columns = apply_filters('getpaid_invoice_line_items_table_columns', $columns, $invoice);
 
-    wpinv_get_template( 'invoice/line-items.php', compact( 'invoice', 'columns' ) );
+    wpinv_get_template('invoice/line-items.php', compact('invoice', 'columns'));
 }
-add_action( 'getpaid_invoice_line_items', 'wpinv_display_line_items', 10 );
+add_action('getpaid_invoice_line_items', 'wpinv_display_line_items', 10);
 
 /**
  * Displays invoice notices on invoices.
  */
 function wpinv_display_invoice_notice() {
 
-    $label  = wpinv_get_option( 'vat_invoice_notice_label' );
-    $notice = wpinv_get_option( 'vat_invoice_notice' );
+    $label  = wpinv_get_option('vat_invoice_notice_label');
+    $notice = wpinv_get_option('vat_invoice_notice');
 
-    if ( empty( $label ) && empty( $notice ) ) {
+    if (empty($label) && empty($notice)) {
         return;
     }
 
     echo '<div class="mt-4 mb-4 wpinv-vat-notice">';
 
-    if ( ! empty( $label ) ) {
-        $label = sanitize_text_field( $label );
+    if (!empty($label)) {
+        $label = sanitize_text_field($label);
         echo "<h5>$label</h5>";
     }
 
-    if ( ! empty( $notice ) ) {
-        echo '<small class="form-text text-muted">' . wpautop( wptexturize( $notice ) ) . '</small>';
+    if (!empty($notice)) {
+        echo '<small class="form-text text-muted">' . wpautop(wptexturize($notice)) . '</small>';
     }
 
     echo '</div>';
 }
-add_action( 'getpaid_invoice_line_items', 'wpinv_display_invoice_notice', 100 );
+add_action('getpaid_invoice_line_items', 'wpinv_display_invoice_notice', 100);
 
 /**
  * @param WPInv_Invoice $invoice
  */
-function wpinv_display_invoice_notes( $invoice ) {
+function wpinv_display_invoice_notes($invoice) {
 
     // Retrieve the notes.
-    $notes = wpinv_get_invoice_notes( $invoice->get_id(), 'customer' );
+    $notes = wpinv_get_invoice_notes($invoice->get_id(), 'customer');
 
     // Abort if we have non.
-    if ( empty( $notes ) ) {
+    if (empty($notes)) {
         return;
     }
 
     // Echo the note.
     echo '<div class="getpaid-invoice-notes-wrapper border position-relative w-100 mb-4 p-0">';
-    echo '<h3 class="getpaid-invoice-notes-title text-dark bg-light border-bottom m-0 d-block">' . __( 'Notes', 'invoicing' ) .'</h3>';
+    echo '<h3 class="getpaid-invoice-notes-title text-dark bg-light border-bottom m-0 d-block">' . __('Notes', 'invoicing') . '</h3>';
     echo '<ul class="getpaid-invoice-notes mt-4 p-0">';
 
-    foreach( $notes as $note ) {
-        wpinv_get_invoice_note_line_item( $note );
+    foreach ($notes as $note) {
+        wpinv_get_invoice_note_line_item($note);
     }
 
     echo '</ul>';
     echo '</div>';
 }
-add_action( 'getpaid_invoice_line_items', 'wpinv_display_invoice_notes', 60 );
+add_action('getpaid_invoice_line_items', 'wpinv_display_invoice_notes', 60);
 
 /**
  * Loads scripts on our invoice templates.
@@ -1134,32 +1134,32 @@ 
 function wpinv_display_style() {
 
     // Make sure that all scripts have been loaded.
-    if ( ! did_action( 'wp_enqueue_scripts' ) ) {
-        do_action( 'wp_enqueue_scripts' );
+    if (!did_action('wp_enqueue_scripts')) {
+        do_action('wp_enqueue_scripts');
     }
 
     // Register the invoices style.
-    wp_register_style( 'wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice.css' ) );
+    wp_register_style('wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), filemtime(WPINV_PLUGIN_DIR . 'assets/css/invoice.css'));
 
     // Load required styles
-    wp_print_styles( 'open-sans' );
-    wp_print_styles( 'wpinv-single-style' );
-    wp_print_styles( 'ayecode-ui' );
+    wp_print_styles('open-sans');
+    wp_print_styles('wpinv-single-style');
+    wp_print_styles('ayecode-ui');
 
     // Maybe load custom css.
-    $custom_css = wpinv_get_option( 'template_custom_css' );
+    $custom_css = wpinv_get_option('template_custom_css');
 
-    if ( isset( $custom_css ) && ! empty( $custom_css ) ) {
-        $custom_css     = wp_kses( $custom_css, array( '\'', '\"' ) );
-        $custom_css     = str_replace( '&gt;', '>', $custom_css );
+    if (isset($custom_css) && !empty($custom_css)) {
+        $custom_css     = wp_kses($custom_css, array('\'', '\"'));
+        $custom_css     = str_replace('&gt;', '>', $custom_css);
         echo '<style type="text/css">';
         echo $custom_css;
         echo '</style>';
     }
 
 }
-add_action( 'wpinv_invoice_print_head', 'wpinv_display_style' );
-add_action( 'wpinv_invalid_invoice_head', 'wpinv_display_style' );
+add_action('wpinv_invoice_print_head', 'wpinv_display_style');
+add_action('wpinv_invalid_invoice_head', 'wpinv_display_style');
 
 
 /**
@@ -1171,41 +1171,41 @@ 
     // Retrieve the current invoice.
     $invoice_id = getpaid_get_current_invoice_id();
 
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'Invalid invoice', 'invoicing' ),
+                'content' => __('Invalid invoice', 'invoicing'),
             )
         );
 
     }
 
     // Can the user view this invoice?
-    if ( ! wpinv_user_can_view_invoice( $invoice_id ) ) {
+    if (!wpinv_user_can_view_invoice($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'You are not allowed to view this invoice', 'invoicing' ),
+                'content' => __('You are not allowed to view this invoice', 'invoicing'),
             )
         );
 
     }
 
     // Ensure that it is not yet paid for.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Maybe mark it as viewed.
-    getpaid_maybe_mark_invoice_as_viewed( $invoice );
+    getpaid_maybe_mark_invoice_as_viewed($invoice);
 
-    if ( $invoice->is_paid() ) {
+    if ($invoice->is_paid()) {
 
         return aui()->alert(
             array(
                 'type'    => 'success',
-                'content' => __( 'This invoice has already been paid.', 'invoicing' ),
+                'content' => __('This invoice has already been paid.', 'invoicing'),
             )
         );
 
@@ -1215,14 +1215,14 @@ 
     $wpi_checkout_id = $invoice_id;
 
     // We'll display this invoice via the default form.
-    $form = new GetPaid_Payment_Form( wpinv_get_default_payment_form() );
+    $form = new GetPaid_Payment_Form(wpinv_get_default_payment_form());
 
-    if ( 0 == $form->get_id() ) {
+    if (0 == $form->get_id()) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'Error loading the payment form', 'invoicing' ),
+                'content' => __('Error loading the payment form', 'invoicing'),
             )
         );
 
@@ -1230,37 +1230,37 @@ 
 
     // Set the invoice.
     $form->invoice = $invoice;
-    $form->set_items( $invoice->get_items() );
+    $form->set_items($invoice->get_items());
 
     // Generate the html.
     return $form->get_html();
 
 }
 
-function wpinv_checkout_cart( $cart_details = array(), $echo = true ) {
+function wpinv_checkout_cart($cart_details = array(), $echo = true) {
     global $ajax_cart_details;
     $ajax_cart_details = $cart_details;
 
     ob_start();
-    do_action( 'wpinv_before_checkout_cart' );
+    do_action('wpinv_before_checkout_cart');
     echo '<div id="wpinv_checkout_cart_form" method="post">';
         echo '<div id="wpinv_checkout_cart_wrap">';
-            wpinv_get_template_part( 'wpinv-checkout-cart' );
+            wpinv_get_template_part('wpinv-checkout-cart');
         echo '</div>';
     echo '</div>';
-    do_action( 'wpinv_after_checkout_cart' );
+    do_action('wpinv_after_checkout_cart');
     $content = ob_get_clean();
 
-    if ( $echo ) {
+    if ($echo) {
         echo $content;
     } else {
         return $content;
     }
 }
-add_action( 'wpinv_checkout_cart', 'wpinv_checkout_cart', 10 );
+add_action('wpinv_checkout_cart', 'wpinv_checkout_cart', 10);
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+	return apply_filters('wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __('Your cart is empty.', 'invoicing') . '</span>');
 }
 
 /**
@@ -1277,51 +1277,51 @@ 
         )
     );
 }
-add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
+add_action('wpinv_cart_empty', 'wpinv_empty_checkout_cart');
 
 function wpinv_checkout_cart_columns() {
     $default = 3;
-    if ( wpinv_item_quantities_enabled() ) {
+    if (wpinv_item_quantities_enabled()) {
         $default++;
     }
 
-    if ( wpinv_use_taxes() ) {
+    if (wpinv_use_taxes()) {
         $default++;
     }
 
-    return apply_filters( 'wpinv_checkout_cart_columns', $default );
+    return apply_filters('wpinv_checkout_cart_columns', $default);
 }
 
-function wpinv_receipt_billing_address( $invoice_id = 0 ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_receipt_billing_address($invoice_id = 0) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
 
     $billing_details = $invoice->get_user_info();
-    $address_row = wpinv_get_invoice_address_markup( $billing_details );
+    $address_row = wpinv_get_invoice_address_markup($billing_details);
 
     ob_start();
     ?>
     <table class="table table-bordered table-sm wpi-billing-details">
         <tbody>
             <tr class="wpi-receipt-name">
-                <th class="text-left"><?php _e( 'Name', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( trim( $billing_details['first_name'] . ' ' . $billing_details['last_name'] ) ) ;?></td>
+                <th class="text-left"><?php _e('Name', 'invoicing'); ?></th>
+                <td><?php echo esc_html(trim($billing_details['first_name'] . ' ' . $billing_details['last_name'])); ?></td>
             </tr>
             <tr class="wpi-receipt-email">
-                <th class="text-left"><?php _e( 'Email', 'invoicing' ); ?></th>
-                <td><?php echo $billing_details['email'] ;?></td>
+                <th class="text-left"><?php _e('Email', 'invoicing'); ?></th>
+                <td><?php echo $billing_details['email']; ?></td>
             </tr>
             <tr class="wpi-receipt-address">
-                <th class="text-left"><?php _e( 'Address', 'invoicing' ); ?></th>
-                <td><?php echo $address_row ;?></td>
+                <th class="text-left"><?php _e('Address', 'invoicing'); ?></th>
+                <td><?php echo $address_row; ?></td>
             </tr>
-            <?php if ( $billing_details['phone'] ) { ?>
+            <?php if ($billing_details['phone']) { ?>
             <tr class="wpi-receipt-phone">
-                <th class="text-left"><?php _e( 'Phone', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $billing_details['phone'] ) ;?></td>
+                <th class="text-left"><?php _e('Phone', 'invoicing'); ?></th>
+                <td><?php echo esc_html($billing_details['phone']); ?></td>
             </tr>
             <?php } ?>
         </tbody>
@@ -1329,7 +1329,7 @@ 
     <?php
     $output = ob_get_clean();
     
-    $output = apply_filters( 'wpinv_receipt_billing_address', $output, $invoice_id );
+    $output = apply_filters('wpinv_receipt_billing_address', $output, $invoice_id);
 
     echo $output;
 }
@@ -1337,56 +1337,56 @@ 
 /**
  * Filters the receipt page.
  */
-function wpinv_filter_success_page_content( $content ) {
+function wpinv_filter_success_page_content($content) {
 
     // Ensure this is our page.
-    if ( isset( $_GET['payment-confirm'] ) && wpinv_is_success_page() ) {
+    if (isset($_GET['payment-confirm']) && wpinv_is_success_page()) {
 
-        $gateway = sanitize_text_field( $_GET['payment-confirm'] );
-        return apply_filters( "wpinv_payment_confirm_$gateway", $content );
+        $gateway = sanitize_text_field($_GET['payment-confirm']);
+        return apply_filters("wpinv_payment_confirm_$gateway", $content);
 
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_filter_success_page_content', 99999 );
+add_filter('the_content', 'wpinv_filter_success_page_content', 99999);
 
-function wpinv_invoice_link( $invoice_id ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_invoice_link($invoice_id) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
 
-    $invoice_link = '<a href="' . esc_url( $invoice->get_view_url() ) . '">' . $invoice->get_number() . '</a>';
+    $invoice_link = '<a href="' . esc_url($invoice->get_view_url()) . '">' . $invoice->get_number() . '</a>';
 
-    return apply_filters( 'wpinv_get_invoice_link', $invoice_link, $invoice );
+    return apply_filters('wpinv_get_invoice_link', $invoice_link, $invoice);
 }
 
-function wpinv_invoice_subscription_details( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->is_recurring() && ! wpinv_is_subscription_payment( $invoice ) ) {
-        $subscription = wpinv_get_subscription( $invoice, true );
+function wpinv_invoice_subscription_details($invoice) {
+    if (!empty($invoice) && $invoice->is_recurring() && !wpinv_is_subscription_payment($invoice)) {
+        $subscription = wpinv_get_subscription($invoice, true);
 
-        if ( empty( $subscription ) ) {
+        if (empty($subscription)) {
             return;
         }
 
         $frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($subscription->period, $subscription->frequency);
-        $billing = wpinv_price(wpinv_format_amount($subscription->recurring_amount), $invoice->get_currency() ) . ' / ' . $frequency;
-        $initial = wpinv_price(wpinv_format_amount($subscription->initial_amount), $invoice->get_currency() );
+        $billing = wpinv_price(wpinv_format_amount($subscription->recurring_amount), $invoice->get_currency()) . ' / ' . $frequency;
+        $initial = wpinv_price(wpinv_format_amount($subscription->initial_amount), $invoice->get_currency());
 
         $payments = $subscription->get_child_payments();
         ?>
         <div class="wpinv-subscriptions-details">
-            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters( 'wpinv_subscription_details_title', __( 'Subscription Details', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters('wpinv_subscription_details_title', __('Subscription Details', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
-                        <th><?php _e( 'Billing Cycle', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Start Date', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Expiration Date', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Times Billed', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Status', 'invoicing' ) ;?></th>
+                        <th><?php _e('Billing Cycle', 'invoicing'); ?></th>
+                        <th><?php _e('Start Date', 'invoicing'); ?></th>
+                        <th><?php _e('Expiration Date', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Times Billed', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Status', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -1400,29 +1400,29 @@ 
                 </tbody>
             </table>
         </div>
-        <?php if ( !empty( $payments ) ) { ?>
+        <?php if (!empty($payments)) { ?>
         <div class="wpinv-renewal-payments">
-            <h3 class="wpinv-renewals-t"><?php echo apply_filters( 'wpinv_renewal_payments_title', __( 'Renewal Payments', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-renewals-t"><?php echo apply_filters('wpinv_renewal_payments_title', __('Renewal Payments', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
                         <th>#</th>
-                        <th><?php _e( 'Invoice', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Date', 'invoicing' ) ;?></th>
-                        <th class="text-right"><?php _e( 'Amount', 'invoicing' ) ;?></th>
+                        <th><?php _e('Invoice', 'invoicing'); ?></th>
+                        <th><?php _e('Date', 'invoicing'); ?></th>
+                        <th class="text-right"><?php _e('Amount', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php
                         $i = 1;
-                        foreach ( $payments as $payment ) {
+                        foreach ($payments as $payment) {
                             $invoice_id = $payment->ID;
                     ?>
                     <tr>
-                        <th scope="row"><?php echo $i;?></th>
-                        <td><?php echo wpinv_invoice_link( $invoice_id ) ;?></td>
+                        <th scope="row"><?php echo $i; ?></th>
+                        <td><?php echo wpinv_invoice_link($invoice_id); ?></td>
                         <td><?php echo$invoice->get_date_created(); ?></td>
-                        <td class="text-right"><?php echo wpinv_price( wpinv_format_amount( $invoice->get_total() ), $invoice->get_currency() ); ?></td>
+                        <td class="text-right"><?php echo wpinv_price(wpinv_format_amount($invoice->get_total()), $invoice->get_currency()); ?></td>
                     </tr>
                     <?php $i++; } ?>
                 </tbody>
@@ -1432,64 +1432,64 @@ 
         <?php
     }
 }
-add_action( 'getpaid_invoice_line_items', 'wpinv_invoice_subscription_details', 20 );
+add_action('getpaid_invoice_line_items', 'wpinv_invoice_subscription_details', 20);
 
-function wpinv_cart_total_label( $label, $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_cart_total_label($label, $invoice) {
+    if (empty($invoice)) {
         return $label;
     }
 
     $prefix_label = '';
-    if ( $invoice->is_parent() && $item_id = $invoice->get_recurring() ) {
-        $prefix_label   = '<span class="label label-primary label-recurring">' . __( 'Recurring Payment', 'invoicing' ) . '</span> ' . wpinv_subscription_payment_desc( $invoice );
-    } else if ( $invoice->is_renewal() ) {
-        $prefix_label   = '<span class="label label-primary label-renewal">' . __( 'Renewal Payment', 'invoicing' ) . '</span> ';        
+    if ($invoice->is_parent() && $item_id = $invoice->get_recurring()) {
+        $prefix_label   = '<span class="label label-primary label-recurring">' . __('Recurring Payment', 'invoicing') . '</span> ' . wpinv_subscription_payment_desc($invoice);
+    } else if ($invoice->is_renewal()) {
+        $prefix_label   = '<span class="label label-primary label-renewal">' . __('Renewal Payment', 'invoicing') . '</span> ';        
     }
 
-    if ( $prefix_label != '' ) {
-        $label  = '<span class="wpinv-cart-sub-desc">' . $prefix_label . '</span> ' . $label;
+    if ($prefix_label != '') {
+        $label = '<span class="wpinv-cart-sub-desc">' . $prefix_label . '</span> ' . $label;
     }
 
     return $label;
 }
-add_filter( 'wpinv_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
-add_filter( 'wpinv_email_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
-add_filter( 'wpinv_print_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
+add_filter('wpinv_cart_total_label', 'wpinv_cart_total_label', 10, 2);
+add_filter('wpinv_email_cart_total_label', 'wpinv_cart_total_label', 10, 2);
+add_filter('wpinv_print_cart_total_label', 'wpinv_cart_total_label', 10, 2);
 
-function wpinv_get_invoice_note_line_item( $note, $echo = true ) {
-    if ( empty( $note ) ) {
+function wpinv_get_invoice_note_line_item($note, $echo = true) {
+    if (empty($note)) {
         return NULL;
     }
 
-    if ( is_int( $note ) ) {
-        $note = get_comment( $note );
+    if (is_int($note)) {
+        $note = get_comment($note);
     }
 
-    if ( !( is_object( $note ) && is_a( $note, 'WP_Comment' ) ) ) {
+    if (!(is_object($note) && is_a($note, 'WP_Comment'))) {
         return NULL;
     }
 
-    $note_classes   = array( 'note' );
-    $note_classes[] = get_comment_meta( $note->comment_ID, '_wpi_customer_note', true ) ? 'customer-note' : '';
+    $note_classes   = array('note');
+    $note_classes[] = get_comment_meta($note->comment_ID, '_wpi_customer_note', true) ? 'customer-note' : '';
     $note_classes[] = $note->comment_author === 'System' ? 'system-note' : '';
-    $note_classes   = apply_filters( 'wpinv_invoice_note_class', array_filter( $note_classes ), $note );
-    $note_classes   = !empty( $note_classes ) ? implode( ' ', $note_classes ) : '';
+    $note_classes   = apply_filters('wpinv_invoice_note_class', array_filter($note_classes), $note);
+    $note_classes   = !empty($note_classes) ? implode(' ', $note_classes) : '';
 
     ob_start();
     ?>
-    <li rel="<?php echo absint( $note->comment_ID ) ; ?>" class="<?php echo esc_attr( $note_classes ); ?> mt-4 pl-3 pr-3">
+    <li rel="<?php echo absint($note->comment_ID); ?>" class="<?php echo esc_attr($note_classes); ?> mt-4 pl-3 pr-3">
         <div class="note_content bg-light border position-relative p-4">
 
-            <?php echo wpautop( wptexturize( wp_kses_post( $note->comment_content ) ) ); ?>
+            <?php echo wpautop(wptexturize(wp_kses_post($note->comment_content))); ?>
 
-            <?php if ( ! is_admin() ) : ?>
+            <?php if (!is_admin()) : ?>
                 <em class="meta position-absolute form-text">
                     <?php
                         printf(
-                            __( '%1$s - %2$s at %3$s', 'invoicing' ),
+                            __('%1$s - %2$s at %3$s', 'invoicing'),
                             $note->comment_author,
-                            date_i18n( get_option( 'date_format' ), strtotime( $note->comment_date ) ),
-                            date_i18n( get_option( 'time_format' ), strtotime( $note->comment_date ) )
+                            date_i18n(get_option('date_format'), strtotime($note->comment_date)),
+                            date_i18n(get_option('time_format'), strtotime($note->comment_date))
                         );
                     ?>
                 </em>
@@ -1497,12 +1497,12 @@ 
 
         </div>
 
-        <?php if ( is_admin() ) : ?>
+        <?php if (is_admin()) : ?>
 
             <p class="meta px-4 py-2">
-                <abbr class="exact-date" title="<?php echo esc_attr( $note->comment_date ); ?>"><?php printf( __( '%1$s - %2$s at %3$s', 'invoicing' ), $note->comment_author, date_i18n( get_option( 'date_format' ), strtotime( $note->comment_date ) ), date_i18n( get_option( 'time_format' ), strtotime( $note->comment_date ) ) ); ?></abbr>&nbsp;&nbsp;
-                <?php if ( $note->comment_author !== 'System' && wpinv_current_user_can_manage_invoicing() ) { ?>
-                    <a href="#" class="delete_note"><?php _e( 'Delete note', 'invoicing' ); ?></a>
+                <abbr class="exact-date" title="<?php echo esc_attr($note->comment_date); ?>"><?php printf(__('%1$s - %2$s at %3$s', 'invoicing'), $note->comment_author, date_i18n(get_option('date_format'), strtotime($note->comment_date)), date_i18n(get_option('time_format'), strtotime($note->comment_date))); ?></abbr>&nbsp;&nbsp;
+                <?php if ($note->comment_author !== 'System' && wpinv_current_user_can_manage_invoicing()) { ?>
+                    <a href="#" class="delete_note"><?php _e('Delete note', 'invoicing'); ?></a>
                 <?php } ?>
             </p>
 
@@ -1511,9 +1511,9 @@ 
     </li>
     <?php
     $note_content = ob_get_clean();
-    $note_content = apply_filters( 'wpinv_get_invoice_note_line_item', $note_content, $note, $echo );
+    $note_content = apply_filters('wpinv_get_invoice_note_line_item', $note_content, $note, $echo);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $note_content;
     } else {
         return $note_content;
@@ -1523,36 +1523,36 @@ 
 function wpinv_invalid_invoice_content() {
     global $post;
 
-    $invoice = wpinv_get_invoice( $post->ID );
+    $invoice = wpinv_get_invoice($post->ID);
 
-    $error = __( 'This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing' );
-    if ( !empty( $invoice->get_id() ) && $invoice->has_status( array_keys( wpinv_get_invoice_statuses() ) ) ) {
-        if ( is_user_logged_in() ) {
-            if ( wpinv_require_login_to_checkout() ) {
-                if ( isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-                    $error = __( 'You are not allowed to view this invoice.', 'invoicing' );
+    $error = __('This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing');
+    if (!empty($invoice->get_id()) && $invoice->has_status(array_keys(wpinv_get_invoice_statuses()))) {
+        if (is_user_logged_in()) {
+            if (wpinv_require_login_to_checkout()) {
+                if (isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+                    $error = __('You are not allowed to view this invoice.', 'invoicing');
                 }
             }
         } else {
-            if ( wpinv_require_login_to_checkout() ) {
-                if ( isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-                    $error = __( 'You must be logged in to view this invoice.', 'invoicing' );
+            if (wpinv_require_login_to_checkout()) {
+                if (isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+                    $error = __('You must be logged in to view this invoice.', 'invoicing');
                 }
             }
         }
     } else {
-        $error = __( 'This invoice is deleted or does not exist.', 'invoicing' );
+        $error = __('This invoice is deleted or does not exist.', 'invoicing');
     }
     ?>
     <div class="row wpinv-row-invalid">
         <div class="col-md-6 col-md-offset-3 wpinv-message error">
-            <h3><?php _e( 'Access Denied', 'invoicing' ); ?></h3>
+            <h3><?php _e('Access Denied', 'invoicing'); ?></h3>
             <p class="wpinv-msg-text"><?php echo $error; ?></p>
         </div>
     </div>
     <?php
 }
-add_action( 'wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content' );
+add_action('wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content');
 
 /**
  * Function to get privacy policy text.
@@ -1561,21 +1561,21 @@ 
  * @return string
  */
 function wpinv_get_policy_text() {
-    $privacy_page_id = get_option( 'wp_page_for_privacy_policy', 0 );
+    $privacy_page_id = get_option('wp_page_for_privacy_policy', 0);
 
-    $text = wpinv_get_option('invoicing_privacy_checkout_message', sprintf( __( 'Your personal data will be used to process your invoice, payment and for other purposes described in our %s.', 'invoicing' ), '[wpinv_privacy_policy]' ));
+    $text = wpinv_get_option('invoicing_privacy_checkout_message', sprintf(__('Your personal data will be used to process your invoice, payment and for other purposes described in our %s.', 'invoicing'), '[wpinv_privacy_policy]'));
 
-    if(!$privacy_page_id){
-        $privacy_page_id = wpinv_get_option( 'privacy_page', 0 );
+    if (!$privacy_page_id) {
+        $privacy_page_id = wpinv_get_option('privacy_page', 0);
     }
 
-    $privacy_link    = $privacy_page_id ? '<a href="' . esc_url( get_permalink( $privacy_page_id ) ) . '" class="wpinv-privacy-policy-link" target="_blank">' . __( 'privacy policy', 'invoicing' ) . '</a>' : __( 'privacy policy', 'invoicing' );
+    $privacy_link = $privacy_page_id ? '<a href="' . esc_url(get_permalink($privacy_page_id)) . '" class="wpinv-privacy-policy-link" target="_blank">' . __('privacy policy', 'invoicing') . '</a>' : __('privacy policy', 'invoicing');
 
     $find_replace = array(
         '[wpinv_privacy_policy]' => $privacy_link,
     );
 
-    $privacy_text = str_replace( array_keys( $find_replace ), array_values( $find_replace ), $text );
+    $privacy_text = str_replace(array_keys($find_replace), array_values($find_replace), $text);
 
     return wp_kses_post(wpautop($privacy_text));
 }
@@ -1584,25 +1584,25 @@ 
 /**
  * Allows the user to set their own price for an invoice item
  */
-function wpinv_checkout_cart_item_name_your_price( $cart_item, $key ) {
+function wpinv_checkout_cart_item_name_your_price($cart_item, $key) {
     
     //Ensure we have an item id
-    if(! is_array( $cart_item ) || empty( $cart_item['id'] ) ) {
+    if (!is_array($cart_item) || empty($cart_item['id'])) {
         return;
     }
 
     //Fetch the item
     $item_id = $cart_item['id'];
-    $item    = new WPInv_Item( $item_id );
+    $item    = new WPInv_Item($item_id);
     
-    if(! $item->supports_dynamic_pricing() || !$item->get_is_dynamic_pricing() ) {
+    if (!$item->supports_dynamic_pricing() || !$item->get_is_dynamic_pricing()) {
         return;
     }
 
     //Fetch the dynamic pricing "strings"
-    $suggested_price_text = esc_html( wpinv_get_option( 'suggested_price_text', __( 'Suggested Price:', 'invoicing' ) ) );
-    $minimum_price_text   = esc_html( wpinv_get_option( 'minimum_price_text', __( 'Minimum Price:', 'invoicing' ) ) );
-    $name_your_price_text = esc_html( wpinv_get_option( 'name_your_price_text', __( 'Name Your Price', 'invoicing' ) ) );
+    $suggested_price_text = esc_html(wpinv_get_option('suggested_price_text', __('Suggested Price:', 'invoicing')));
+    $minimum_price_text   = esc_html(wpinv_get_option('minimum_price_text', __('Minimum Price:', 'invoicing')));
+    $name_your_price_text = esc_html(wpinv_get_option('name_your_price_text', __('Name Your Price', 'invoicing')));
 
     //Display a "name_your_price" button
     echo " &mdash; <a href='#' class='wpinv-name-your-price-frontend small'>$name_your_price_text</a></div>";
@@ -1611,7 +1611,7 @@ 
     echo '<div class="name-your-price-miniform">';
     
     //Maybe display the recommended price
-    if( $item->get_price() > 0 && !empty( $suggested_price_text ) ) {
+    if ($item->get_price() > 0 && !empty($suggested_price_text)) {
         $suggested_price = $item->get_the_price();
         echo "<div>$suggested_price_text &mdash; $suggested_price</div>";
     }
@@ -1619,52 +1619,52 @@ 
     //Display the update price form
     $symbol         = wpinv_currency_symbol();
     $position       = wpinv_currency_position();
-    $minimum        = esc_attr( $item->get_minimum_price() );
-    $price          = esc_attr( $cart_item['item_price'] );
-    $update         = esc_attr__( "Update", 'invoicing' );
+    $minimum        = esc_attr($item->get_minimum_price());
+    $price          = esc_attr($cart_item['item_price']);
+    $update         = esc_attr__("Update", 'invoicing');
 
     //Ensure it supports dynamic prici
-    if( $price < $minimum ) {
+    if ($price < $minimum) {
         $price = $minimum;
     }
 
     echo '<label>';
     echo $position != 'right' ? $symbol . '&nbsp;' : '';
     echo "<input type='number' min='$minimum' placeholder='$price' value='$price' class='wpi-field-price' />";
-    echo $position == 'right' ? '&nbsp;' . $symbol : '' ;
+    echo $position == 'right' ? '&nbsp;' . $symbol : '';
     echo "</label>";
     echo "<input type='hidden' value='$item_id' class='wpi-field-item' />";
     echo "<a class='btn btn-success wpinv-submit wpinv-update-dynamic-price-frontend'>$update</a>";
 
     //Maybe display the minimum price
-    if( $item->get_minimum_price() > 0 && !empty( $minimum_price_text ) ) {
-        $minimum_price = wpinv_price( wpinv_format_amount( $item->get_minimum_price() ) );
+    if ($item->get_minimum_price() > 0 && !empty($minimum_price_text)) {
+        $minimum_price = wpinv_price(wpinv_format_amount($item->get_minimum_price()));
         echo "<div>$minimum_price_text &mdash; $minimum_price</div>";
     }
 
     echo "</div>";
 
 }
-add_action( 'wpinv_checkout_cart_item_price_after', 'wpinv_checkout_cart_item_name_your_price', 10, 2 );
+add_action('wpinv_checkout_cart_item_price_after', 'wpinv_checkout_cart_item_name_your_price', 10, 2);
 
 function wpinv_oxygen_fix_conflict() {
     global $ct_ignore_post_types;
 
-    if ( ! is_array( $ct_ignore_post_types ) ) {
+    if (!is_array($ct_ignore_post_types)) {
         $ct_ignore_post_types = array();
     }
 
-    $post_types = array( 'wpi_discount', 'wpi_invoice', 'wpi_item' );
+    $post_types = array('wpi_discount', 'wpi_invoice', 'wpi_item');
 
-    foreach ( $post_types as $post_type ) {
+    foreach ($post_types as $post_type) {
         $ct_ignore_post_types[] = $post_type;
 
         // Ignore post type
-        add_filter( 'pre_option_oxygen_vsb_ignore_post_type_' . $post_type, '__return_true', 999 );
+        add_filter('pre_option_oxygen_vsb_ignore_post_type_' . $post_type, '__return_true', 999);
     }
 
-    remove_filter( 'template_include', 'wpinv_template', 10, 1 );
-    add_filter( 'template_include', 'wpinv_template', 999, 1 );
+    remove_filter('template_include', 'wpinv_template', 10, 1);
+    add_filter('template_include', 'wpinv_template', 999, 1);
 }
 
 /**
@@ -1672,10 +1672,10 @@ 
  * 
  * @param GetPaid_Payment_Form $form
  */
-function getpaid_display_payment_form( $form ) {
+function getpaid_display_payment_form($form) {
 
-    if ( is_numeric( $form ) ) {
-        $form = new GetPaid_Payment_Form( $form );
+    if (is_numeric($form)) {
+        $form = new GetPaid_Payment_Form($form);
     }
 
     $form->display();
@@ -1685,124 +1685,124 @@ 
 /**
  * Helper function to display a item payment form on the frontend.
  */
-function getpaid_display_item_payment_form( $items ) {
+function getpaid_display_item_payment_form($items) {
     global $invoicing;
 
-    foreach ( array_keys( $items ) as $id ) {
-	    if ( 'publish' != get_post_status( $id ) ) {
-		    unset( $items[ $id ] );
+    foreach (array_keys($items) as $id) {
+	    if ('publish' != get_post_status($id)) {
+		    unset($items[$id]);
 	    }
     }
 
-    if ( empty( $items ) ) {
+    if (empty($items)) {
 		return aui()->alert(
 			array(
 				'type'    => 'warning',
-				'content' => __( 'No published items found', 'invoicing' ),
+				'content' => __('No published items found', 'invoicing'),
 			)
 		);
     }
 
-    $item_key = getpaid_convert_items_to_string( $items );
+    $item_key = getpaid_convert_items_to_string($items);
 
     // Get the form elements and items.
     $form     = wpinv_get_default_payment_form();
-	$elements = $invoicing->form_elements->get_form_elements( $form );
-	$items    = $invoicing->form_elements->convert_normal_items( $items );
+	$elements = $invoicing->form_elements->get_form_elements($form);
+	$items    = $invoicing->form_elements->convert_normal_items($items);
 
 	ob_start();
 	echo "<form class='wpinv_payment_form'>";
-	do_action( 'wpinv_payment_form_top' );
+	do_action('wpinv_payment_form_top');
     echo "<input type='hidden' name='form_id' value='$form'/>";
     echo "<input type='hidden' name='form_items' value='$item_key'/>";
-	wp_nonce_field( 'wpinv_payment_form', 'wpinv_payment_form' );
-	wp_nonce_field( 'vat_validation', '_wpi_nonce' );
+	wp_nonce_field('wpinv_payment_form', 'wpinv_payment_form');
+	wp_nonce_field('vat_validation', '_wpi_nonce');
 
-	foreach ( $elements as $element ) {
-		do_action( 'wpinv_frontend_render_payment_form_element', $element, $items, $form );
-		do_action( "wpinv_frontend_render_payment_form_{$element['type']}", $element, $items, $form );
+	foreach ($elements as $element) {
+		do_action('wpinv_frontend_render_payment_form_element', $element, $items, $form);
+		do_action("wpinv_frontend_render_payment_form_{$element['type']}", $element, $items, $form);
 	}
 
 	echo "<div class='wpinv_payment_form_errors alert alert-danger d-none'></div>";
-	do_action( 'wpinv_payment_form_bottom' );
+	do_action('wpinv_payment_form_bottom');
 	echo '</form>';
 
 	$content = ob_get_clean();
-	return str_replace( 'sr-only', '', $content );
+	return str_replace('sr-only', '', $content);
 }
 
 /**
  * Helper function to display an invoice payment form on the frontend.
  */
-function getpaid_display_invoice_payment_form( $invoice_id ) {
+function getpaid_display_invoice_payment_form($invoice_id) {
     global $invoicing;
 
-    $invoice = wpinv_get_invoice( $invoice_id );
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
 		return aui()->alert(
 			array(
 				'type'    => 'warning',
-				'content' => __( 'Invoice not found', 'invoicing' ),
+				'content' => __('Invoice not found', 'invoicing'),
 			)
 		);
     }
 
-    if ( $invoice->is_paid() ) {
+    if ($invoice->is_paid()) {
 		return aui()->alert(
 			array(
 				'type'    => 'warning',
-				'content' => __( 'Invoice has already been paid', 'invoicing' ),
+				'content' => __('Invoice has already been paid', 'invoicing'),
 			)
 		);
     }
 
     // Get the form elements and items.
-    $form     = wpinv_get_default_payment_form();
-	$elements = $invoicing->form_elements->get_form_elements( $form );
-	$items    = $invoicing->form_elements->convert_checkout_items( $invoice->cart_details, $invoice );
+    $form = wpinv_get_default_payment_form();
+	$elements = $invoicing->form_elements->get_form_elements($form);
+	$items    = $invoicing->form_elements->convert_checkout_items($invoice->cart_details, $invoice);
 
 	ob_start();
 	echo "<form class='wpinv_payment_form'>";
-	do_action( 'wpinv_payment_form_top' );
+	do_action('wpinv_payment_form_top');
     echo "<input type='hidden' name='form_id' value='$form'/>";
     echo "<input type='hidden' name='invoice_id' value='$invoice_id'/>";
-	wp_nonce_field( 'wpinv_payment_form', 'wpinv_payment_form' );
-	wp_nonce_field( 'vat_validation', '_wpi_nonce' );
+	wp_nonce_field('wpinv_payment_form', 'wpinv_payment_form');
+	wp_nonce_field('vat_validation', '_wpi_nonce');
 
-	foreach ( $elements as $element ) {
-		do_action( 'wpinv_frontend_render_payment_form_element', $element, $items, $form );
-		do_action( "wpinv_frontend_render_payment_form_{$element['type']}", $element, $items, $form );
+	foreach ($elements as $element) {
+		do_action('wpinv_frontend_render_payment_form_element', $element, $items, $form);
+		do_action("wpinv_frontend_render_payment_form_{$element['type']}", $element, $items, $form);
 	}
 
 	echo "<div class='wpinv_payment_form_errors alert alert-danger d-none'></div>";
-	do_action( 'wpinv_payment_form_bottom' );
+	do_action('wpinv_payment_form_bottom');
 	echo '</form>';
 
 	$content = ob_get_clean();
-	return str_replace( 'sr-only', '', $content );
+	return str_replace('sr-only', '', $content);
 }
 
 /**
  * Helper function to convert item string to array.
  */
-function getpaid_convert_items_to_array( $items ) {
-    $items    = array_filter( array_map( 'trim', explode( ',', $items ) ) );
+function getpaid_convert_items_to_array($items) {
+    $items    = array_filter(array_map('trim', explode(',', $items)));
     $prepared = array();
 
-    foreach ( $items as $item ) {
-        $data = array_map( 'trim', explode( '|', $item ) );
+    foreach ($items as $item) {
+        $data = array_map('trim', explode('|', $item));
 
-        if ( empty( $data[0] ) || ! is_numeric( $data[0] ) ) {
+        if (empty($data[0]) || !is_numeric($data[0])) {
             continue;
         }
 
         $quantity = 1;
-        if ( isset( $data[1] ) && is_numeric( $data[1] ) ) {
+        if (isset($data[1]) && is_numeric($data[1])) {
             $quantity = $data[1];
         }
 
-        $prepared[ $data[0] ] = $quantity;
+        $prepared[$data[0]] = $quantity;
 
     }
 
@@ -1812,13 +1812,13 @@ 
 /**
  * Helper function to convert item array to string.
  */
-function getpaid_convert_items_to_string( $items ) {
+function getpaid_convert_items_to_string($items) {
     $prepared = array();
 
-    foreach ( $items as $item => $quantity ) {
+    foreach ($items as $item => $quantity) {
         $prepared[] = "$item|$quantity";
     }
-    return implode( ',', $prepared );
+    return implode(',', $prepared);
 }
 
 /**
@@ -1826,22 +1826,22 @@ 
  * 
  * Provide a label and one of $form, $items or $invoice.
  */
-function getpaid_get_payment_button( $label, $form = null, $items = null, $invoice = null ) {
-    $label = sanitize_text_field( $label );
+function getpaid_get_payment_button($label, $form = null, $items = null, $invoice = null) {
+    $label = sanitize_text_field($label);
     $nonce = wp_create_nonce('getpaid_ajax_form');
 
-    if ( ! empty( $form ) ) {
-        $form  = esc_attr( $form );
+    if (!empty($form)) {
+        $form = esc_attr($form);
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-nonce='$nonce' data-form='$form'>$label</button>"; 
     }
 	
-	if ( ! empty( $items ) ) {
-        $items  = esc_attr( $items );
+	if (!empty($items)) {
+        $items = esc_attr($items);
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-nonce='$nonce' data-item='$items'>$label</button>"; 
     }
     
-    if ( ! empty( $invoice ) ) {
-        $invoice  = esc_attr( $invoice );
+    if (!empty($invoice)) {
+        $invoice = esc_attr($invoice);
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-nonce='$nonce' data-invoice='$invoice'>$label</button>"; 
     }
 
@@ -1852,17 +1852,17 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_the_invoice_description( $invoice ) {
+function getpaid_the_invoice_description($invoice) {
     $description = $invoice->get_description();
 
-    if ( empty( $description ) ) {
+    if (empty($description)) {
         return;
     }
 
-    $description = wp_kses_post( $description );
+    $description = wp_kses_post($description);
     echo "<small class='getpaid-invoice-description text-dark p-2 form-text'><em>$description</em></small>";
 }
-add_action( 'getpaid_invoice_line_items', 'getpaid_the_invoice_description', 100 );
+add_action('getpaid_invoice_line_items', 'getpaid_the_invoice_description', 100);
 
 /**
  * Render element on a form.
@@ -1870,41 +1870,41 @@ 
  * @param array $element
  * @param GetPaid_Payment_Form $form
  */
-function getpaid_payment_form_element( $element, $form ) {
+function getpaid_payment_form_element($element, $form) {
 
     // Set up the args.
-    $element_type    = trim( $element['type'] );
+    $element_type    = trim($element['type']);
     $element['form'] = $form;
-    extract( $element );
+    extract($element);
 
     // Try to locate the appropriate template.
-    $located = wpinv_locate_template( "payment-forms/elements/$element_type.php" );
+    $located = wpinv_locate_template("payment-forms/elements/$element_type.php");
     
     // Abort if this is not our element.
-    if ( empty( $located ) || ! file_exists( $located ) ) {
+    if (empty($located) || !file_exists($located)) {
         return;
     }
 
     // Generate the class and id of the element.
-    $wrapper_class = 'getpaid-payment-form-element-' . trim( esc_attr( $element_type ) );
-    $id            = isset( $id ) ? $id : uniqid( 'gp' );
+    $wrapper_class = 'getpaid-payment-form-element-' . trim(esc_attr($element_type));
+    $id            = isset($id) ? $id : uniqid('gp');
 
     // Echo the opening wrapper.
     echo "<div class='getpaid-payment-form-element $wrapper_class'>";
 
     // Fires before displaying a given element type's content.
-    do_action( "getpaid_before_payment_form_{$element_type}_element", $element, $form );
+    do_action("getpaid_before_payment_form_{$element_type}_element", $element, $form);
 
     // Include the template for the element.
     include $located;
 
     // Fires after displaying a given element type's content.
-    do_action( "getpaid_payment_form_{$element_type}_element", $element, $form );
+    do_action("getpaid_payment_form_{$element_type}_element", $element, $form);
 
     // Echo the closing wrapper.
     echo '</div>';
 }
-add_action( 'getpaid_payment_form_element', 'getpaid_payment_form_element', 10, 2 );
+add_action('getpaid_payment_form_element', 'getpaid_payment_form_element', 10, 2);
 
 /**
  * Shows a list of gateways that support recurring payments.
@@ -1912,16 +1912,16 @@ 
 function wpinv_get_recurring_gateways_text() {
     $gateways = array();
 
-    foreach ( wpinv_get_payment_gateways() as $key => $gateway ) {
-        if ( wpinv_gateway_support_subscription( $key ) ) {
-            $gateways[] = sanitize_text_field( $gateway['admin_label'] );
+    foreach (wpinv_get_payment_gateways() as $key => $gateway) {
+        if (wpinv_gateway_support_subscription($key)) {
+            $gateways[] = sanitize_text_field($gateway['admin_label']);
         }
     }
 
-    if ( empty( $gateways ) ) {
-        return "<span class='form-text text-danger'>" . __( 'No active gateways support subscription payments.', 'invoicing' ) ."</span>";
+    if (empty($gateways)) {
+        return "<span class='form-text text-danger'>" . __('No active gateways support subscription payments.', 'invoicing') . "</span>";
     }
 
-    return "<span class='form-text text-muted'>" . wp_sprintf( __( 'Subscription payments only supported by: %s', 'invoicing' ), implode( ', ', $gateways ) ) ."</span>";
+    return "<span class='form-text text-muted'>" . wp_sprintf(__('Subscription payments only supported by: %s', 'invoicing'), implode(', ', $gateways)) . "</span>";
 
 }

includes/class-getpaid-payment-form-submission.php

Indentation +812 added lines, -812 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,890 +10,890 @@ 
 class GetPaid_Payment_Form_Submission {
 
     /**
-	 * Submission ID
-	 *
-	 * @var string
-	 */
-	public $id = null;
+     * Submission ID
+     *
+     * @var string
+     */
+    public $id = null;
 
-	/**
-	 * Sets the associated payment form.
-	 *
-	 * @var GetPaid_Payment_Form
-	 */
+    /**
+     * Sets the associated payment form.
+     *
+     * @var GetPaid_Payment_Form
+     */
     protected $payment_form = null;
 
     /**
-	 * The country for the submission.
-	 *
-	 * @var string
-	 */
-	public $country = null;
-
-    /**
-	 * The state for the submission.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $state = null;
-
-	/**
-	 * The invoice associated with the submission.
-	 *
-	 * @var WPInv_Invoice
-	 */
-	protected $invoice = null;
-
-	/**
-	 * The discount associated with the submission.
-	 *
-	 * @var WPInv_Discount
-	 */
-	protected $discount = null;
-
-	/**
-	 * The raw submission data.
-	 *
-	 * @var array
-	 */
-	protected $data = null;
-
-	/**
-	 * Whether this submission contains a recurring item.
-	 *
-	 * @var bool
-	 */
-	public $has_recurring = false;
-
-	/**
-	 * The sub total amount for the submission.
-	 *
-	 * @var float
-	 */
-	public $subtotal_amount = 0;
-
-	/**
-	 * The total discount amount for the submission.
-	 *
-	 * @var float
-	 */
-	protected $total_discount_amount = 0;
-
-	/**
-	 * The total tax amount for the submission.
-	 *
-	 * @var float
-	 */
-	protected $total_tax_amount = 0;
-
-	/**
-	 * The total fees amount for the submission.
-	 *
-	 * @var float
-	 */
-	protected $total_fees_amount = 0;
-
-	/**
-	 * An array of fees for the submission.
-	 *
-	 * @var array
-	 */
-	protected $fees = array();
-
-	/**
-	 * An array of discounts for the submission.
-	 *
-	 * @var array
-	 */
-	protected $discounts = array();
-
-	/**
-	 * An array of taxes for the submission.
-	 *
-	 * @var array
-	 */
-	protected $taxes = array();
-
-	/**
-	 * An array of items for the submission.
-	 *
-	 * @var GetPaid_Form_Item[]
-	 */
-	protected $items = array();
-
-	/**
-	 * The last error.
-	 *
-	 * @var string
-	 */
-	public $last_error = null;
-
-	/**
-	 * Is the discount valid?
-	 *
-	 * @var bool
-	 */
-	public $is_discount_valid = true;
+     * The country for the submission.
+     *
+     * @var string
+     */
+    public $country = null;
+
+    /**
+     * The state for the submission.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $state = null;
+
+    /**
+     * The invoice associated with the submission.
+     *
+     * @var WPInv_Invoice
+     */
+    protected $invoice = null;
+
+    /**
+     * The discount associated with the submission.
+     *
+     * @var WPInv_Discount
+     */
+    protected $discount = null;
+
+    /**
+     * The raw submission data.
+     *
+     * @var array
+     */
+    protected $data = null;
+
+    /**
+     * Whether this submission contains a recurring item.
+     *
+     * @var bool
+     */
+    public $has_recurring = false;
+
+    /**
+     * The sub total amount for the submission.
+     *
+     * @var float
+     */
+    public $subtotal_amount = 0;
+
+    /**
+     * The total discount amount for the submission.
+     *
+     * @var float
+     */
+    protected $total_discount_amount = 0;
+
+    /**
+     * The total tax amount for the submission.
+     *
+     * @var float
+     */
+    protected $total_tax_amount = 0;
+
+    /**
+     * The total fees amount for the submission.
+     *
+     * @var float
+     */
+    protected $total_fees_amount = 0;
+
+    /**
+     * An array of fees for the submission.
+     *
+     * @var array
+     */
+    protected $fees = array();
+
+    /**
+     * An array of discounts for the submission.
+     *
+     * @var array
+     */
+    protected $discounts = array();
+
+    /**
+     * An array of taxes for the submission.
+     *
+     * @var array
+     */
+    protected $taxes = array();
+
+    /**
+     * An array of items for the submission.
+     *
+     * @var GetPaid_Form_Item[]
+     */
+    protected $items = array();
+
+    /**
+     * The last error.
+     *
+     * @var string
+     */
+    public $last_error = null;
+
+    /**
+     * Is the discount valid?
+     *
+     * @var bool
+     */
+    public $is_discount_valid = true;
 	
-	/**
-	 * Checks if we have a digital vat rule.
-	 *
-	 * @var bool
-	 */
-	public $has_digital = false;
+    /**
+     * Checks if we have a digital vat rule.
+     *
+     * @var bool
+     */
+    public $has_digital = false;
 	
-	/**
-	 * Checks if we require vat.
-	 *
-	 * @var bool
-	 */
+    /**
+     * Checks if we require vat.
+     *
+     * @var bool
+     */
     public $requires_vat = false;
 
     /**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-
-		// Set the state and country to the default state and country.
-		$this->country = wpinv_default_billing_country();
-		$this->state = wpinv_get_default_state();
-
-		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( $_POST );
-		}
-	}
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+
+        // Set the state and country to the default state and country.
+        $this->country = wpinv_default_billing_country();
+        $this->state = wpinv_get_default_state();
+
+        // Do we have an actual submission?
+        if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
+            $this->load_data( $_POST );
+        }
+    }
 
-	/**
-	 * Loads submission data.
-	 *
-	 * @param array $data
-	 */
-	public function load_data( $data ) {
+    /**
+     * Loads submission data.
+     *
+     * @param array $data
+     */
+    public function load_data( $data ) {
 
-		// Prepare submitted data...
-		$data = wp_unslash( $data );
+        // Prepare submitted data...
+        $data = wp_unslash( $data );
 
-		// Filter the data.
-		$data = apply_filters( 'getpaid_submission_data', $data, $this );
+        // Filter the data.
+        $data = apply_filters( 'getpaid_submission_data', $data, $this );
 
-		$this->data = $data;
+        $this->data = $data;
 
-		$this->id = md5( wp_json_encode( $data ) );
+        $this->id = md5( wp_json_encode( $data ) );
 
-		// Every submission needs an active payment form.
-		if ( empty( $data['form_id'] ) ) {
-			$this->last_error = __( 'Missing payment form', 'invoicing' );
+        // Every submission needs an active payment form.
+        if ( empty( $data['form_id'] ) ) {
+            $this->last_error = __( 'Missing payment form', 'invoicing' );
             return;
-		}
+        }
 
-		// Fetch the payment form.
-		$form = new GetPaid_Payment_Form( $data['form_id'] );
+        // Fetch the payment form.
+        $form = new GetPaid_Payment_Form( $data['form_id'] );
 
-		if ( ! $form->is_active() ) {
-			$this->last_error = __( 'Payment form not active', 'invoicing' );
-			return;
-		}
+        if ( ! $form->is_active() ) {
+            $this->last_error = __( 'Payment form not active', 'invoicing' );
+            return;
+        }
 
-		// Fetch the payment form.
-		$this->payment_form = $form;
+        // Fetch the payment form.
+        $this->payment_form = $form;
 
-		// For existing invoices, make sure that it is valid.
+        // For existing invoices, make sure that it is valid.
         if ( ! empty( $data['invoice_id'] ) ) {
             $invoice = wpinv_get_invoice( $data['invoice_id'] );
 
             if ( empty( $invoice ) ) {
-				$this->last_error = __( 'Invalid invoice', 'invoicing' );
+                $this->last_error = __( 'Invalid invoice', 'invoicing' );
                 return;
-			}
+            }
 			
-			if ( $invoice->is_paid() ) {
-				$this->last_error = __( 'This invoice is already paid for.', 'invoicing' );
+            if ( $invoice->is_paid() ) {
+                $this->last_error = __( 'This invoice is already paid for.', 'invoicing' );
                 return;
-			}
+            }
 
-			$this->payment_form->set_items( $invoice->get_items() );
+            $this->payment_form->set_items( $invoice->get_items() );
 
-			$this->country = $invoice->get_country();
-			$this->state = $invoice->get_state();
+            $this->country = $invoice->get_country();
+            $this->state = $invoice->get_state();
 
-		// Default forms do not have items.
+        // Default forms do not have items.
         } else if ( $form->is_default() && isset( $data['form_items'] ) ) {
-			$this->payment_form->set_items( $data['form_items'] );
-		}
-
-		// User's country.
-		if ( ! empty( $data['wpinv_country'] ) ) {
-			$this->country = $data['wpinv_country'];
-		}
-
-		// User's state.
-		if ( ! empty( $data['wpinv_state'] ) ) {
-			$this->country = $data['wpinv_state'];
-		}
-
-		// Handle discounts.
-		$this->maybe_prepare_discount();
-
-		// Handle items.
-		$selected_items = array();
-		if ( ! empty( $data['getpaid-items'] ) ) {
-			$selected_items = wpinv_clean( $data['getpaid-items'] );
-		}
-
-		foreach ( $this->payment_form->get_items() as $item ) {
-
-			// Continue if this is an optional item and it has not been selected.
-			if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
-				continue;
-			}
-
-			// (maybe) let customers change the quantities and prices.
-			if ( isset( $selected_items[ $item->get_id() ] ) ) {
-
-				// Maybe change the quantities.
-				if ( $item->allows_quantities() && is_numeric( $selected_items[ $item->get_id() ]['quantity'] ) ) {
-					$item->set_quantity( (int) $selected_items[ $item->get_id() ]['quantity'] );
-				}
-
-				// Maybe change the price.
-				if ( $item->user_can_set_their_price() ) {
-					$price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
-
-					// But don't get lower than the minimum price.
-					if ( $price < $item->get_minimum_price() ) {
-						$price = $item->get_minimum_price();
-					}
-
-					$item->set_price( $price );
-
-				}
-
-			}
-
-			// Add the item to the form.
-			$this->add_item( $item );
-
-		}
-
-		// (Maybe) validate vat number.
-		$this->maybe_validate_vat();
-
-		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
-
-		// Remove invalid discount.
-		$this->maybe_remove_discount();
-
-	}
-
-    /**
-	 * Returns the payment form.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Payment_Form
-	 */
-	public function get_payment_form() {
-		return $this->payment_form;
-	}
-
-	/**
-	 * Returns the associated invoice.
-	 *
-	 * @since 1.0.19
-	 * @return WPInv_Invoice
-	 */
-	public function get_invoice() {
-		return $this->invoice;
-	}
-
-	/**
-	 * Checks whether there is an invoice associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_invoice() {
-		return ! empty( $this->invoice );
-	}
-
-	/**
-	 * Retrieves the vat number.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_vat_number() {
-
-		// Retrieve from the posted data.
-		if ( ! empty( $this->data['wpinv_vat_number'] ) ) {
-			return wpinv_clean( $this->data['wpinv_vat_number'] );
-		}
-
-		// Retrieve from the invoice.
-		return $this->has_invoice() ? $this->invoice->get_vat_number() : '';
-	}
-
-	/**
-	 * Retrieves the company.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_company() {
-
-		// Retrieve from the posted data.
-		if ( ! empty( $this->data['wpinv_company'] ) ) {
-			return wpinv_clean( $this->data['wpinv_company'] );
-		}
-
-		// Retrieve from the invoice.
-		return $this->has_invoice() ? $this->invoice->get_company() : '';
-	}
+            $this->payment_form->set_items( $data['form_items'] );
+        }
+
+        // User's country.
+        if ( ! empty( $data['wpinv_country'] ) ) {
+            $this->country = $data['wpinv_country'];
+        }
+
+        // User's state.
+        if ( ! empty( $data['wpinv_state'] ) ) {
+            $this->country = $data['wpinv_state'];
+        }
+
+        // Handle discounts.
+        $this->maybe_prepare_discount();
+
+        // Handle items.
+        $selected_items = array();
+        if ( ! empty( $data['getpaid-items'] ) ) {
+            $selected_items = wpinv_clean( $data['getpaid-items'] );
+        }
+
+        foreach ( $this->payment_form->get_items() as $item ) {
+
+            // Continue if this is an optional item and it has not been selected.
+            if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
+                continue;
+            }
+
+            // (maybe) let customers change the quantities and prices.
+            if ( isset( $selected_items[ $item->get_id() ] ) ) {
+
+                // Maybe change the quantities.
+                if ( $item->allows_quantities() && is_numeric( $selected_items[ $item->get_id() ]['quantity'] ) ) {
+                    $item->set_quantity( (int) $selected_items[ $item->get_id() ]['quantity'] );
+                }
+
+                // Maybe change the price.
+                if ( $item->user_can_set_their_price() ) {
+                    $price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
+
+                    // But don't get lower than the minimum price.
+                    if ( $price < $item->get_minimum_price() ) {
+                        $price = $item->get_minimum_price();
+                    }
+
+                    $item->set_price( $price );
+
+                }
+
+            }
+
+            // Add the item to the form.
+            $this->add_item( $item );
+
+        }
+
+        // (Maybe) validate vat number.
+        $this->maybe_validate_vat();
+
+        // Fired when we are done processing a submission.
+        do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+
+        // Remove invalid discount.
+        $this->maybe_remove_discount();
+
+    }
+
+    /**
+     * Returns the payment form.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Payment_Form
+     */
+    public function get_payment_form() {
+        return $this->payment_form;
+    }
+
+    /**
+     * Returns the associated invoice.
+     *
+     * @since 1.0.19
+     * @return WPInv_Invoice
+     */
+    public function get_invoice() {
+        return $this->invoice;
+    }
+
+    /**
+     * Checks whether there is an invoice associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_invoice() {
+        return ! empty( $this->invoice );
+    }
+
+    /**
+     * Retrieves the vat number.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_vat_number() {
+
+        // Retrieve from the posted data.
+        if ( ! empty( $this->data['wpinv_vat_number'] ) ) {
+            return wpinv_clean( $this->data['wpinv_vat_number'] );
+        }
+
+        // Retrieve from the invoice.
+        return $this->has_invoice() ? $this->invoice->get_vat_number() : '';
+    }
+
+    /**
+     * Retrieves the company.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_company() {
+
+        // Retrieve from the posted data.
+        if ( ! empty( $this->data['wpinv_company'] ) ) {
+            return wpinv_clean( $this->data['wpinv_company'] );
+        }
+
+        // Retrieve from the invoice.
+        return $this->has_invoice() ? $this->invoice->get_company() : '';
+    }
 	
-	/**
-	 * Returns the appropriate currency for the submission.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_currency() {
-		if ( $this->has_invoice() ) {
-			return $this->invoice->get_currency();
-		}
-		return wpinv_get_currency();
-    }
-
-    /**
-	 * Returns the raw submission data.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return $this->data;
-	}
-
-	/**
-	 * Checks if a required field is set.
-	 *
-	 * @since 1.0.19
-	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
-	}
-
-	///////// Items //////////////
-
-	/**
-	 * Adds an item to the submission.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 */
-	public function add_item( $item ) {
-
-		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() ) {
-			return;
-		}
-
-		// Do we have a recurring item?
-		if ( $item->is_recurring() ) {
-
-			if ( $this->has_recurring ) {
-				$this->last_error = __( 'You can only buy one recurring item at a time.', 'invoicing' );
-			}
-
-			$this->has_recurring = true;
-
-		}
-
-		$this->items[ $item->get_id() ] = $item;
-
-		$this->subtotal_amount += $item->get_sub_total();
-
-		$this->process_item_discount( $item );
-
-		$this->process_item_tax( $item );
-	}
-
-	/**
-	 * Retrieves a specific item.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_item( $item_id ) {
-		return isset( $this->items[ $item_id ] ) ? $this->items[ $item_id ] : null;
-	}
-
-	/**
-	 * Returns all items.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items() {
-		return $this->items;
-	}
-
-	///////// TAXES //////////////
-
-	/**
-	 * Adds a tax to the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function add_tax( $name, $amount ) {
-		$amount = (float) wpinv_sanitize_amount( $amount );
-
-		$this->total_tax_amount += $amount;
-
-		if ( isset( $this->taxes[ $name ] ) ) {
-			$this->taxes[ $name ] += $amount;
-		} else {
-			$this->taxes[ $name ] = $amount;
-		}
-
-	}
-
-	/**
-	 * Whether or not we'll use taxes for the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function use_taxes() {
-
-		$use_taxes = wpinv_use_taxes();
-
-		if ( $this->has_invoice() && $this->invoice->disable_taxes ) {
-			$use_taxes = false;
-		}
-
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
-
-	}
-
-	/**
-	 * Maybe process tax.
-	 *
-	 * @since 1.0.19 
-	 * @param GetPaid_Form_Item $item
-	 */
-	public function process_item_tax( $item ) {
-
-		// Abort early if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
-			return;
-		}
-
-		$rate  = wpinv_get_tax_rate( $this->country, $this->state, $item->get_id() );
-		$price = $item->get_sub_total();
-
-		if ( wpinv_prices_include_tax() ) {
-			$item_tax = $price - ( $price - $price * $rate * 0.01 );
-		} else {
-			$item_tax = $price * $rate * 0.01;
-		}
-
-		$this->add_tax( 'Tax', $item_tax );
-
-	}
-
-	/**
-	 * Returns the total tax amount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_total_tax() {
-		return $this->total_tax_amount;
-	}
-
-	/**
-	 * Retrieves a specific tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_tax( $name ) {
-		return isset( $this->taxes[ $name ] ) ? $this->taxes[ $name ] : 0;
-	}
-
-	/**
-	 * Returns all taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_taxes() {
-		return $this->taxes;
-	}
-
-	///////// DISCOUNTS //////////////
-
-	/**
-	 * Adds a discount to the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function add_discount( $name, $amount ) {
-		$amount = wpinv_sanitize_amount( $amount );
-
-		$this->total_discount_amount += $amount;
-
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->discounts[ $name ] += $amount;
-		} else {
-			$this->discounts[ $name ] = $amount;
-		}
-
-	}
-
-	/**
-	 * Removes a discount from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_discount( $name ) {
-
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->total_discount_amount -= $this->discounts[ $name ];
-			unset( $this->discounts[ $name ] );
-		}
-
-	}
-
-	/**
-	 * Checks whether there is a discount code associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_discount_code() {
-		return ! empty( $this->discount );
-	}
-
-	/**
-	 * Returns the discount code.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function get_discount_code() {
-		return $this->has_discount_code() ? $this->discount->code : '';
-	}
-
-	/**
-	 * Prepares an item discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function maybe_prepare_discount() {
-
-		// Do we have a discount?
-		if ( empty( $this->data['discount'] ) ) {
-			return;
-		}
-
-		// Fetch the discount.
-		$discount = wpinv_get_discount_obj( $this->data['discount'] );
-
-		// Ensure it is active.
-        if ( ! $discount->exists() || ! $discount->is_active() || ! $discount->has_started() || $discount->is_expired() ) {
-			$this->is_discount_valid = false;
-			$this->last_error = __( 'Invalid or expired discount code', 'invoicing' );
-			return;
-		}
+    /**
+     * Returns the appropriate currency for the submission.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_currency() {
+        if ( $this->has_invoice() ) {
+            return $this->invoice->get_currency();
+        }
+        return wpinv_get_currency();
+    }
+
+    /**
+     * Returns the raw submission data.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return $this->data;
+    }
+
+    /**
+     * Checks if a required field is set.
+     *
+     * @since 1.0.19
+     */
+    public function is_required_field_set( $field ) {
+        return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+    }
+
+    ///////// Items //////////////
+
+    /**
+     * Adds an item to the submission.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     */
+    public function add_item( $item ) {
+
+        // Make sure that it is available for purchase.
+        if ( ! $item->can_purchase() ) {
+            return;
+        }
+
+        // Do we have a recurring item?
+        if ( $item->is_recurring() ) {
+
+            if ( $this->has_recurring ) {
+                $this->last_error = __( 'You can only buy one recurring item at a time.', 'invoicing' );
+            }
+
+            $this->has_recurring = true;
+
+        }
+
+        $this->items[ $item->get_id() ] = $item;
+
+        $this->subtotal_amount += $item->get_sub_total();
+
+        $this->process_item_discount( $item );
+
+        $this->process_item_tax( $item );
+    }
+
+    /**
+     * Retrieves a specific item.
+     *
+     * @since 1.0.19
+     */
+    public function get_item( $item_id ) {
+        return isset( $this->items[ $item_id ] ) ? $this->items[ $item_id ] : null;
+    }
+
+    /**
+     * Returns all items.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items() {
+        return $this->items;
+    }
+
+    ///////// TAXES //////////////
+
+    /**
+     * Adds a tax to the submission.
+     *
+     * @since 1.0.19
+     */
+    public function add_tax( $name, $amount ) {
+        $amount = (float) wpinv_sanitize_amount( $amount );
+
+        $this->total_tax_amount += $amount;
+
+        if ( isset( $this->taxes[ $name ] ) ) {
+            $this->taxes[ $name ] += $amount;
+        } else {
+            $this->taxes[ $name ] = $amount;
+        }
+
+    }
+
+    /**
+     * Whether or not we'll use taxes for the submission.
+     *
+     * @since 1.0.19
+     */
+    public function use_taxes() {
 
-		// For single use discounts...
-		if ( $discount->is_single_use ) {
+        $use_taxes = wpinv_use_taxes();
 
-			if ( ! $this->has_billing_email() ) {
-				$this->is_discount_valid = false;
-				$this->last_error = __( 'You need to enter your billing email before applying this discount', 'invoicing' );
-				return;
-			}
+        if ( $this->has_invoice() && $this->invoice->disable_taxes ) {
+            $use_taxes = false;
+        }
+
+        return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+
+    }
+
+    /**
+     * Maybe process tax.
+     *
+     * @since 1.0.19 
+     * @param GetPaid_Form_Item $item
+     */
+    public function process_item_tax( $item ) {
+
+        // Abort early if we're not using taxes.
+        if ( ! $this->use_taxes() ) {
+            return;
+        }
+
+        $rate  = wpinv_get_tax_rate( $this->country, $this->state, $item->get_id() );
+        $price = $item->get_sub_total();
+
+        if ( wpinv_prices_include_tax() ) {
+            $item_tax = $price - ( $price - $price * $rate * 0.01 );
+        } else {
+            $item_tax = $price * $rate * 0.01;
+        }
+
+        $this->add_tax( 'Tax', $item_tax );
+
+    }
+
+    /**
+     * Returns the total tax amount.
+     *
+     * @since 1.0.19
+     */
+    public function get_total_tax() {
+        return $this->total_tax_amount;
+    }
+
+    /**
+     * Retrieves a specific tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_tax( $name ) {
+        return isset( $this->taxes[ $name ] ) ? $this->taxes[ $name ] : 0;
+    }
+
+    /**
+     * Returns all taxes.
+     *
+     * @since 1.0.19
+     */
+    public function get_taxes() {
+        return $this->taxes;
+    }
+
+    ///////// DISCOUNTS //////////////
+
+    /**
+     * Adds a discount to the submission.
+     *
+     * @since 1.0.19
+     */
+    public function add_discount( $name, $amount ) {
+        $amount = wpinv_sanitize_amount( $amount );
+
+        $this->total_discount_amount += $amount;
+
+        if ( isset( $this->discounts[ $name ] ) ) {
+            $this->discounts[ $name ] += $amount;
+        } else {
+            $this->discounts[ $name ] = $amount;
+        }
+
+    }
+
+    /**
+     * Removes a discount from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_discount( $name ) {
+
+        if ( isset( $this->discounts[ $name ] ) ) {
+            $this->total_discount_amount -= $this->discounts[ $name ];
+            unset( $this->discounts[ $name ] );
+        }
+
+    }
 
-			if ( ! $discount->is_valid_for_user( $this->get_billing_email() ) ) {
-				$this->is_discount_valid = false;
-				$this->last_error = __( 'You have already used this discount', 'invoicing' );
-				return;
-			}
+    /**
+     * Checks whether there is a discount code associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_discount_code() {
+        return ! empty( $this->discount );
+    }
 
-		}
+    /**
+     * Returns the discount code.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function get_discount_code() {
+        return $this->has_discount_code() ? $this->discount->code : '';
+    }
 
-		// Set the discount.
-		$this->discount = $discount;
+    /**
+     * Prepares an item discount.
+     *
+     * @since 1.0.19
+     */
+    public function maybe_prepare_discount() {
+
+        // Do we have a discount?
+        if ( empty( $this->data['discount'] ) ) {
+            return;
+        }
 
-	}
+        // Fetch the discount.
+        $discount = wpinv_get_discount_obj( $this->data['discount'] );
 
-	/**
-	 * Removes an invalid discount code.
-	 *
-	 * @since 1.0.19
-	 */
-	public function maybe_remove_discount() {
+        // Ensure it is active.
+        if ( ! $discount->exists() || ! $discount->is_active() || ! $discount->has_started() || $discount->is_expired() ) {
+            $this->is_discount_valid = false;
+            $this->last_error = __( 'Invalid or expired discount code', 'invoicing' );
+            return;
+        }
 
-		// Do we have a discount?
-		if ( empty( $this->has_discount_code() ) ) {
-			return;
-		}
+        // For single use discounts...
+        if ( $discount->is_single_use ) {
 
-		// Fetch the discount amount.
-		$amount = $this->get_discount( 'Discount' );
+            if ( ! $this->has_billing_email() ) {
+                $this->is_discount_valid = false;
+                $this->last_error = __( 'You need to enter your billing email before applying this discount', 'invoicing' );
+                return;
+            }
 
-		// Abort early if this is a "zero" discount.
-		if ( empty( $amount ) ) {
-			return;
-		}
+            if ( ! $discount->is_valid_for_user( $this->get_billing_email() ) ) {
+                $this->is_discount_valid = false;
+                $this->last_error = __( 'You have already used this discount', 'invoicing' );
+                return;
+            }
 
-		$total = $this->subtotal_amount + $this->get_total_fees() + $this->get_total_tax();
+        }
 
-		if ( ! $this->discount->is_minimum_amount_met( $total ) ) {
-			$this->is_discount_valid = false;
+        // Set the discount.
+        $this->discount = $discount;
+
+    }
+
+    /**
+     * Removes an invalid discount code.
+     *
+     * @since 1.0.19
+     */
+    public function maybe_remove_discount() {
+
+        // Do we have a discount?
+        if ( empty( $this->has_discount_code() ) ) {
+            return;
+        }
+
+        // Fetch the discount amount.
+        $amount = $this->get_discount( 'Discount' );
+
+        // Abort early if this is a "zero" discount.
+        if ( empty( $amount ) ) {
+            return;
+        }
+
+        $total = $this->subtotal_amount + $this->get_total_fees() + $this->get_total_tax();
+
+        if ( ! $this->discount->is_minimum_amount_met( $total ) ) {
+            $this->is_discount_valid = false;
             $min = wpinv_price( wpinv_format_amount( $$this->discount->min_total ) );
-			$this->last_error = sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min );
+            $this->last_error = sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min );
         }
 
         if ( ! $this->discount->is_maximum_amount_met( $total ) ) {
-			$this->is_discount_valid = false;
+            $this->is_discount_valid = false;
             $max = wpinv_price( wpinv_format_amount( $$this->discount->max_total ) );
-			$this->last_error = sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max );
-		}
-
-		if ( ! $this->is_discount_valid ) {
-			$this->discount = null;
-			$this->remove_discount( 'Discount' );
-		}
-
-    }
-
-	/**
-	 * Maybe process discount.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 */
-	public function process_item_discount( $item ) {
-
-		// Abort early if there is no discount.
-		if ( ! $this->has_discount_code() ) {
-			return;
-		}
-
-		// Ensure that it is valid for this item.
-		if ( ! $this->discount->is_valid_for_items( array( $item->get_id() ) ) ) {
-			return;
-		}
-
-		// Fetch the discounted amount.
-		$discount = $this->discount->get_discounted_amount( $item->get_price() * $item->get_quantity() );
-
-		$this->add_discount( 'Discount', $discount );
-
-	}
-
-	/**
-	 * Returns the total discount amount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_total_discount() {
-		return $this->total_discount_amount;
-	}
-
-	/**
-	 * Gets a specific discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discount( $name ) {
-		return isset( $this->discounts[ $name ] ) ? $this->discounts[ $name ] : 0;
-	}
-
-	/**
-	 * Returns all discounts.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discounts() {
-		return $this->discounts;
-	}
-
-	///////// FEES //////////////
-
-	/**
-	 * Adds a fee to the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function add_fee( $name, $amount ) {
-		$amount = wpinv_sanitize_amount( $amount );
-
-		$this->total_fees_amount += $amount;
-
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->fees[ $name ] += $amount;
-		} else {
-			$this->fees[ $name ] = $amount;
-		}
-
-	}
-
-	/**
-	 * Returns the total fees amount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_total_fees() {
-		return $this->total_fees_amount;
-	}
-
-	/**
-	 * Retrieves a specific fee.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fee( $name ) {
-		return isset( $this->fees[ $name ] ) ? $this->fees[ $name ] : 0;
-	}
-
-	/**
-	 * Returns all fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fees() {
-		return $this->fees;
-	}
-
-	// MISC //
-
-	/**
-	 * Returns the total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_total() {
-		$total = $this->subtotal_amount + $this->get_total_fees() - $this->get_total_discount() + $this->get_total_tax();
-		$total = apply_filters( 'getpaid_get_submission_total_amount', $total, $this  );
-		return wpinv_sanitize_amount( $total );
-	}
-
-	/**
-	 * Whether payment details should be collected for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_payment_details() {
-		$collect = $this->subtotal_amount + $this->get_total_fees() - $this->get_total_discount() + $this->get_total_tax();
-
-		if ( $this->has_recurring ) {
-			$collect = true;
-		}
-
-		$collect = apply_filters( 'getpaid_submission_collect_payment_details', $collect, $this  );
-		return $collect;
-	}
-
-	/**
-	 * Returns the billing email of the user.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_billing_email() {
-		$billing_email = empty( $this->data['billing_email'] ) ? '' : $this->data['billing_email'];
-		return apply_filters( 'getpaid_get_submission_billing_email', $billing_email, $this  );
-	}
-
-	/**
-	 * Checks if the submitter has a billing email.
-	 *
-	 * @since 1.0.19
-	 */
-	public function has_billing_email() {
-		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email );
-	}
-
-	/**
-	 * Validate VAT data.
-	 *
-	 * @since 1.0.19
-	 */
-	public function maybe_validate_vat() {
+            $this->last_error = sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max );
+        }
+
+        if ( ! $this->is_discount_valid ) {
+            $this->discount = null;
+            $this->remove_discount( 'Discount' );
+        }
+
+    }
+
+    /**
+     * Maybe process discount.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     */
+    public function process_item_discount( $item ) {
+
+        // Abort early if there is no discount.
+        if ( ! $this->has_discount_code() ) {
+            return;
+        }
+
+        // Ensure that it is valid for this item.
+        if ( ! $this->discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+            return;
+        }
+
+        // Fetch the discounted amount.
+        $discount = $this->discount->get_discounted_amount( $item->get_price() * $item->get_quantity() );
+
+        $this->add_discount( 'Discount', $discount );
+
+    }
+
+    /**
+     * Returns the total discount amount.
+     *
+     * @since 1.0.19
+     */
+    public function get_total_discount() {
+        return $this->total_discount_amount;
+    }
+
+    /**
+     * Gets a specific discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_discount( $name ) {
+        return isset( $this->discounts[ $name ] ) ? $this->discounts[ $name ] : 0;
+    }
+
+    /**
+     * Returns all discounts.
+     *
+     * @since 1.0.19
+     */
+    public function get_discounts() {
+        return $this->discounts;
+    }
+
+    ///////// FEES //////////////
+
+    /**
+     * Adds a fee to the submission.
+     *
+     * @since 1.0.19
+     */
+    public function add_fee( $name, $amount ) {
+        $amount = wpinv_sanitize_amount( $amount );
+
+        $this->total_fees_amount += $amount;
+
+        if ( isset( $this->fees[ $name ] ) ) {
+            $this->fees[ $name ] += $amount;
+        } else {
+            $this->fees[ $name ] = $amount;
+        }
+
+    }
+
+    /**
+     * Returns the total fees amount.
+     *
+     * @since 1.0.19
+     */
+    public function get_total_fees() {
+        return $this->total_fees_amount;
+    }
+
+    /**
+     * Retrieves a specific fee.
+     *
+     * @since 1.0.19
+     */
+    public function get_fee( $name ) {
+        return isset( $this->fees[ $name ] ) ? $this->fees[ $name ] : 0;
+    }
+
+    /**
+     * Returns all fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fees() {
+        return $this->fees;
+    }
+
+    // MISC //
+
+    /**
+     * Returns the total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_total() {
+        $total = $this->subtotal_amount + $this->get_total_fees() - $this->get_total_discount() + $this->get_total_tax();
+        $total = apply_filters( 'getpaid_get_submission_total_amount', $total, $this  );
+        return wpinv_sanitize_amount( $total );
+    }
+
+    /**
+     * Whether payment details should be collected for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_payment_details() {
+        $collect = $this->subtotal_amount + $this->get_total_fees() - $this->get_total_discount() + $this->get_total_tax();
+
+        if ( $this->has_recurring ) {
+            $collect = true;
+        }
+
+        $collect = apply_filters( 'getpaid_submission_collect_payment_details', $collect, $this  );
+        return $collect;
+    }
+
+    /**
+     * Returns the billing email of the user.
+     *
+     * @since 1.0.19
+     */
+    public function get_billing_email() {
+        $billing_email = empty( $this->data['billing_email'] ) ? '' : $this->data['billing_email'];
+        return apply_filters( 'getpaid_get_submission_billing_email', $billing_email, $this  );
+    }
+
+    /**
+     * Checks if the submitter has a billing email.
+     *
+     * @since 1.0.19
+     */
+    public function has_billing_email() {
+        $billing_email = $this->get_billing_email();
+        return ! empty( $billing_email );
+    }
+
+    /**
+     * Validate VAT data.
+     *
+     * @since 1.0.19
+     */
+    public function maybe_validate_vat() {
 		
-		// Make sure that taxes are enabled.
-		if ( ! wpinv_use_taxes() ) {
-			return;
-		}
+        // Make sure that taxes are enabled.
+        if ( ! wpinv_use_taxes() ) {
+            return;
+        }
 
-		// Check if we have a digital VAT rule.
-		$has_digital = false;
+        // Check if we have a digital VAT rule.
+        $has_digital = false;
 
-		foreach ( $this->get_items() as $item ) {
+        foreach ( $this->get_items() as $item ) {
 
-			if ( 'digital' == $item->get_vat_rule() ) {
-				$has_digital = true;
-				break;
-			}
+            if ( 'digital' == $item->get_vat_rule() ) {
+                $has_digital = true;
+                break;
+            }
 
-		}
+        }
 
-		$this->has_digital = $has_digital;
+        $this->has_digital = $has_digital;
 
-		// Check if we require vat.
-		$requires_vat = (
-			( getpaid_is_eu_state( $this->country ) && ( getpaid_is_eu_state( wpinv_get_default_country() ) || $has_digital ) )
-			|| ( getpaid_is_gst_country( $this->country ) && getpaid_is_gst_country( wpinv_get_default_country() ) )
-		);
+        // Check if we require vat.
+        $requires_vat = (
+            ( getpaid_is_eu_state( $this->country ) && ( getpaid_is_eu_state( wpinv_get_default_country() ) || $has_digital ) )
+            || ( getpaid_is_gst_country( $this->country ) && getpaid_is_gst_country( wpinv_get_default_country() ) )
+        );
 
-		$this->requires_vat = $requires_vat;
+        $this->requires_vat = $requires_vat;
 
-		// Abort if we are not calculating the taxes.
-		if ( ! $has_digital && ! $requires_vat ) {
+        // Abort if we are not calculating the taxes.
+        if ( ! $has_digital && ! $requires_vat ) {
             return;
-		}
+        }
 
-		// Prepare variables.
-		$vat_number = $this->get_vat_number();
-		$company    = $this->get_company();
-		$ip_country = WPInv_EUVat::get_country_by_ip();
+        // Prepare variables.
+        $vat_number = $this->get_vat_number();
+        $company    = $this->get_company();
+        $ip_country = WPInv_EUVat::get_country_by_ip();
         $is_eu      = getpaid_is_eu_state( $this->country );
         $is_ip_eu   = getpaid_is_eu_state( $ip_country );
-		$is_non_eu  = ! $is_eu && ! $is_ip_eu;
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
+        $is_non_eu  = ! $is_eu && ! $is_ip_eu;
+        $prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
 
-		// If we're preventing business to consumer purchases...
-		if ( ! empty( $prevent_b2c ) && ! $is_non_eu && ( empty( $vat_number ) || ! $requires_vat ) ) {
+        // If we're preventing business to consumer purchases...
+        if ( ! empty( $prevent_b2c ) && ! $is_non_eu && ( empty( $vat_number ) || ! $requires_vat ) ) {
 
             if ( $is_eu ) {
-				$this->last_error = wp_sprintf(
-					__( 'Please enter your %s number to verify your purchase is by an EU business.', 'invoicing' ),
-					getpaid_vat_name()
-				);
+                $this->last_error = wp_sprintf(
+                    __( 'Please enter your %s number to verify your purchase is by an EU business.', 'invoicing' ),
+                    getpaid_vat_name()
+                );
             } else if ( $has_digital && $is_ip_eu ) {
 
-				$this->last_error = wp_sprintf(
-					__( 'Sales to non-EU countries cannot be completed because %s must be applied.', 'invoicing' ),
-					getpaid_vat_name()
-				);
+                $this->last_error = wp_sprintf(
+                    __( 'Sales to non-EU countries cannot be completed because %s must be applied.', 'invoicing' ),
+                    getpaid_vat_name()
+                );
 
-			}
+            }
 
-		}
+        }
 		
-		// Abort if we are not validating vat.
-		if ( ! $is_eu || ! $requires_vat || empty( $vat_number ) ) {
+        // Abort if we are not validating vat.
+        if ( ! $is_eu || ! $requires_vat || empty( $vat_number ) ) {
             return;
-		}
+        }
 
-		$is_valid = WPInv_EUVat::validate_vat_number( $vat_number, $company, $this->country );
+        $is_valid = WPInv_EUVat::validate_vat_number( $vat_number, $company, $this->country );
 
-		if ( is_string( $is_valid ) ) {
-			$this->last_error = $is_valid;
-		}
+        if ( is_string( $is_valid ) ) {
+            $this->last_error = $is_valid;
+        }
 
-	}
+    }
 
 }

Spacing +138 added lines, -138 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -161,8 +161,8 @@ 
 		$this->state = wpinv_get_default_state();
 
 		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( $_POST );
+		if (isset($_POST['getpaid_payment_form_submission'])) {
+			$this->load_data($_POST);
 		}
 	}
 
@@ -171,29 +171,29 @@ 
 	 *
 	 * @param array $data
 	 */
-	public function load_data( $data ) {
+	public function load_data($data) {
 
 		// Prepare submitted data...
-		$data = wp_unslash( $data );
+		$data = wp_unslash($data);
 
 		// Filter the data.
-		$data = apply_filters( 'getpaid_submission_data', $data, $this );
+		$data = apply_filters('getpaid_submission_data', $data, $this);
 
 		$this->data = $data;
 
-		$this->id = md5( wp_json_encode( $data ) );
+		$this->id = md5(wp_json_encode($data));
 
 		// Every submission needs an active payment form.
-		if ( empty( $data['form_id'] ) ) {
-			$this->last_error = __( 'Missing payment form', 'invoicing' );
+		if (empty($data['form_id'])) {
+			$this->last_error = __('Missing payment form', 'invoicing');
             return;
 		}
 
 		// Fetch the payment form.
-		$form = new GetPaid_Payment_Form( $data['form_id'] );
+		$form = new GetPaid_Payment_Form($data['form_id']);
 
-		if ( ! $form->is_active() ) {
-			$this->last_error = __( 'Payment form not active', 'invoicing' );
+		if (!$form->is_active()) {
+			$this->last_error = __('Payment form not active', 'invoicing');
 			return;
 		}
 
@@ -201,36 +201,36 @@ 
 		$this->payment_form = $form;
 
 		// For existing invoices, make sure that it is valid.
-        if ( ! empty( $data['invoice_id'] ) ) {
-            $invoice = wpinv_get_invoice( $data['invoice_id'] );
+        if (!empty($data['invoice_id'])) {
+            $invoice = wpinv_get_invoice($data['invoice_id']);
 
-            if ( empty( $invoice ) ) {
-				$this->last_error = __( 'Invalid invoice', 'invoicing' );
+            if (empty($invoice)) {
+				$this->last_error = __('Invalid invoice', 'invoicing');
                 return;
 			}
 			
-			if ( $invoice->is_paid() ) {
-				$this->last_error = __( 'This invoice is already paid for.', 'invoicing' );
+			if ($invoice->is_paid()) {
+				$this->last_error = __('This invoice is already paid for.', 'invoicing');
                 return;
 			}
 
-			$this->payment_form->set_items( $invoice->get_items() );
+			$this->payment_form->set_items($invoice->get_items());
 
 			$this->country = $invoice->get_country();
 			$this->state = $invoice->get_state();
 
 		// Default forms do not have items.
-        } else if ( $form->is_default() && isset( $data['form_items'] ) ) {
-			$this->payment_form->set_items( $data['form_items'] );
+        } else if ($form->is_default() && isset($data['form_items'])) {
+			$this->payment_form->set_items($data['form_items']);
 		}
 
 		// User's country.
-		if ( ! empty( $data['wpinv_country'] ) ) {
+		if (!empty($data['wpinv_country'])) {
 			$this->country = $data['wpinv_country'];
 		}
 
 		// User's state.
-		if ( ! empty( $data['wpinv_state'] ) ) {
+		if (!empty($data['wpinv_state'])) {
 			$this->country = $data['wpinv_state'];
 		}
 
@@ -239,42 +239,42 @@ 
 
 		// Handle items.
 		$selected_items = array();
-		if ( ! empty( $data['getpaid-items'] ) ) {
-			$selected_items = wpinv_clean( $data['getpaid-items'] );
+		if (!empty($data['getpaid-items'])) {
+			$selected_items = wpinv_clean($data['getpaid-items']);
 		}
 
-		foreach ( $this->payment_form->get_items() as $item ) {
+		foreach ($this->payment_form->get_items() as $item) {
 
 			// Continue if this is an optional item and it has not been selected.
-			if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
+			if (!$item->is_required() && !isset($selected_items[$item->get_id()])) {
 				continue;
 			}
 
 			// (maybe) let customers change the quantities and prices.
-			if ( isset( $selected_items[ $item->get_id() ] ) ) {
+			if (isset($selected_items[$item->get_id()])) {
 
 				// Maybe change the quantities.
-				if ( $item->allows_quantities() && is_numeric( $selected_items[ $item->get_id() ]['quantity'] ) ) {
-					$item->set_quantity( (int) $selected_items[ $item->get_id() ]['quantity'] );
+				if ($item->allows_quantities() && is_numeric($selected_items[$item->get_id()]['quantity'])) {
+					$item->set_quantity((int) $selected_items[$item->get_id()]['quantity']);
 				}
 
 				// Maybe change the price.
-				if ( $item->user_can_set_their_price() ) {
-					$price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
+				if ($item->user_can_set_their_price()) {
+					$price = (float) wpinv_sanitize_amount($selected_items[$item->get_id()]['price']);
 
 					// But don't get lower than the minimum price.
-					if ( $price < $item->get_minimum_price() ) {
+					if ($price < $item->get_minimum_price()) {
 						$price = $item->get_minimum_price();
 					}
 
-					$item->set_price( $price );
+					$item->set_price($price);
 
 				}
 
 			}
 
 			// Add the item to the form.
-			$this->add_item( $item );
+			$this->add_item($item);
 
 		}
 
@@ -282,7 +282,7 @@ 
 		$this->maybe_validate_vat();
 
 		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+		do_action_ref_array('getpaid_process_submission', array(&$this));
 
 		// Remove invalid discount.
 		$this->maybe_remove_discount();
@@ -316,7 +316,7 @@ 
 	 * @return bool
 	 */
 	public function has_invoice() {
-		return ! empty( $this->invoice );
+		return !empty($this->invoice);
 	}
 
 	/**
@@ -328,8 +328,8 @@ 
 	public function get_vat_number() {
 
 		// Retrieve from the posted data.
-		if ( ! empty( $this->data['wpinv_vat_number'] ) ) {
-			return wpinv_clean( $this->data['wpinv_vat_number'] );
+		if (!empty($this->data['wpinv_vat_number'])) {
+			return wpinv_clean($this->data['wpinv_vat_number']);
 		}
 
 		// Retrieve from the invoice.
@@ -345,8 +345,8 @@ 
 	public function get_company() {
 
 		// Retrieve from the posted data.
-		if ( ! empty( $this->data['wpinv_company'] ) ) {
-			return wpinv_clean( $this->data['wpinv_company'] );
+		if (!empty($this->data['wpinv_company'])) {
+			return wpinv_clean($this->data['wpinv_company']);
 		}
 
 		// Retrieve from the invoice.
@@ -360,7 +360,7 @@ 
 	 * @return string
 	 */
 	public function get_currency() {
-		if ( $this->has_invoice() ) {
+		if ($this->has_invoice()) {
 			return $this->invoice->get_currency();
 		}
 		return wpinv_get_currency();
@@ -381,8 +381,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+	public function is_required_field_set($field) {
+		return empty($field['required']) || !empty($this->data[$field['id']]);
 	}
 
 	///////// Items //////////////
@@ -393,31 +393,31 @@ 
 	 * @since 1.0.19
 	 * @param GetPaid_Form_Item $item
 	 */
-	public function add_item( $item ) {
+	public function add_item($item) {
 
 		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() ) {
+		if (!$item->can_purchase()) {
 			return;
 		}
 
 		// Do we have a recurring item?
-		if ( $item->is_recurring() ) {
+		if ($item->is_recurring()) {
 
-			if ( $this->has_recurring ) {
-				$this->last_error = __( 'You can only buy one recurring item at a time.', 'invoicing' );
+			if ($this->has_recurring) {
+				$this->last_error = __('You can only buy one recurring item at a time.', 'invoicing');
 			}
 
 			$this->has_recurring = true;
 
 		}
 
-		$this->items[ $item->get_id() ] = $item;
+		$this->items[$item->get_id()] = $item;
 
 		$this->subtotal_amount += $item->get_sub_total();
 
-		$this->process_item_discount( $item );
+		$this->process_item_discount($item);
 
-		$this->process_item_tax( $item );
+		$this->process_item_tax($item);
 	}
 
 	/**
@@ -425,8 +425,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function get_item( $item_id ) {
-		return isset( $this->items[ $item_id ] ) ? $this->items[ $item_id ] : null;
+	public function get_item($item_id) {
+		return isset($this->items[$item_id]) ? $this->items[$item_id] : null;
 	}
 
 	/**
@@ -446,15 +446,15 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function add_tax( $name, $amount ) {
-		$amount = (float) wpinv_sanitize_amount( $amount );
+	public function add_tax($name, $amount) {
+		$amount = (float) wpinv_sanitize_amount($amount);
 
 		$this->total_tax_amount += $amount;
 
-		if ( isset( $this->taxes[ $name ] ) ) {
-			$this->taxes[ $name ] += $amount;
+		if (isset($this->taxes[$name])) {
+			$this->taxes[$name] += $amount;
 		} else {
-			$this->taxes[ $name ] = $amount;
+			$this->taxes[$name] = $amount;
 		}
 
 	}
@@ -468,11 +468,11 @@ 
 
 		$use_taxes = wpinv_use_taxes();
 
-		if ( $this->has_invoice() && $this->invoice->disable_taxes ) {
+		if ($this->has_invoice() && $this->invoice->disable_taxes) {
 			$use_taxes = false;
 		}
 
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+		return apply_filters('getpaid_submission_use_taxes', $use_taxes, $this);
 
 	}
 
@@ -482,23 +482,23 @@ 
 	 * @since 1.0.19 
 	 * @param GetPaid_Form_Item $item
 	 */
-	public function process_item_tax( $item ) {
+	public function process_item_tax($item) {
 
 		// Abort early if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
+		if (!$this->use_taxes()) {
 			return;
 		}
 
-		$rate  = wpinv_get_tax_rate( $this->country, $this->state, $item->get_id() );
+		$rate  = wpinv_get_tax_rate($this->country, $this->state, $item->get_id());
 		$price = $item->get_sub_total();
 
-		if ( wpinv_prices_include_tax() ) {
-			$item_tax = $price - ( $price - $price * $rate * 0.01 );
+		if (wpinv_prices_include_tax()) {
+			$item_tax = $price - ($price - $price * $rate * 0.01);
 		} else {
 			$item_tax = $price * $rate * 0.01;
 		}
 
-		$this->add_tax( 'Tax', $item_tax );
+		$this->add_tax('Tax', $item_tax);
 
 	}
 
@@ -516,8 +516,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function get_tax( $name ) {
-		return isset( $this->taxes[ $name ] ) ? $this->taxes[ $name ] : 0;
+	public function get_tax($name) {
+		return isset($this->taxes[$name]) ? $this->taxes[$name] : 0;
 	}
 
 	/**
@@ -536,15 +536,15 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function add_discount( $name, $amount ) {
-		$amount = wpinv_sanitize_amount( $amount );
+	public function add_discount($name, $amount) {
+		$amount = wpinv_sanitize_amount($amount);
 
 		$this->total_discount_amount += $amount;
 
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->discounts[ $name ] += $amount;
+		if (isset($this->discounts[$name])) {
+			$this->discounts[$name] += $amount;
 		} else {
-			$this->discounts[ $name ] = $amount;
+			$this->discounts[$name] = $amount;
 		}
 
 	}
@@ -554,11 +554,11 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_discount( $name ) {
+	public function remove_discount($name) {
 
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->total_discount_amount -= $this->discounts[ $name ];
-			unset( $this->discounts[ $name ] );
+		if (isset($this->discounts[$name])) {
+			$this->total_discount_amount -= $this->discounts[$name];
+			unset($this->discounts[$name]);
 		}
 
 	}
@@ -570,7 +570,7 @@ 
 	 * @return bool
 	 */
 	public function has_discount_code() {
-		return ! empty( $this->discount );
+		return !empty($this->discount);
 	}
 
 	/**
@@ -591,32 +591,32 @@ 
 	public function maybe_prepare_discount() {
 
 		// Do we have a discount?
-		if ( empty( $this->data['discount'] ) ) {
+		if (empty($this->data['discount'])) {
 			return;
 		}
 
 		// Fetch the discount.
-		$discount = wpinv_get_discount_obj( $this->data['discount'] );
+		$discount = wpinv_get_discount_obj($this->data['discount']);
 
 		// Ensure it is active.
-        if ( ! $discount->exists() || ! $discount->is_active() || ! $discount->has_started() || $discount->is_expired() ) {
+        if (!$discount->exists() || !$discount->is_active() || !$discount->has_started() || $discount->is_expired()) {
 			$this->is_discount_valid = false;
-			$this->last_error = __( 'Invalid or expired discount code', 'invoicing' );
+			$this->last_error = __('Invalid or expired discount code', 'invoicing');
 			return;
 		}
 
 		// For single use discounts...
-		if ( $discount->is_single_use ) {
+		if ($discount->is_single_use) {
 
-			if ( ! $this->has_billing_email() ) {
+			if (!$this->has_billing_email()) {
 				$this->is_discount_valid = false;
-				$this->last_error = __( 'You need to enter your billing email before applying this discount', 'invoicing' );
+				$this->last_error = __('You need to enter your billing email before applying this discount', 'invoicing');
 				return;
 			}
 
-			if ( ! $discount->is_valid_for_user( $this->get_billing_email() ) ) {
+			if (!$discount->is_valid_for_user($this->get_billing_email())) {
 				$this->is_discount_valid = false;
-				$this->last_error = __( 'You have already used this discount', 'invoicing' );
+				$this->last_error = __('You have already used this discount', 'invoicing');
 				return;
 			}
 
@@ -635,35 +635,35 @@ 
 	public function maybe_remove_discount() {
 
 		// Do we have a discount?
-		if ( empty( $this->has_discount_code() ) ) {
+		if (empty($this->has_discount_code())) {
 			return;
 		}
 
 		// Fetch the discount amount.
-		$amount = $this->get_discount( 'Discount' );
+		$amount = $this->get_discount('Discount');
 
 		// Abort early if this is a "zero" discount.
-		if ( empty( $amount ) ) {
+		if (empty($amount)) {
 			return;
 		}
 
 		$total = $this->subtotal_amount + $this->get_total_fees() + $this->get_total_tax();
 
-		if ( ! $this->discount->is_minimum_amount_met( $total ) ) {
+		if (!$this->discount->is_minimum_amount_met($total)) {
 			$this->is_discount_valid = false;
-            $min = wpinv_price( wpinv_format_amount( $$this->discount->min_total ) );
-			$this->last_error = sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min );
+            $min = wpinv_price(wpinv_format_amount($$this->discount->min_total));
+			$this->last_error = sprintf(__('The minimum total for using this discount is %s', 'invoicing'), $min);
         }
 
-        if ( ! $this->discount->is_maximum_amount_met( $total ) ) {
+        if (!$this->discount->is_maximum_amount_met($total)) {
 			$this->is_discount_valid = false;
-            $max = wpinv_price( wpinv_format_amount( $$this->discount->max_total ) );
-			$this->last_error = sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max );
+            $max = wpinv_price(wpinv_format_amount($$this->discount->max_total));
+			$this->last_error = sprintf(__('The maximum total for using this discount is %s', 'invoicing'), $max);
 		}
 
-		if ( ! $this->is_discount_valid ) {
+		if (!$this->is_discount_valid) {
 			$this->discount = null;
-			$this->remove_discount( 'Discount' );
+			$this->remove_discount('Discount');
 		}
 
     }
@@ -674,22 +674,22 @@ 
 	 * @since 1.0.19
 	 * @param GetPaid_Form_Item $item
 	 */
-	public function process_item_discount( $item ) {
+	public function process_item_discount($item) {
 
 		// Abort early if there is no discount.
-		if ( ! $this->has_discount_code() ) {
+		if (!$this->has_discount_code()) {
 			return;
 		}
 
 		// Ensure that it is valid for this item.
-		if ( ! $this->discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+		if (!$this->discount->is_valid_for_items(array($item->get_id()))) {
 			return;
 		}
 
 		// Fetch the discounted amount.
-		$discount = $this->discount->get_discounted_amount( $item->get_price() * $item->get_quantity() );
+		$discount = $this->discount->get_discounted_amount($item->get_price() * $item->get_quantity());
 
-		$this->add_discount( 'Discount', $discount );
+		$this->add_discount('Discount', $discount);
 
 	}
 
@@ -707,8 +707,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function get_discount( $name ) {
-		return isset( $this->discounts[ $name ] ) ? $this->discounts[ $name ] : 0;
+	public function get_discount($name) {
+		return isset($this->discounts[$name]) ? $this->discounts[$name] : 0;
 	}
 
 	/**
@@ -727,15 +727,15 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function add_fee( $name, $amount ) {
-		$amount = wpinv_sanitize_amount( $amount );
+	public function add_fee($name, $amount) {
+		$amount = wpinv_sanitize_amount($amount);
 
 		$this->total_fees_amount += $amount;
 
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->fees[ $name ] += $amount;
+		if (isset($this->fees[$name])) {
+			$this->fees[$name] += $amount;
 		} else {
-			$this->fees[ $name ] = $amount;
+			$this->fees[$name] = $amount;
 		}
 
 	}
@@ -754,8 +754,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function get_fee( $name ) {
-		return isset( $this->fees[ $name ] ) ? $this->fees[ $name ] : 0;
+	public function get_fee($name) {
+		return isset($this->fees[$name]) ? $this->fees[$name] : 0;
 	}
 
 	/**
@@ -776,8 +776,8 @@ 
 	 */
 	public function get_total() {
 		$total = $this->subtotal_amount + $this->get_total_fees() - $this->get_total_discount() + $this->get_total_tax();
-		$total = apply_filters( 'getpaid_get_submission_total_amount', $total, $this  );
-		return wpinv_sanitize_amount( $total );
+		$total = apply_filters('getpaid_get_submission_total_amount', $total, $this);
+		return wpinv_sanitize_amount($total);
 	}
 
 	/**
@@ -788,11 +788,11 @@ 
 	public function get_payment_details() {
 		$collect = $this->subtotal_amount + $this->get_total_fees() - $this->get_total_discount() + $this->get_total_tax();
 
-		if ( $this->has_recurring ) {
+		if ($this->has_recurring) {
 			$collect = true;
 		}
 
-		$collect = apply_filters( 'getpaid_submission_collect_payment_details', $collect, $this  );
+		$collect = apply_filters('getpaid_submission_collect_payment_details', $collect, $this);
 		return $collect;
 	}
 
@@ -802,8 +802,8 @@ 
 	 * @since 1.0.19
 	 */
 	public function get_billing_email() {
-		$billing_email = empty( $this->data['billing_email'] ) ? '' : $this->data['billing_email'];
-		return apply_filters( 'getpaid_get_submission_billing_email', $billing_email, $this  );
+		$billing_email = empty($this->data['billing_email']) ? '' : $this->data['billing_email'];
+		return apply_filters('getpaid_get_submission_billing_email', $billing_email, $this);
 	}
 
 	/**
@@ -813,7 +813,7 @@ 
 	 */
 	public function has_billing_email() {
 		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email );
+		return !empty($billing_email);
 	}
 
 	/**
@@ -824,16 +824,16 @@ 
 	public function maybe_validate_vat() {
 		
 		// Make sure that taxes are enabled.
-		if ( ! wpinv_use_taxes() ) {
+		if (!wpinv_use_taxes()) {
 			return;
 		}
 
 		// Check if we have a digital VAT rule.
 		$has_digital = false;
 
-		foreach ( $this->get_items() as $item ) {
+		foreach ($this->get_items() as $item) {
 
-			if ( 'digital' == $item->get_vat_rule() ) {
+			if ('digital' == $item->get_vat_rule()) {
 				$has_digital = true;
 				break;
 			}
@@ -844,14 +844,14 @@ 
 
 		// Check if we require vat.
 		$requires_vat = (
-			( getpaid_is_eu_state( $this->country ) && ( getpaid_is_eu_state( wpinv_get_default_country() ) || $has_digital ) )
-			|| ( getpaid_is_gst_country( $this->country ) && getpaid_is_gst_country( wpinv_get_default_country() ) )
+			(getpaid_is_eu_state($this->country) && (getpaid_is_eu_state(wpinv_get_default_country()) || $has_digital))
+			|| (getpaid_is_gst_country($this->country) && getpaid_is_gst_country(wpinv_get_default_country()))
 		);
 
 		$this->requires_vat = $requires_vat;
 
 		// Abort if we are not calculating the taxes.
-		if ( ! $has_digital && ! $requires_vat ) {
+		if (!$has_digital && !$requires_vat) {
             return;
 		}
 
@@ -859,23 +859,23 @@ 
 		$vat_number = $this->get_vat_number();
 		$company    = $this->get_company();
 		$ip_country = WPInv_EUVat::get_country_by_ip();
-        $is_eu      = getpaid_is_eu_state( $this->country );
-        $is_ip_eu   = getpaid_is_eu_state( $ip_country );
-		$is_non_eu  = ! $is_eu && ! $is_ip_eu;
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
+        $is_eu      = getpaid_is_eu_state($this->country);
+        $is_ip_eu   = getpaid_is_eu_state($ip_country);
+		$is_non_eu  = !$is_eu && !$is_ip_eu;
+		$prevent_b2c = wpinv_get_option('vat_prevent_b2c_purchase');
 
 		// If we're preventing business to consumer purchases...
-		if ( ! empty( $prevent_b2c ) && ! $is_non_eu && ( empty( $vat_number ) || ! $requires_vat ) ) {
+		if (!empty($prevent_b2c) && !$is_non_eu && (empty($vat_number) || !$requires_vat)) {
 
-            if ( $is_eu ) {
+            if ($is_eu) {
 				$this->last_error = wp_sprintf(
-					__( 'Please enter your %s number to verify your purchase is by an EU business.', 'invoicing' ),
+					__('Please enter your %s number to verify your purchase is by an EU business.', 'invoicing'),
 					getpaid_vat_name()
 				);
-            } else if ( $has_digital && $is_ip_eu ) {
+            } else if ($has_digital && $is_ip_eu) {
 
 				$this->last_error = wp_sprintf(
-					__( 'Sales to non-EU countries cannot be completed because %s must be applied.', 'invoicing' ),
+					__('Sales to non-EU countries cannot be completed because %s must be applied.', 'invoicing'),
 					getpaid_vat_name()
 				);
 
@@ -884,13 +884,13 @@ 
 		}
 		
 		// Abort if we are not validating vat.
-		if ( ! $is_eu || ! $requires_vat || empty( $vat_number ) ) {
+		if (!$is_eu || !$requires_vat || empty($vat_number)) {
             return;
 		}
 
-		$is_valid = WPInv_EUVat::validate_vat_number( $vat_number, $company, $this->country );
+		$is_valid = WPInv_EUVat::validate_vat_number($vat_number, $company, $this->country);
 
-		if ( is_string( $is_valid ) ) {
+		if (is_string($is_valid)) {
 			$this->last_error = $is_valid;
 		}
 

includes/class-wpinv-ajax.php

Spacing +304 added lines, -304 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
  
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WPInv_Ajax class.
@@ -17,8 +17,8 @@ 
 	 * Hook in ajax handlers.
 	 */
 	public static function init() {
-		add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-		add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+		add_action('init', array(__CLASS__, 'define_ajax'), 0);
+		add_action('template_redirect', array(__CLASS__, 'do_wpinv_ajax'), 0);
 		self::add_ajax_events();
     }
 
@@ -27,11 +27,11 @@ 
 	 */
 	public static function define_ajax() {
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			getpaid_maybe_define_constant( 'DOING_AJAX', true );
-			getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
-			if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-				/** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
+		if (!empty($_GET['wpinv-ajax'])) {
+			getpaid_maybe_define_constant('DOING_AJAX', true);
+			getpaid_maybe_define_constant('WPInv_DOING_AJAX', true);
+			if (!WP_DEBUG || (WP_DEBUG && !WP_DEBUG_DISPLAY)) {
+				/** @scrutinizer ignore-unhandled */ @ini_set('display_errors', 0);
 			}
 			$GLOBALS['wpdb']->hide_errors();
 		}
@@ -44,13 +44,13 @@ 
 	 * @since 1.0.18
 	 */
 	private static function wpinv_ajax_headers() {
-		if ( ! headers_sent() ) {
+		if (!headers_sent()) {
 			send_origin_headers();
 			send_nosniff_header();
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-			header( 'X-Robots-Tag: noindex' );
-			status_header( 200 );
+			header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+			header('X-Robots-Tag: noindex');
+			status_header(200);
 		}
     }
     
@@ -60,16 +60,16 @@ 
 	public static function do_wpinv_ajax() {
 		global $wp_query;
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			$wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
+		if (!empty($_GET['wpinv-ajax'])) {
+			$wp_query->set('wpinv-ajax', sanitize_text_field(wp_unslash($_GET['wpinv-ajax'])));
 		}
 
-		$action = $wp_query->get( 'wpinv-ajax' );
+		$action = $wp_query->get('wpinv-ajax');
 
-		if ( $action ) {
+		if ($action) {
 			self::wpinv_ajax_headers();
-			$action = sanitize_text_field( $action );
-			do_action( 'wpinv_ajax_' . $action );
+			$action = sanitize_text_field($action);
+			do_action('wpinv_ajax_' . $action);
 			wp_die();
 		}
 
@@ -103,36 +103,36 @@ 
             'ip_geolocation'              => true,
         );
 
-        foreach ( $ajax_events as $ajax_event => $nopriv ) {
-            add_action( 'wp_ajax_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-            add_action( 'wp_ajax_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+        foreach ($ajax_events as $ajax_event => $nopriv) {
+            add_action('wp_ajax_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+            add_action('wp_ajax_getpaid_' . $ajax_event, array(__CLASS__, $ajax_event));
 
-            if ( $nopriv ) {
-                add_action( 'wp_ajax_nopriv_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-                add_action( 'wp_ajax_nopriv_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-                add_action( 'wpinv_ajax_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+            if ($nopriv) {
+                add_action('wp_ajax_nopriv_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wp_ajax_nopriv_getpaid_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wpinv_ajax_' . $ajax_event, array(__CLASS__, $ajax_event));
             }
         }
     }
     
     public static function add_note() {
-        check_ajax_referer( 'add-invoice-note', '_nonce' );
+        check_ajax_referer('add-invoice-note', '_nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
-        $post_id   = absint( $_POST['post_id'] );
-        $note      = wp_kses_post( trim( stripslashes( $_POST['note'] ) ) );
-        $note_type = sanitize_text_field( $_POST['note_type'] );
+        $post_id   = absint($_POST['post_id']);
+        $note      = wp_kses_post(trim(stripslashes($_POST['note'])));
+        $note_type = sanitize_text_field($_POST['note_type']);
 
         $is_customer_note = $note_type == 'customer' ? 1 : 0;
 
-        if ( $post_id > 0 ) {
-            $note_id = wpinv_insert_payment_note( $post_id, $note, $is_customer_note );
+        if ($post_id > 0) {
+            $note_id = wpinv_insert_payment_note($post_id, $note, $is_customer_note);
 
-            if ( $note_id > 0 && !is_wp_error( $note_id ) ) {
-                wpinv_get_invoice_note_line_item( $note_id );
+            if ($note_id > 0 && !is_wp_error($note_id)) {
+                wpinv_get_invoice_note_line_item($note_id);
             }
         }
 
@@ -140,16 +140,16 @@ 
     }
 
     public static function delete_note() {
-        check_ajax_referer( 'delete-invoice-note', '_nonce' );
+        check_ajax_referer('delete-invoice-note', '_nonce');
 
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
-        $note_id = (int)$_POST['note_id'];
+        $note_id = (int) $_POST['note_id'];
 
-        if ( $note_id > 0 ) {
-            wp_delete_comment( $note_id, true );
+        if ($note_id > 0) {
+            wp_delete_comment($note_id, true);
         }
 
         die();
@@ -162,8 +162,8 @@ 
     }
     
     public static function checkout() {
-        if ( ! defined( 'WPINV_CHECKOUT' ) ) {
-            define( 'WPINV_CHECKOUT', true );
+        if (!defined('WPINV_CHECKOUT')) {
+            define('WPINV_CHECKOUT', true);
         }
 
         wpinv_process_checkout();
@@ -176,34 +176,34 @@ 
     public static function get_billing_details() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
         // Do we have a user id?
         $user_id = $_GET['user_id'];
 
-        if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+        if (empty($user_id) || !is_numeric($user_id)) {
             die(-1);
         }
 
         // Fetch the billing details.
-        $billing_details    = wpinv_get_user_address( $user_id );
-        $billing_details    = apply_filters( 'wpinv_ajax_billing_details', $billing_details, $user_id );
+        $billing_details    = wpinv_get_user_address($user_id);
+        $billing_details    = apply_filters('wpinv_ajax_billing_details', $billing_details, $user_id);
 
         // unset the user id and email.
-        $to_ignore = array( 'user_id', 'email' );
+        $to_ignore = array('user_id', 'email');
 
-        foreach ( $to_ignore as $key ) {
-            if ( isset( $billing_details[ $key ] ) ) {
-                unset( $billing_details[ $key ] );
+        foreach ($to_ignore as $key) {
+            if (isset($billing_details[$key])) {
+                unset($billing_details[$key]);
             }
         }
 
-        wp_send_json_success( $billing_details );
+        wp_send_json_success($billing_details);
 
     }
 
@@ -213,47 +213,47 @@ 
     public static function check_new_user_email() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
         // We need an email address.
-        if ( empty( $_GET['email'] ) ) {
-            _e( "Provide the new user's email address", 'invoicing' );
+        if (empty($_GET['email'])) {
+            _e("Provide the new user's email address", 'invoicing');
             exit;
         }
 
         // Ensure the email is valid.
-        $email = sanitize_text_field( $_GET['email'] );
-        if ( ! is_email( $email ) ) {
-            _e( 'Invalid email address', 'invoicing' );
+        $email = sanitize_text_field($_GET['email']);
+        if (!is_email($email)) {
+            _e('Invalid email address', 'invoicing');
             exit;
         }
 
         // And it does not exist.
-        if ( email_exists( $email ) ) {
-            _e( 'A user with this email address already exists', 'invoicing' );
+        if (email_exists($email)) {
+            _e('A user with this email address already exists', 'invoicing');
             exit;
         }
 
-        wp_send_json_success( true );
+        wp_send_json_success(true);
     }
     
     public static function run_tool() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
         
-        $tool = sanitize_text_field( $_POST['tool'] );
+        $tool = sanitize_text_field($_POST['tool']);
         
-        do_action( 'wpinv_run_tool' );
+        do_action('wpinv_run_tool');
         
-        if ( !empty( $tool ) ) {
-            do_action( 'wpinv_tool_' . $tool );
+        if (!empty($tool)) {
+            do_action('wpinv_tool_' . $tool);
         }
     }
 
@@ -263,30 +263,30 @@ 
     public static function get_payment_form() {
 
         // Check nonce.
-        if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'], 'getpaid_ajax_form' ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (!isset($_GET['nonce']) || !wp_verify_nonce($_GET['nonce'], 'getpaid_ajax_form')) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+		if (empty($_GET['form']) && empty($_GET['item'])) {
 			echo aui()->alert(
 				array(
 					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
+					'content' => __('No payment form or item provided', 'invoicing'),
 				)
             );
             exit;
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
-            echo getpaid_display_payment_form( $_GET['form'] );
-		} else if( $_GET['invoice'] ) {
-		    echo getpaid_display_invoice_payment_form( $_GET['invoice'] );
+		if (!empty($_GET['form'])) {
+            echo getpaid_display_payment_form($_GET['form']);
+		} else if ($_GET['invoice']) {
+		    echo getpaid_display_invoice_payment_form($_GET['invoice']);
         } else {
-			$items = getpaid_convert_items_to_array( $_GET['item'] );
-		    echo getpaid_display_item_payment_form( $items );
+			$items = getpaid_convert_items_to_array($_GET['item']);
+		    echo getpaid_display_item_payment_form($items);
         }
         
         exit;
@@ -302,11 +302,11 @@ 
         global $invoicing, $wpi_checkout_id, $cart_total;
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
@@ -314,52 +314,52 @@ 
         $submission = new GetPaid_Payment_Form_Submission();
 
         // Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
+        if (!empty($submission->last_error)) {
             echo $submission->last_error;
             exit;
         }
 
         // We need a billing email.
-        if ( ! $submission->has_billing_email() || ! is_email( $submission->get_billing_email() ) ) {
-            wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
+        if (!$submission->has_billing_email() || !is_email($submission->get_billing_email())) {
+            wp_send_json_error(__('Provide a valid billing email.', 'invoicing'));
         }
 
         // Prepare items.
         $items = $submission->get_items();
 
         // Ensure that we have items.
-        if ( empty( $items ) ) {
-            wp_send_json_error( __( 'You have not selected any items.', 'invoicing' ) );
+        if (empty($items)) {
+            wp_send_json_error(__('You have not selected any items.', 'invoicing'));
         }
 
         // Prepare the invoice.
-        if ( ! $submission->has_invoice() ) {
+        if (!$submission->has_invoice()) {
             $invoice = new WPInv_Invoice();
         } else {
             $invoice = $submission->get_invoice();
         }
 
         // Make sure that it is neither paid or refunded.
-        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-            wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+        if ($invoice->is_paid() || $invoice->is_refunded()) {
+            wp_send_json_error(__('This invoice has already been paid for.', 'invoicing'));
         }
 
         // Set the billing email.
-        $invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
+        $invoice->set_email(sanitize_email($submission->get_billing_email()));
 
         // Payment form.
-        $invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
+        $invoice->set_payment_form(absint($submission->get_payment_form()->get_id()));
 
         // Discount code.
-        if ( $submission->has_discount_code() ) {
-            $invoice->set_discount_code( $submission->get_discount_code() );
+        if ($submission->has_discount_code()) {
+            $invoice->set_discount_code($submission->get_discount_code());
         }
 
         // Items, Fees, taxes and discounts.
-        $invoice->set_items( $items );
-        $invoice->set_fees( $submission->get_fees() );
-        $invoice->set_taxes( $submission->get_taxes() );
-        $invoice->set_discounts( $submission->get_discounts() );
+        $invoice->set_items($items);
+        $invoice->set_fees($submission->get_fees());
+        $invoice->set_taxes($submission->get_taxes());
+        $invoice->set_discounts($submission->get_discounts());
 
         // Prepared submission details.
         $prepared = array();
@@ -368,48 +368,48 @@ 
         $data = $submission->get_data();
 
         // Loop throught the submitted details.
-        foreach ( $submission->payment_form->get_elements() as $field ) {
+        foreach ($submission->payment_form->get_elements() as $field) {
 
-            if ( ! empty( $field['premade'] ) ) {
+            if (!empty($field['premade'])) {
                 continue;
             }
 
             // If it is required and not set, abort.
-            if ( ! $submission->is_required_field_set( $field ) ) {
-                wp_send_json_error( __( 'Some required fields are not set.', 'invoicing' ) );
+            if (!$submission->is_required_field_set($field)) {
+                wp_send_json_error(__('Some required fields are not set.', 'invoicing'));
             }
 
             // Handle address fields.
-            if ( $field['type'] == 'address' ) {
+            if ($field['type'] == 'address') {
 
-                foreach ( $field['fields'] as $address_field ) {
+                foreach ($field['fields'] as $address_field) {
 
                     // skip if it is not visible.
-                    if ( empty( $address_field['visible'] ) ) {
+                    if (empty($address_field['visible'])) {
                         continue;
                     }
 
                     // If it is required and not set, abort
-                    if ( ! empty( $address_field['required'] ) && empty( $data[ $address_field['name'] ] ) ) {
-                        wp_send_json_error( __( 'Some required fields are not set.', 'invoicing' ) );
+                    if (!empty($address_field['required']) && empty($data[$address_field['name']])) {
+                        wp_send_json_error(__('Some required fields are not set.', 'invoicing'));
                     }
 
-                    if ( isset( $data[ $address_field['name'] ] ) ) {
-                        $name   = str_replace( 'wpinv_', '', $address_field['name'] );
+                    if (isset($data[$address_field['name']])) {
+                        $name   = str_replace('wpinv_', '', $address_field['name']);
                         $method = "set_$name";
-                        $invoice->$method( wpinv_clean( $data[ $address_field['name'] ] ) );
+                        $invoice->$method(wpinv_clean($data[$address_field['name']]));
                     }
 
                 }
 
-            } else if ( isset( $data[ $field['id'] ] ) ) {
+            } else if (isset($data[$field['id']])) {
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-                $prepared[ wpinv_clean( $label ) ] = wpinv_clean( $data[ $field['id'] ] );
+                $prepared[wpinv_clean($label)] = wpinv_clean($data[$field['id']]);
             }
 
         }
@@ -417,23 +417,23 @@ 
         // (Maybe) create the user.
         $user = get_current_user_id();
 
-        if ( empty( $user ) ) {
-            $user = get_user_by( 'email', $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = get_user_by('email', $submission->get_billing_email());
         }
 
-        if ( empty( $user ) ) {
-            $user = wpinv_create_user( $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = wpinv_create_user($submission->get_billing_email());
         }
 
-        if ( is_wp_error( $user ) ) {
-            wp_send_json_error( $user->get_error_message() );
+        if (is_wp_error($user)) {
+            wp_send_json_error($user->get_error_message());
         }
 
-        if ( is_numeric( $user ) ) {
-            $user = get_user_by( 'id', $user );
+        if (is_numeric($user)) {
+            $user = get_user_by('id', $user);
         }
 
-        $invoice->set_user_id( $user->ID );
+        $invoice->set_user_id($user->ID);
 
         $invoice->recalculate_total();
 
@@ -441,33 +441,33 @@ 
         $invoice->save();
 
         // Was it saved successfully:
-        if ($invoice->get_id() == 0 ) {
-            wp_send_json_error( __( 'An error occured while saving your invoice.', 'invoicing' ) );
+        if ($invoice->get_id() == 0) {
+            wp_send_json_error(__('An error occured while saving your invoice.', 'invoicing'));
         }
 
         // Save payment form data.
-        update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared );
+        update_post_meta($invoice->get_id(), 'payment_form_data', $prepared);
 
         // Backwards compatibility.
         $wpi_checkout_id = $invoice->get_id();
         $cart_total      = wpinv_price(
-            wpinv_format_amount( $invoice->get_total() ),
+            wpinv_format_amount($invoice->get_total()),
             $invoice->get_currency()
         );
 
         $data                   = array();
         $data['invoice_id']     = $invoice->get_id();
-        $data['cart_discounts'] = array ( $invoice->get_discount_code() );
+        $data['cart_discounts'] = array($invoice->get_discount_code());
 
-        wpinv_set_checkout_session( $data );
-        add_filter( 'wp_redirect', array( $invoicing->form_elements, 'send_redirect_response' ) );
-        add_action( 'wpinv_pre_send_back_to_checkout', array( $invoicing->form_elements, 'checkout_error' ) );
+        wpinv_set_checkout_session($data);
+        add_filter('wp_redirect', array($invoicing->form_elements, 'send_redirect_response'));
+        add_action('wpinv_pre_send_back_to_checkout', array($invoicing->form_elements, 'checkout_error'));
 
-        if ( ! defined( 'WPINV_CHECKOUT' ) ) {
-            define( 'WPINV_CHECKOUT', true );
+        if (!defined('WPINV_CHECKOUT')) {
+            define('WPINV_CHECKOUT', true);
         }
 
-        wpinv_process_checkout( $invoice, $submission->get_data() );
+        wpinv_process_checkout($invoice, $submission->get_data());
 
         $invoicing->form_elements->checkout_error();
 
@@ -482,51 +482,51 @@ 
     public static function get_payment_form_states_field() {
         global $invoicing;
 
-        if ( empty( $_GET['country'] ) || empty( $_GET['form'] ) ) {
+        if (empty($_GET['country']) || empty($_GET['form'])) {
             exit;
         }
 
-        $elements = $invoicing->form_elements->get_form_elements( $_GET['form'] );
+        $elements = $invoicing->form_elements->get_form_elements($_GET['form']);
 
-        if ( empty( $elements ) ) {
+        if (empty($elements)) {
             exit;
         }
 
         $address_fields = array();
-        foreach ( $elements as $element ) {
-            if ( 'address' === $element['type'] ) {
+        foreach ($elements as $element) {
+            if ('address' === $element['type']) {
                 $address_fields = $element;
                 break;
             }
         }
 
-        if ( empty( $address_fields ) ) {
+        if (empty($address_fields)) {
             exit;
         }
 
-        foreach( $address_fields['fields'] as $address_field ) {
+        foreach ($address_fields['fields'] as $address_field) {
 
-            if ( 'wpinv_state' == $address_field['name'] ) {
+            if ('wpinv_state' == $address_field['name']) {
 
                 $label = $address_field['label'];
 
-                if ( ! empty( $address_field['required'] ) ) {
+                if (!empty($address_field['required'])) {
                     $label .= "<span class='text-danger'> *</span>";
                 }
 
-                $states = wpinv_get_country_states( $_GET['country'] );
+                $states = wpinv_get_country_states($_GET['country']);
 
-                if ( ! empty( $states ) ) {
+                if (!empty($states)) {
 
                     $html = aui()->select(
                             array(
                                 'options'          => $states,
-                                'name'             => esc_attr( $address_field['name'] ),
-                                'id'               => esc_attr( $address_field['name'] ),
-                                'placeholder'      => esc_attr( $address_field['placeholder'] ),
+                                'name'             => esc_attr($address_field['name']),
+                                'id'               => esc_attr($address_field['name']),
+                                'placeholder'      => esc_attr($address_field['placeholder']),
                                 'required'         => (bool) $address_field['required'],
                                 'no_wrap'          => true,
-                                'label'            => wp_kses_post( $label ),
+                                'label'            => wp_kses_post($label),
                                 'select2'          => false,
                             )
                         );
@@ -535,10 +535,10 @@ 
 
                     $html = aui()->input(
                             array(
-                                'name'       => esc_attr( $address_field['name'] ),
-                                'id'         => esc_attr( $address_field['name'] ),
+                                'name'       => esc_attr($address_field['name']),
+                                'id'         => esc_attr($address_field['name']),
                                 'required'   => (bool) $address_field['required'],
-                                'label'      => wp_kses_post( $label ),
+                                'label'      => wp_kses_post($label),
                                 'no_wrap'    => true,
                                 'type'       => 'text',
                             )
@@ -546,7 +546,7 @@ 
 
                 }
 
-                wp_send_json_success( str_replace( 'sr-only', '', $html ) );
+                wp_send_json_success(str_replace('sr-only', '', $html));
                 exit;
 
             }
@@ -562,49 +562,49 @@ 
     public static function recalculate_invoice_totals() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice.
-        if ( empty( $_POST['post_id'] ) ) {
+        if (empty($_POST['post_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
 
         // Ensure it exists.
-        if ( ! $invoice->get_id() ) {
+        if (!$invoice->get_id()) {
             exit;
         }
 
         // Maybe set the country, state, currency.
-        foreach ( array( 'country', 'state', 'currency' ) as $key ) {
-            if ( isset( $_POST[ $key ] ) ) {
+        foreach (array('country', 'state', 'currency') as $key) {
+            if (isset($_POST[$key])) {
                 $method = "set_$key";
-                $invoice->$method( $_POST[ $key ] );
+                $invoice->$method($_POST[$key]);
             }
         }
 
         // Maybe disable taxes.
-        $invoice->set_disable_taxes( ! empty( $_POST['taxes'] ) );
+        $invoice->set_disable_taxes(!empty($_POST['taxes']));
 
         // Recalculate totals.
         $invoice->recalculate_total();
 
         $totals = array(
-            'subtotal' => wpinv_price( wpinv_format_amount( $invoice->get_subtotal() ) ),
-            'discount' => wpinv_price( wpinv_format_amount( $invoice->get_total_discount() ) ),
-            'tax'      => wpinv_price( wpinv_format_amount( $invoice->get_total_tax() ) ),
-            'total'    => wpinv_price( wpinv_format_amount( $invoice->get_total() ) ),
+            'subtotal' => wpinv_price(wpinv_format_amount($invoice->get_subtotal())),
+            'discount' => wpinv_price(wpinv_format_amount($invoice->get_total_discount())),
+            'tax'      => wpinv_price(wpinv_format_amount($invoice->get_total_tax())),
+            'total'    => wpinv_price(wpinv_format_amount($invoice->get_total())),
         );
 
-        $totals = apply_filters( 'getpaid_invoice_totals', $totals, $invoice );
+        $totals = apply_filters('getpaid_invoice_totals', $totals, $invoice);
 
-        wp_send_json_success( compact( 'totals' ) );
+        wp_send_json_success(compact('totals'));
     }
 
     /**
@@ -613,33 +613,33 @@ 
     public static function get_invoice_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and items.
-        if ( empty( $_POST['post_id'] ) ) {
+        if (empty($_POST['post_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
 
         // Ensure it exists.
-        if ( ! $invoice->get_id() ) {
+        if (!$invoice->get_id()) {
             exit;
         }
 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item_id => $item ) {
-            $items[ $item_id ] = $item->prepare_data_for_invoice_edit_ajax();
+        foreach ($invoice->get_items() as $item_id => $item) {
+            $items[$item_id] = $item->prepare_data_for_invoice_edit_ajax();
         }
 
-        wp_send_json_success( compact( 'items' ) );
+        wp_send_json_success(compact('items'));
     }
 
     /**
@@ -648,48 +648,48 @@ 
     public static function edit_invoice_item() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and item details.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['data'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['data'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Format the data.
-        $data = wp_list_pluck( $_POST['data'], 'value', 'field' );
+        $data = wp_list_pluck($_POST['data'], 'value', 'field');
 
         // Ensure that we have an item id.
-        if ( empty( $data['id'] ) ) {
+        if (empty($data['id'])) {
             exit;
         }
 
         // Abort if the invoice does not have the specified item.
-        $item = $invoice->get_item( (int) $data['id'] );
+        $item = $invoice->get_item((int) $data['id']);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             exit;
         }
 
         // Update the item.
-        $item->set_price( $data['price'] );
-        $item->set_name( $data['name'] );
-        $item->set_description( $data['description'] );
-        $item->set_quantity( $data['quantity'] );
+        $item->set_price($data['price']);
+        $item->set_name($data['name']);
+        $item->set_description($data['description']);
+        $item->set_quantity($data['quantity']);
 
         // Add it to the invoice.
-        $invoice->add_item( $item );
+        $invoice->add_item($item);
 
         // Update totals.
         $invoice->recalculate_total();
@@ -700,11 +700,11 @@ 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item_id => $item ) {
-            $items[ $item_id ] = $item->prepare_data_for_invoice_edit_ajax();
+        foreach ($invoice->get_items() as $item_id => $item) {
+            $items[$item_id] = $item->prepare_data_for_invoice_edit_ajax();
         }
 
-        wp_send_json_success( compact( 'items' ) );
+        wp_send_json_success(compact('items'));
     }
     /**
      * Adds a items to an invoice.
@@ -712,38 +712,38 @@ 
     public static function add_invoice_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and items.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['items'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['items'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
         $alert   = false;
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Add the items.
-        foreach ( $_POST['items'] as $data ) {
+        foreach ($_POST['items'] as $data) {
 
-            $item = new GetPaid_Form_Item( $data[ 'id' ] );
+            $item = new GetPaid_Form_Item($data['id']);
 
-            if ( is_numeric( $data[ 'qty' ] ) && (int) $data[ 'qty' ] > 0 ) {
-                $item->set_quantity( $data[ 'qty' ] );
+            if (is_numeric($data['qty']) && (int) $data['qty'] > 0) {
+                $item->set_quantity($data['qty']);
             }
 
-            if ( $item->get_id() > 0 ) {
-                if ( ! $invoice->add_item( $item ) ) {
-                    $alert = __( 'An invoice can only contain one recurring item', 'invoicing' );
+            if ($item->get_id() > 0) {
+                if (!$invoice->add_item($item)) {
+                    $alert = __('An invoice can only contain one recurring item', 'invoicing');
                 }
             }
 
@@ -756,11 +756,11 @@ 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item_id => $item ) {
-            $items[ $item_id ] = $item->prepare_data_for_invoice_edit_ajax();
+        foreach ($invoice->get_items() as $item_id => $item) {
+            $items[$item_id] = $item->prepare_data_for_invoice_edit_ajax();
         }
 
-        wp_send_json_success( compact( 'items', 'alert' ) );
+        wp_send_json_success(compact('items', 'alert'));
     }
 
     /**
@@ -769,15 +769,15 @@ 
     public static function get_invoicing_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need a search term.
-        if ( empty( $_GET['search'] ) ) {
-            wp_send_json_success( array() );
+        if (empty($_GET['search'])) {
+            wp_send_json_success(array());
         }
 
         // Retrieve items.
@@ -786,8 +786,8 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
-            's'              => trim( $_GET['search'] ),
+            'post_status'    => array('publish'),
+            's'              => trim($_GET['search']),
             'meta_query'     => array(
                 array(
                     'key'       => '_wpinv_type',
@@ -797,18 +797,18 @@ 
             )
         );
 
-        $items = get_posts( apply_filters( 'getpaid_ajax_invoice_items_query_args', $item_args ) );
+        $items = get_posts(apply_filters('getpaid_ajax_invoice_items_query_args', $item_args));
         $data  = array();
 
-        foreach ( $items as $item ) {
-            $item      = new GetPaid_Form_Item( $item );
+        foreach ($items as $item) {
+            $item = new GetPaid_Form_Item($item);
             $data[] = array(
                 'id'   => $item->get_id(),
                 'text' => $item->get_name()
             );
         }
 
-        wp_send_json_success( $data );
+        wp_send_json_success($data);
 
     }
 
@@ -818,24 +818,24 @@ 
     public static function get_aui_states_field() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // We need a country.
-        if ( empty( $_GET['country'] ) ) {
+        if (empty($_GET['country'])) {
             exit;
         }
 
-        $states = wpinv_get_country_states( trim( $_GET['country'] ) );
-        $state  = isset( $_GET['state'] ) ? trim( $_GET['state'] ) : wpinv_get_default_state();
+        $states = wpinv_get_country_states(trim($_GET['country']));
+        $state  = isset($_GET['state']) ? trim($_GET['state']) : wpinv_get_default_state();
 
-        if ( empty( $states ) ) {
+        if (empty($states)) {
 
             $html = aui()->input(
                 array(
                     'type'        => 'text',
                     'id'          => 'wpinv_state',
                     'name'        => 'wpinv_state',
-                    'label'       => __( 'State', 'invoicing' ),
+                    'label'       => __('State', 'invoicing'),
                     'label_type'  => 'vertical',
                     'placeholder' => 'Liège',
                     'class'       => 'form-control-sm',
@@ -849,9 +849,9 @@ 
                 array(
                     'id'          => 'wpinv_state',
                     'name'        => 'wpinv_state',
-                    'label'       => __( 'State', 'invoicing' ),
+                    'label'       => __('State', 'invoicing'),
                     'label_type'  => 'vertical',
-                    'placeholder' => __( 'Select a state', 'invoicing' ),
+                    'placeholder' => __('Select a state', 'invoicing'),
                     'class'       => 'form-control-sm',
                     'value'       => $state,
                     'options'     => $states,
@@ -865,7 +865,7 @@ 
         wp_send_json_success(
             array(
                 'html'   => $html,
-                'select' => ! empty ( $states )
+                'select' => !empty ($states)
             )
         );
 
@@ -879,46 +879,46 @@ 
     public static function ip_geolocation() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid-ip-location' );
+        check_ajax_referer('getpaid-ip-location');
 
         // IP address.
-        if ( empty( $_GET['ip'] ) || ! rest_is_ip_address( $_GET['ip'] ) ) {
-            _e( 'Invalid IP Address.', 'invoicing' );
+        if (empty($_GET['ip']) || !rest_is_ip_address($_GET['ip'])) {
+            _e('Invalid IP Address.', 'invoicing');
             exit;
         }
 
         // Retrieve location info.
-        $location = getpaid_geolocate_ip_address( $_GET['ip'] );
+        $location = getpaid_geolocate_ip_address($_GET['ip']);
 
-        if ( empty( $location ) ) {
-            _e( 'Unable to find geolocation for the IP Address.', 'invoicing' );
+        if (empty($location)) {
+            _e('Unable to find geolocation for the IP Address.', 'invoicing');
             exit;
         }
 
         // Sorry.
-        extract( $location );
+        extract($location);
 
         // Prepare the address.
         $content = '';
 
-        if ( ! empty( $location['city'] ) ) {
-            $content .=  $location['city']  . ', ';
+        if (!empty($location['city'])) {
+            $content .= $location['city'] . ', ';
         }
         
-        if ( ! empty( $location['region'] ) ) {
-            $content .=  $location['region']  . ', ';
+        if (!empty($location['region'])) {
+            $content .= $location['region'] . ', ';
         }
         
-        $content .=  $location['country'] . ' (' . $location['iso'] . ')';
+        $content .= $location['country'] . ' (' . $location['iso'] . ')';
 
         $location['address'] = $content;
 
-        $content  = '<p>'. sprintf( __( '<b>Address:</b> %s', 'invoicing' ), $content ) . '</p>';
-        $content .= '<p>'. $location['credit'] . '</p>';
+        $content  = '<p>' . sprintf(__('<b>Address:</b> %s', 'invoicing'), $content) . '</p>';
+        $content .= '<p>' . $location['credit'] . '</p>';
 
         $location['content'] = $content;
 
-        wpinv_get_template( 'geolocation.php', $location );
+        wpinv_get_template('geolocation.php', $location);
 
         exit;
     }
@@ -931,11 +931,11 @@ 
     public static function payment_form_refresh_prices() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
@@ -943,7 +943,7 @@ 
         $submission = new GetPaid_Payment_Form_Submission();
 
         // Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
+        if (!empty($submission->last_error)) {
             echo $submission->last_error;
             exit;
         }
@@ -956,43 +956,43 @@ 
             'is_free'       => $submission->get_payment_details(),
 
             'totals'        => array(
-                'subtotal'  => wpinv_price( wpinv_format_amount( $submission->subtotal_amount ), $submission->get_currency() ),
-                'discount'  => wpinv_price( wpinv_format_amount( $submission->get_total_discount() ), $submission->get_currency() ),
-                'fees'      => wpinv_price( wpinv_format_amount( $submission->get_total_fees() ), $submission->get_currency() ),
-                'tax'       => wpinv_price( wpinv_format_amount( $submission->get_total_tax() ), $submission->get_currency() ),
-                'total'     => wpinv_price( wpinv_format_amount( $submission->get_total() ), $submission->get_currency() ),
+                'subtotal'  => wpinv_price(wpinv_format_amount($submission->subtotal_amount), $submission->get_currency()),
+                'discount'  => wpinv_price(wpinv_format_amount($submission->get_total_discount()), $submission->get_currency()),
+                'fees'      => wpinv_price(wpinv_format_amount($submission->get_total_fees()), $submission->get_currency()),
+                'tax'       => wpinv_price(wpinv_format_amount($submission->get_total_tax()), $submission->get_currency()),
+                'total'     => wpinv_price(wpinv_format_amount($submission->get_total()), $submission->get_currency()),
             ),
 
             'texts'         => array(
-                '.getpaid-checkout-total-payable' => wpinv_price( wpinv_format_amount( $submission->get_total() ), $submission->get_currency() ),
+                '.getpaid-checkout-total-payable' => wpinv_price(wpinv_format_amount($submission->get_total()), $submission->get_currency()),
             )
 
         );
 
         // Add items.
         $items = $submission->get_items();
-        if ( ! empty( $items ) ) {
+        if (!empty($items)) {
             $result['items'] = array();
 
-            foreach( $items as $item_id => $item ) {
-                $result['items']["$item_id"] = wpinv_price( wpinv_format_amount( $item->get_price() * $item->get_quantity() ) );
+            foreach ($items as $item_id => $item) {
+                $result['items']["$item_id"] = wpinv_price(wpinv_format_amount($item->get_price() * $item->get_quantity()));
             }
         }
 
         // Add invoice.
-        if ( $submission->has_invoice() ) {
+        if ($submission->has_invoice()) {
             $result['invoice'] = $submission->get_invoice()->ID;
         }
 
         // Add discount code.
-        if ( $submission->has_discount_code() ) {
+        if ($submission->has_discount_code()) {
             $result['discount_code'] = $submission->get_discount_code();
         }
 
         // Filter the result.
-        $result = apply_filters( 'getpaid_payment_form_ajax_refresh_prices', $result, $submission );
+        $result = apply_filters('getpaid_payment_form_ajax_refresh_prices', $result, $submission);
 
-        wp_send_json_success( $result );
+        wp_send_json_success($result);
     }
 
     /**
@@ -1003,53 +1003,53 @@ 
     public static function buy_items() {
         $user_id = get_current_user_id();
 
-        if ( empty( $user_id ) ) { // If not logged in then lets redirect to the login page
-            wp_send_json( array(
-                'success' => wp_login_url( wp_get_referer() )
-            ) );
+        if (empty($user_id)) { // If not logged in then lets redirect to the login page
+            wp_send_json(array(
+                'success' => wp_login_url(wp_get_referer())
+            ));
         } else {
             // Only check nonce if logged in as it could be cached when logged out.
-            if ( ! isset( $_POST['wpinv_buy_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_buy_nonce'], 'wpinv_buy_items' ) ) {
-                wp_send_json( array(
-                    'error' => __( 'Security checks failed.', 'invoicing' )
-                ) );
+            if (!isset($_POST['wpinv_buy_nonce']) || !wp_verify_nonce($_POST['wpinv_buy_nonce'], 'wpinv_buy_items')) {
+                wp_send_json(array(
+                    'error' => __('Security checks failed.', 'invoicing')
+                ));
                 wp_die();
             }
 
             // allow to set a custom price through post_id
             $items = $_POST['items'];
-            $related_post_id = isset( $_POST['post_id'] ) ? (int)$_POST['post_id'] : 0;
-            $custom_item_price = $related_post_id ? abs( get_post_meta( $related_post_id, '_wpi_custom_price', true ) ) : 0;
+            $related_post_id = isset($_POST['post_id']) ? (int) $_POST['post_id'] : 0;
+            $custom_item_price = $related_post_id ? abs(get_post_meta($related_post_id, '_wpi_custom_price', true)) : 0;
 
             $cart_items = array();
-            if ( $items ) {
-                $items = explode( ',', $items );
+            if ($items) {
+                $items = explode(',', $items);
 
-                foreach( $items as $item ) {
+                foreach ($items as $item) {
                     $item_id = $item;
                     $quantity = 1;
 
-                    if ( strpos( $item, '|' ) !== false ) {
-                        $item_parts = explode( '|', $item );
+                    if (strpos($item, '|') !== false) {
+                        $item_parts = explode('|', $item);
                         $item_id = $item_parts[0];
                         $quantity = $item_parts[1];
                     }
 
-                    if ( $item_id && $quantity ) {
+                    if ($item_id && $quantity) {
                         $cart_items_arr = array(
-                            'id'            => (int)$item_id,
-                            'quantity'      => (int)$quantity
+                            'id'            => (int) $item_id,
+                            'quantity'      => (int) $quantity
                         );
 
                         // If there is a related post id then add it to meta
-                        if ( $related_post_id ) {
+                        if ($related_post_id) {
                             $cart_items_arr['meta'] = array(
                                 'post_id'   => $related_post_id
                             );
                         }
 
                         // If there is a custom price then set it.
-                        if ( $custom_item_price ) {
+                        if ($custom_item_price) {
                             $cart_items_arr['custom_price'] = $custom_item_price;
                         }
 
@@ -1065,37 +1065,37 @@ 
              * @param int $related_post_id The related post id if any.
              * @since 1.0.0
              */
-            $cart_items = apply_filters( 'wpinv_buy_cart_items', $cart_items, $related_post_id );
+            $cart_items = apply_filters('wpinv_buy_cart_items', $cart_items, $related_post_id);
 
             // Make sure its not in the cart already, if it is then redirect to checkout.
             $cart_invoice = wpinv_get_invoice_cart();
 
-            if ( isset( $cart_invoice->items ) && !empty( $cart_invoice->items ) && !empty( $cart_items ) && serialize( $cart_invoice->items ) == serialize( $cart_items ) ) {
-                wp_send_json( array(
+            if (isset($cart_invoice->items) && !empty($cart_invoice->items) && !empty($cart_items) && serialize($cart_invoice->items) == serialize($cart_items)) {
+                wp_send_json(array(
                     'success' =>  $cart_invoice->get_checkout_payment_url()
-                ) );
+                ));
                 wp_die();
             }
 
             // Check if user has invoice with same items waiting to be paid.
-            $user_invoices = wpinv_get_users_invoices( $user_id , 10 , false , 'wpi-pending' );
-            if ( !empty( $user_invoices ) ) {
-                foreach( $user_invoices as $user_invoice ) {
+            $user_invoices = wpinv_get_users_invoices($user_id, 10, false, 'wpi-pending');
+            if (!empty($user_invoices)) {
+                foreach ($user_invoices as $user_invoice) {
                     $user_cart_details = array();
-                    $invoice  = wpinv_get_invoice( $user_invoice->ID );
+                    $invoice = wpinv_get_invoice($user_invoice->ID);
                     $cart_details = $invoice->get_cart_details();
 
-                    if ( !empty( $cart_details ) ) {
-                        foreach ( $cart_details as $invoice_item ) {
+                    if (!empty($cart_details)) {
+                        foreach ($cart_details as $invoice_item) {
                             $ii_arr = array();
-                            $ii_arr['id'] = (int)$invoice_item['id'];
-                            $ii_arr['quantity'] = (int)$invoice_item['quantity'];
+                            $ii_arr['id'] = (int) $invoice_item['id'];
+                            $ii_arr['quantity'] = (int) $invoice_item['quantity'];
 
-                            if (isset( $invoice_item['meta'] ) && !empty( $invoice_item['meta'] ) ) {
+                            if (isset($invoice_item['meta']) && !empty($invoice_item['meta'])) {
                                 $ii_arr['meta'] = $invoice_item['meta'];
                             }
 
-                            if ( isset( $invoice_item['custom_price'] ) && !empty( $invoice_item['custom_price'] ) ) {
+                            if (isset($invoice_item['custom_price']) && !empty($invoice_item['custom_price'])) {
                                 $ii_arr['custom_price'] = $invoice_item['custom_price'];
                             }
 
@@ -1103,17 +1103,17 @@ 
                         }
                     }
 
-                    if ( !empty( $user_cart_details ) && serialize( $cart_items ) == serialize( $user_cart_details ) ) {
-                        wp_send_json( array(
+                    if (!empty($user_cart_details) && serialize($cart_items) == serialize($user_cart_details)) {
+                        wp_send_json(array(
                             'success' =>  $invoice->get_checkout_payment_url()
-                        ) );
+                        ));
                         wp_die();
                     }
                 }
             }
 
             // Create invoice and send user to checkout
-            if ( !empty( $cart_items ) ) {
+            if (!empty($cart_items)) {
                 $invoice_data = array(
                     'status'        =>  'wpi-pending',
                     'created_via'   =>  'wpi',
@@ -1121,21 +1121,21 @@ 
                     'cart_details'  =>  $cart_items,
                 );
 
-                $invoice = wpinv_insert_invoice( $invoice_data, true );
+                $invoice = wpinv_insert_invoice($invoice_data, true);
 
-                if ( !empty( $invoice ) && isset( $invoice->ID ) ) {
-                    wp_send_json( array(
+                if (!empty($invoice) && isset($invoice->ID)) {
+                    wp_send_json(array(
                         'success' =>  $invoice->get_checkout_payment_url()
-                    ) );
+                    ));
                 } else {
-                    wp_send_json( array(
-                        'error' => __( 'Invoice failed to create', 'invoicing' )
-                    ) );
+                    wp_send_json(array(
+                        'error' => __('Invoice failed to create', 'invoicing')
+                    ));
                 }
             } else {
-                wp_send_json( array(
-                    'error' => __( 'Items not valid.', 'invoicing' )
-                ) );
+                wp_send_json(array(
+                    'error' => __('Items not valid.', 'invoicing')
+                ));
             }
         }
 

includes/class-wpinv-payment-form-elements.php

Spacing +316 added lines, -316 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -13,15 +13,15 @@ 
 
     public function __construct() {
 
-        foreach( $this->get_elements() as $element ) {
+        foreach ($this->get_elements() as $element) {
             $element = $element['type'];
 
-            if ( method_exists( $this, "render_{$element}_template" ) ) {
-                add_action( 'wpinv_payment_form_render_element_template', array( $this, "render_{$element}_template" ), 10, 2 );
+            if (method_exists($this, "render_{$element}_template")) {
+                add_action('wpinv_payment_form_render_element_template', array($this, "render_{$element}_template"), 10, 2);
             }
 
-            if ( method_exists( $this, "edit_{$element}_template" ) ) {
-                add_action( 'wpinv_payment_form_edit_element_template', array( $this, "edit_{$element}_template" ), 10, 2 );
+            if (method_exists($this, "edit_{$element}_template")) {
+                add_action('wpinv_payment_form_edit_element_template', array($this, "edit_{$element}_template"), 10, 2);
             }
 
 
@@ -34,20 +34,20 @@ 
      */
     public function get_elements() {
 
-        if ( ! empty( $this->elements ) ) {
+        if (!empty($this->elements)) {
             return $this->elements;
         }
 
-        $this->elements = wpinv_get_data( 'payment-form-elements' );
+        $this->elements = wpinv_get_data('payment-form-elements');
 
-        $this->elements = apply_filters( 'wpinv_filter_core_payment_form_elements', $this->elements );
+        $this->elements = apply_filters('wpinv_filter_core_payment_form_elements', $this->elements);
         return $this->elements;
     }
 
     /**
      * Returns the restrict markup.
      */
-    public function get_restrict_markup( $field, $field_type ) {
+    public function get_restrict_markup($field, $field_type) {
         $restrict = "$field.type=='$field_type'";
         return "v-if=\"$restrict\"";
     }
@@ -55,9 +55,9 @@ 
     /**
      * Renders the gateway select element template.
      */
-    public function render_gateway_select_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'gateway_select' );
-        $text     = __( 'The gateway select box will appear hear', 'invoicing' );
+    public function render_gateway_select_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'gateway_select');
+        $text     = __('The gateway select box will appear hear', 'invoicing');
         echo "
             <div $restrict class='alert alert-info' role='alert'>
                 <span>$text</span>
@@ -68,9 +68,9 @@ 
     /**
      * Renders the edit gateway select element template.
      */
-    public function edit_gateway_select_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'gateway_select' );
-        $label    = __( 'The gateway select text', 'invoicing' );
+    public function edit_gateway_select_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'gateway_select');
+        $label    = __('The gateway select text', 'invoicing');
         $id       = $field . '.id + "_edit"';
         echo "
             <div $restrict>
@@ -86,10 +86,10 @@ 
     /**
      * Renders the ip address element template.
      */
-    public function render_ip_address_template( $field ) {
-        $restrict   = $this->get_restrict_markup( $field, 'ip_address' );
-        $ip_address = sanitize_text_field( wpinv_get_ip() );
-        $url        = esc_url( getpaid_ip_location_url( $ip_address ) );
+    public function render_ip_address_template($field) {
+        $restrict   = $this->get_restrict_markup($field, 'ip_address');
+        $ip_address = sanitize_text_field(wpinv_get_ip());
+        $url        = esc_url(getpaid_ip_location_url($ip_address));
 
         echo "
             <div $restrict class='getpaid-ip-info'>
@@ -102,9 +102,9 @@ 
     /**
      * Renders the edit ip address element template.
      */
-    public function edit_ip_address_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'ip_address' );
-        $label    = __( 'The IP Address text', 'invoicing' );
+    public function edit_ip_address_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'ip_address');
+        $label    = __('The IP Address text', 'invoicing');
         $id       = $field . '.id + "_edit"';
         echo "
             <div $restrict>
@@ -120,9 +120,9 @@ 
     /**
      * Renders the total payable element template.
      */
-    public function render_total_payable_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'total_payable' );
-        $text     = __( 'The total payable amount will appear here', 'invoicing' );
+    public function render_total_payable_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'total_payable');
+        $text     = __('The total payable amount will appear here', 'invoicing');
         echo "
             <div $restrict class='alert alert-info' role='alert'>
                 <span>$text</span>
@@ -133,9 +133,9 @@ 
     /**
      * Renders the edit total payable element template.
      */
-    public function edit_total_payable_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'total_payable' );
-        $label    = __( 'The total payable text', 'invoicing' );
+    public function edit_total_payable_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'total_payable');
+        $label    = __('The total payable text', 'invoicing');
         $id       = $field . '.id + "_edit"';
         echo "
             <div $restrict>
@@ -151,18 +151,18 @@ 
     /**
      * Renders the title element template.
      */
-    public function render_heading_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'heading' );
+    public function render_heading_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'heading');
         echo "<component :is='$field.level' $restrict v-html='$field.text'></component>";
     }
 
     /**
      * Renders the edit title element template.
      */
-    public function edit_heading_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'heading' );
-        $label    = __( 'Heading', 'invoicing' );
-        $label2   = __( 'Select Heading Level', 'invoicing' );
+    public function edit_heading_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'heading');
+        $label    = __('Heading', 'invoicing');
+        $label2   = __('Select Heading Level', 'invoicing');
         $id       = $field . '.id + "_edit"';
         $id2      = $field . '.id + "_edit2"';
 
@@ -194,8 +194,8 @@ 
     /**
      * Renders a paragraph element template.
      */
-    public function render_paragraph_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'paragraph' );
+    public function render_paragraph_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'paragraph');
         $label    = "$field.text";
         echo "<p $restrict v-html='$label' style='font-size: 16px;'></p>";
     }
@@ -203,9 +203,9 @@ 
     /**
      * Renders the edit paragraph element template.
      */
-    public function edit_paragraph_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'paragraph' );
-        $label    = __( 'Enter your text', 'invoicing' );
+    public function edit_paragraph_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'paragraph');
+        $label    = __('Enter your text', 'invoicing');
         $id       = $field . '.id + "_edit"';
         echo "
             <div $restrict>
@@ -221,8 +221,8 @@ 
     /**
      * Renders the text element template.
      */
-    public function render_text_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'text' );
+    public function render_text_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'text');
         $label    = "$field.label";
         echo "
             <div $restrict class='wpinv-payment-form-field-preview'>
@@ -237,56 +237,56 @@ 
     /**
      * Renders the edit price select element template.
      */
-    public function edit_price_select_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'price_select' );
+    public function edit_price_select_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'price_select');
         
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label6   = __( 'Options', 'invoicing' );
+        $label6   = __('Options', 'invoicing');
         $id6      = $field . '.id + "_edit5"';
         ?>
             <div <?php echo $restrict; ?>>
-                <small class='form-text text-muted mb-2'><?php _e( 'This amount will be added to the total amount for this form', 'invoicing' ); ?></small>
+                <small class='form-text text-muted mb-2'><?php _e('This amount will be added to the total amount for this form', 'invoicing'); ?></small>
                 <div class='form-group'>
                     <label class="d-block">
-                        <span><?php _e( 'Field Label', 'invoicing' ); ?></span>
+                        <span><?php _e('Field Label', 'invoicing'); ?></span>
                         <input v-model='<?php echo $field; ?>.label' class='form-control' />
                     </label>
                 </div>
 
                 <div class='form-group' v-if="<?php echo $field; ?>.select_type=='select'">
                     <label class="d-block">
-                        <span><?php _e( 'Placeholder text', 'invoicing' ); ?></span>
+                        <span><?php _e('Placeholder text', 'invoicing'); ?></span>
                         <input v-model='<?php echo $field; ?>.placeholder' class='form-control' />
                     </label>
                 </div>
 
                 <div class='form-group'>
                     <label class="d-block">
-                        <span><?php _e( 'Select Type', 'invoicing' ); ?></span>
+                        <span><?php _e('Select Type', 'invoicing'); ?></span>
                         <select class='form-control custom-select' v-model='<?php echo $field; ?>.select_type'>
-                            <option value='select'><?php _e( 'Dropdown', 'invoicing' ) ?></option>
-                            <option value='checkboxes'><?php _e( 'Checkboxes', 'invoicing' ) ?></option>
-                            <option value='radios'><?php _e( 'Radio Buttons', 'invoicing' ) ?></option>
-                            <option value='buttons'><?php _e( 'Buttons', 'invoicing' ) ?></option>
-                            <option value='circles'><?php _e( 'Circles', 'invoicing' ) ?></option>
+                            <option value='select'><?php _e('Dropdown', 'invoicing') ?></option>
+                            <option value='checkboxes'><?php _e('Checkboxes', 'invoicing') ?></option>
+                            <option value='radios'><?php _e('Radio Buttons', 'invoicing') ?></option>
+                            <option value='buttons'><?php _e('Buttons', 'invoicing') ?></option>
+                            <option value='circles'><?php _e('Circles', 'invoicing') ?></option>
                         </select>
                     </label>
                 </div>
 
                 <div class='form-group'>
                     <label class="d-block">
-                        <span><?php _e( 'Options', 'invoicing' ); ?></span>
+                        <span><?php _e('Options', 'invoicing'); ?></span>
                         <textarea placeholder='Basic|10,Pro|99,Business|199' v-model='<?php echo $field; ?>.options' class='form-control' rows='3'></textarea>
-                        <small class='form-text text-muted mb-2'><?php _e( 'Use commas to separate options and pipes to separate a label and its price. Do not include a currency symbol in the price.', 'invoicing' ); ?></small>
+                        <small class='form-text text-muted mb-2'><?php _e('Use commas to separate options and pipes to separate a label and its price. Do not include a currency symbol in the price.', 'invoicing'); ?></small>
                     </label>
                 </div>
 
                 <div class='form-group'>
                     <label class="d-block">
-                        <span><?php _e( 'Help Text', 'invoicing' ); ?></span>
-                        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='<?php echo $field; ?>.description' class='form-control' rows='3'></textarea>
+                        <span><?php _e('Help Text', 'invoicing'); ?></span>
+                        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='<?php echo $field; ?>.description' class='form-control' rows='3'></textarea>
                     </label>
                 </div>
             </div>
@@ -297,8 +297,8 @@ 
     /**
      * Renders the price select element template.
      */
-    public function render_price_select_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'price_select' );
+    public function render_price_select_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'price_select');
         ?>
             <div <?php echo $restrict; ?> class='wpinv-payment-form-field-preview'>
                 <div class='wpinv-payment-form-field-preview-overlay'></div>
@@ -306,24 +306,24 @@ 
                 <label>{{<?php echo $field; ?>.label}}</label>
 
                 <!-- Buttons -->
-                <div v-if='<?php echo esc_attr( $field ); ?>.select_type=="buttons"' class="getpaid-price-buttons">
-                    <span v-for="(option, index) in <?php echo esc_attr( $field ); ?>.options.split(',')" :key="index">
-                        <input type="radio" :id="<?php echo esc_attr( $field ); ?>.id + index" :checked="index==0" />
-                        <label :for="<?php echo esc_attr( $field ); ?>.id + index" class="rounded">{{option | optionize}}</label>
+                <div v-if='<?php echo esc_attr($field); ?>.select_type=="buttons"' class="getpaid-price-buttons">
+                    <span v-for="(option, index) in <?php echo esc_attr($field); ?>.options.split(',')" :key="index">
+                        <input type="radio" :id="<?php echo esc_attr($field); ?>.id + index" :checked="index==0" />
+                        <label :for="<?php echo esc_attr($field); ?>.id + index" class="rounded">{{option | optionize}}</label>
                     </span>
                 </div>
 
                 <!-- Circles -->
-                <div v-if='<?php echo esc_attr( $field ); ?>.select_type=="circles"' class="getpaid-price-buttons getpaid-price-circles">
-                    <span v-for="(option, index) in <?php echo esc_attr( $field ); ?>.options.split(',')" :key="index">
-                        <input type="radio" :id="<?php echo esc_attr( $field ); ?>.id + index" :checked="index==0" />
-                        <label :for="<?php echo esc_attr( $field ); ?>.id + index"><span>{{option | optionize}}</span></label>
+                <div v-if='<?php echo esc_attr($field); ?>.select_type=="circles"' class="getpaid-price-buttons getpaid-price-circles">
+                    <span v-for="(option, index) in <?php echo esc_attr($field); ?>.options.split(',')" :key="index">
+                        <input type="radio" :id="<?php echo esc_attr($field); ?>.id + index" :checked="index==0" />
+                        <label :for="<?php echo esc_attr($field); ?>.id + index"><span>{{option | optionize}}</span></label>
                     </span>
                 </div>
 
                 <!-- Radios -->
-                <div v-if='<?php echo esc_attr( $field ); ?>.select_type=="radios"'>
-                    <div v-for="(option, index) in <?php echo esc_attr( $field ); ?>.options.split(',')" :key="index">
+                <div v-if='<?php echo esc_attr($field); ?>.select_type=="radios"'>
+                    <div v-for="(option, index) in <?php echo esc_attr($field); ?>.options.split(',')" :key="index">
                         <label>
                             <input type="radio" :checked="index==0" />
                             <span>{{option | optionize}}</span>
@@ -332,8 +332,8 @@ 
                 </div>
 
                 <!-- Checkboxes -->
-                <div v-if='<?php echo esc_attr( $field ); ?>.select_type=="checkboxes"'>
-                    <div v-for="(option, index) in <?php echo esc_attr( $field ); ?>.options.split(',')" :key="index">
+                <div v-if='<?php echo esc_attr($field); ?>.select_type=="checkboxes"'>
+                    <div v-for="(option, index) in <?php echo esc_attr($field); ?>.options.split(',')" :key="index">
                         <label>
                             <input type="checkbox" :checked="index==0" />
                             <span>{{option | optionize}}</span>
@@ -342,15 +342,15 @@ 
                 </div>
 
                 <!-- Select -->
-                <select v-if='<?php echo esc_attr( $field ); ?>.select_type=="select"' class='form-control custom-select'>
-                    <option v-if="<?php echo esc_attr( $field ); ?>.placeholder" selected="selected">
-                        {{<?php echo esc_attr( $field ); ?>.placeholder}}
+                <select v-if='<?php echo esc_attr($field); ?>.select_type=="select"' class='form-control custom-select'>
+                    <option v-if="<?php echo esc_attr($field); ?>.placeholder" selected="selected">
+                        {{<?php echo esc_attr($field); ?>.placeholder}}
                     </option>
-                    <option v-for="(option, index) in <?php echo esc_attr( $field ); ?>.options.split(',')" :key="index">
+                    <option v-for="(option, index) in <?php echo esc_attr($field); ?>.options.split(',')" :key="index">
                         {{option | optionize}}
                     </option>
                 </select>
-                <small v-if='<?php echo esc_attr( $field ); ?>.description' class='form-text text-muted' v-html='<?php echo esc_attr( $field ); ?>.description'></small>
+                <small v-if='<?php echo esc_attr($field); ?>.description' class='form-text text-muted' v-html='<?php echo esc_attr($field); ?>.description'></small>
             </div>
 
         <?php
@@ -359,17 +359,17 @@ 
     /**
      * Renders the edit price input element template.
      */
-    public function edit_price_input_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'price_input' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_price_input_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'price_input');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'The amount that users add to this field will be added to the total amount', 'invoicing' );
-        $label6   = __( 'Default Amount', 'invoicing' );
+        $label5   = __('The amount that users add to this field will be added to the total amount', 'invoicing');
+        $label6   = __('Default Amount', 'invoicing');
         $id6      = $field . '.id + "_edit5"';
         echo "
             <div $restrict>
@@ -397,16 +397,16 @@ 
     /**
      * Renders the edit text element template.
      */
-    public function edit_text_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'text' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_text_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'text');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -434,8 +434,8 @@ 
     /**
      * Renders the textarea element template.
      */
-    public function render_textarea_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'textarea' );
+    public function render_textarea_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'textarea');
         $label    = "$field.label";
         echo "
             <div $restrict class='wpinv-payment-form-field-preview'>
@@ -450,16 +450,16 @@ 
     /**
      * Renders the edit textarea element template.
      */
-    public function edit_textarea_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'textarea' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_textarea_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'textarea');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -487,8 +487,8 @@ 
     /**
      * Renders the select element template.
      */
-    public function render_select_template( $field ) {
-        $restrict    = $this->get_restrict_markup( $field, 'select' );
+    public function render_select_template($field) {
+        $restrict    = $this->get_restrict_markup($field, 'select');
         $label       = "$field.label";
         $placeholder = "$field.placeholder";
         $id          = $field . '.id';
@@ -508,18 +508,18 @@ 
     /**
      * Renders the edit select element template.
      */
-    public function edit_select_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'select' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_select_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'select');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
-        $label6   = __( 'Available Options', 'invoicing' );
+        $label6   = __('Available Options', 'invoicing');
         echo "
             <div $restrict>
                 <div class='form-group'>
@@ -557,8 +557,8 @@ 
     /**
      * Renders the checkbox element template.
      */
-    public function render_checkbox_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'checkbox' );
+    public function render_checkbox_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'checkbox');
         echo "
             <div class='form-check' $restrict>
                 <div class='wpinv-payment-form-field-preview-overlay'></div>
@@ -572,14 +572,14 @@ 
     /**
      * Renders the edit checkbox element template.
      */
-    public function edit_checkbox_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'checkbox' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_checkbox_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'checkbox');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Help text', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label2   = __('Help text', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this field', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label4   = __( 'Is this field required?', 'invoicing' );
+        $label4   = __('Is this field required?', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
         echo "
             <div $restrict>
@@ -603,8 +603,8 @@ 
     /**
      * Renders the radio element template.
      */
-    public function render_radio_template( $field ) {
-        $restrict    = $this->get_restrict_markup( $field, 'radio' );
+    public function render_radio_template($field) {
+        $restrict    = $this->get_restrict_markup($field, 'radio');
         $label       = "$field.label";
         $id          = $field . '.id';
         echo "
@@ -623,16 +623,16 @@ 
     /**
      * Renders the edit radio element template.
      */
-    public function edit_radio_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'radio' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_radio_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'radio');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Help text', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label2   = __('Help text', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this field', 'invoicing');
         $id2      = $field . '.id + "_edit3"';
-        $label4   = __( 'Is this field required?', 'invoicing' );
+        $label4   = __('Is this field required?', 'invoicing');
         $id3      = $field . '.id + "_edit4"';
-        $label5   = __( 'Available Options', 'invoicing' );
+        $label5   = __('Available Options', 'invoicing');
         echo "
             <div $restrict>
                 <div class='form-group'>
@@ -666,8 +666,8 @@ 
     /**
      * Renders the address element template.
      */
-    public function render_address_template( $field ) {
-        $restrict    = $this->get_restrict_markup( $field, 'address' );
+    public function render_address_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'address');
 
         echo "
             <div class='wpinv-address-wrapper' $restrict>
@@ -689,13 +689,13 @@ 
     /**
      * Renders the edit address element template.
      */
-    public function edit_address_template( $field ) {
-        $restrict  = $this->get_restrict_markup( $field, 'address' );
-        $label     = __( 'Field Label', 'invoicing' );
-        $label2    = __( 'Placeholder', 'invoicing' );
-        $label3    = __( 'Description', 'invoicing' );
-        $label4    = __( 'Is required', 'invoicing' );
-        $label5    = __( 'Is visible', 'invoicing' );
+    public function edit_address_template($field) {
+        $restrict  = $this->get_restrict_markup($field, 'address');
+        $label     = __('Field Label', 'invoicing');
+        $label2    = __('Placeholder', 'invoicing');
+        $label3    = __('Description', 'invoicing');
+        $label4    = __('Is required', 'invoicing');
+        $label5    = __('Is visible', 'invoicing');
         $id        = $field . '.id + "_edit_label"';
         $id2       = $field . '.id + "_edit_placeholder"';
         $id3       = $field . '.id + "_edit_description"';
@@ -763,8 +763,8 @@ 
     /**
      * Renders the email element template.
      */
-    public function render_email_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'email' );
+    public function render_email_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'email');
         $label    = "$field.label";
         echo "
             <div $restrict class='wpinv-payment-form-field-preview'>
@@ -779,8 +779,8 @@ 
     /**
      * Renders the billing_email element template.
      */
-    public function render_billing_email_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'billing_email' );
+    public function render_billing_email_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'billing_email');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -794,16 +794,16 @@ 
     /**
      * Renders the edit email element template.
      */
-    public function edit_email_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'email' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_email_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'email');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -831,16 +831,16 @@ 
     /**
      * Renders the edit billing_email element template.
      */
-    public function edit_billing_email_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'billing_email' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_billing_email_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'billing_email');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -864,8 +864,8 @@ 
     /**
      * Renders the website element template.
      */
-    public function render_website_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'website' );
+    public function render_website_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'website');
         $label    = "$field.label";
         echo "
             <div $restrict class='wpinv-payment-form-field-preview'>
@@ -880,16 +880,16 @@ 
     /**
      * Renders the edit website element template.
      */
-    public function edit_website_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'website' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_website_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'website');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -917,8 +917,8 @@ 
     /**
      * Renders the date element template.
      */
-    public function render_date_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'date' );
+    public function render_date_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'date');
         $label    = "$field.label";
         echo "
             <div $restrict class='wpinv-payment-form-field-preview'>
@@ -933,14 +933,14 @@ 
     /**
      * Renders the edit date element template.
      */
-    public function edit_date_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'date' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_date_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'date');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -964,8 +964,8 @@ 
     /**
      * Renders the time element template.
      */
-    public function render_time_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'time' );
+    public function render_time_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'time');
         $label    = "$field.label";
         echo "
             <div $restrict class='wpinv-payment-form-field-preview'>
@@ -980,14 +980,14 @@ 
     /**
      * Renders the edit time element template.
      */
-    public function edit_time_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'time' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_time_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'time');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -1011,8 +1011,8 @@ 
     /**
      * Renders the number element template.
      */
-    public function render_number_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'number' );
+    public function render_number_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'number');
         $label    = "$field.label";
         echo "
             <div $restrict class='wpinv-payment-form-field-preview'>
@@ -1027,16 +1027,16 @@ 
     /**
      * Renders the edit number element template.
      */
-    public function edit_number_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'number' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_number_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'number');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -1064,16 +1064,16 @@ 
     /**
      * Renders the separator element template.
      */
-    public function render_separator_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'separator' );
+    public function render_separator_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'separator');
         echo "<hr class='featurette-divider' $restrict>";
     }
 
     /**
      * Renders the pay button element template.
      */
-    public function render_pay_button_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'pay_button' );
+    public function render_pay_button_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'pay_button');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -1086,14 +1086,14 @@ 
     /**
      * Renders the pay button element template.
      */
-    public function edit_pay_button_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'pay_button' );
-        $label    = __( 'Button Text', 'invoicing' );
+    public function edit_pay_button_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'pay_button');
+        $label    = __('Button Text', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Help text', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label2   = __('Help text', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this field', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label4   = esc_attr__( 'Button Type', 'invoicing' );
+        $label4   = esc_attr__('Button Type', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
 
         echo "
@@ -1110,15 +1110,15 @@ 
                     <label :for='$id3'>$label4</label>
 
                     <select class='form-control custom-select' :id='$id3' v-model='$field.class'>
-                        <option value='btn-primary'>"   . __( 'Primary', 'invoicing' ) ."</option>
-                        <option value='btn-secondary'>" . __( 'Secondary', 'invoicing' ) ."</option>
-                        <option value='btn-success'>"   . __( 'Success', 'invoicing' ) ."</option>
-                        <option value='btn-danger'>"    . __( 'Danger', 'invoicing' ) ."</option>
-                        <option value='btn-warning'>"   . __( 'Warning', 'invoicing' ) ."</option>
-                        <option value='btn-info'>"      . __( 'Info', 'invoicing' ) ."</option>
-                        <option value='btn-light'>"     . __( 'Light', 'invoicing' ) ."</option>
-                        <option value='btn-dark'>"      . __( 'Dark', 'invoicing' ) ."</option>
-                        <option value='btn-link'>"      . __( 'Link', 'invoicing' ) ."</option>
+                        <option value='btn-primary'>" . __('Primary', 'invoicing') . "</option>
+                        <option value='btn-secondary'>" . __('Secondary', 'invoicing') . "</option>
+                        <option value='btn-success'>"   . __('Success', 'invoicing') . "</option>
+                        <option value='btn-danger'>"    . __('Danger', 'invoicing') . "</option>
+                        <option value='btn-warning'>"   . __('Warning', 'invoicing') . "</option>
+                        <option value='btn-info'>"      . __('Info', 'invoicing') . "</option>
+                        <option value='btn-light'>"     . __('Light', 'invoicing') . "</option>
+                        <option value='btn-dark'>"      . __('Dark', 'invoicing') . "</option>
+                        <option value='btn-link'>"      . __('Link', 'invoicing') . "</option>
                     </select>
                 </div>
             </div>
@@ -1129,8 +1129,8 @@ 
     /**
      * Renders the alert element template.
      */
-    public function render_alert_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'alert' );
+    public function render_alert_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'alert');
         $text     = "$field.text";
         echo "
             <div $restrict class='alert' :class='$field.class' role='alert'>
@@ -1145,14 +1145,14 @@ 
     /**
      * Renders the alert element template.
      */
-    public function edit_alert_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'alert' );
-        $label    = __( 'Alert Text', 'invoicing' );
-        $label2   = esc_attr__( 'Enter your alert text here', 'invoicing' );
+    public function edit_alert_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'alert');
+        $label    = __('Alert Text', 'invoicing');
+        $label2   = esc_attr__('Enter your alert text here', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label3   = __( 'Is Dismissible?', 'invoicing' );
+        $label3   = __('Is Dismissible?', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label4   = esc_attr__( 'Alert Type', 'invoicing' );
+        $label4   = esc_attr__('Alert Type', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
         echo "
             <div $restrict>
@@ -1168,14 +1168,14 @@ 
                     <label :for='$id3'>$label4</label>
 
                     <select class='form-control custom-select' :id='$id3' v-model='$field.class'>
-                        <option value='alert-primary'>"   . __( 'Primary', 'invoicing' ) ."</option>
-                        <option value='alert-secondary'>" . __( 'Secondary', 'invoicing' ) ."</option>
-                        <option value='alert-success'>"   . __( 'Success', 'invoicing' ) ."</option>
-                        <option value='alert-danger'>"    . __( 'Danger', 'invoicing' ) ."</option>
-                        <option value='alert-warning'>"   . __( 'Warning', 'invoicing' ) ."</option>
-                        <option value='alert-info'>"      . __( 'Info', 'invoicing' ) ."</option>
-                        <option value='alert-light'>"     . __( 'Light', 'invoicing' ) ."</option>
-                        <option value='alert-dark'>"      . __( 'Dark', 'invoicing' ) ."</option>
+                        <option value='alert-primary'>" . __('Primary', 'invoicing') . "</option>
+                        <option value='alert-secondary'>" . __('Secondary', 'invoicing') . "</option>
+                        <option value='alert-success'>"   . __('Success', 'invoicing') . "</option>
+                        <option value='alert-danger'>"    . __('Danger', 'invoicing') . "</option>
+                        <option value='alert-warning'>"   . __('Warning', 'invoicing') . "</option>
+                        <option value='alert-info'>"      . __('Info', 'invoicing') . "</option>
+                        <option value='alert-light'>"     . __('Light', 'invoicing') . "</option>
+                        <option value='alert-dark'>"      . __('Dark', 'invoicing') . "</option>
                     </select>
                 </div>
             </div>
@@ -1186,8 +1186,8 @@ 
     /**
      * Renders the discount element template.
      */
-    public function render_discount_template( $field ) {
-        $restrict  = $this->get_restrict_markup( $field, 'discount' );
+    public function render_discount_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'discount');
         ?>
 
             <div <?php echo $restrict; ?> class="discount_field border rounded p-3 wpinv-payment-form-field-preview">
@@ -1205,12 +1205,12 @@ 
     /**
      * Renders the discount element template.
      */
-    public function edit_discount_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'discount' );
-        $label    = __( 'Discount Input Placeholder', 'invoicing' );
-        $label2   = __( 'Help Text', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this field', 'invoicing' );
-        $label4   = __( 'Button Text', 'invoicing' );
+    public function edit_discount_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'discount');
+        $label    = __('Discount Input Placeholder', 'invoicing');
+        $label2   = __('Help Text', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this field', 'invoicing');
+        $label4   = __('Button Text', 'invoicing');
         $id       = $field . '.id + "_edit"';
         $id2      = $field . '.id + "_edit2"';
         $id3      = $field . '.id + "_edit3"';
@@ -1239,17 +1239,17 @@ 
     /**
      * Renders the items element template.
      */
-    public function render_items_template( $field ) {
-        $restrict  = $this->get_restrict_markup( $field, 'items' );
+    public function render_items_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'items');
         ?>
 
         <div <?php echo $restrict; ?> class='item_totals'>
             <div v-if='!is_default'>
-                <div v-if='! canCheckoutSeveralSubscriptions(<?php echo $field; ?>)' class='alert alert-info' role='alert'><?php _e( 'Item totals will appear here. Click to set items.', 'invoicing' ) ?></div>
-                <div v-if='canCheckoutSeveralSubscriptions(<?php echo $field; ?>)' class='alert alert-danger' role='alert'><?php _e( 'Your form allows customers to buy several recurring items. This is not supported and might lead to unexpected behaviour.', 'invoicing' ); ?></div>
+                <div v-if='! canCheckoutSeveralSubscriptions(<?php echo $field; ?>)' class='alert alert-info' role='alert'><?php _e('Item totals will appear here. Click to set items.', 'invoicing') ?></div>
+                <div v-if='canCheckoutSeveralSubscriptions(<?php echo $field; ?>)' class='alert alert-danger' role='alert'><?php _e('Your form allows customers to buy several recurring items. This is not supported and might lead to unexpected behaviour.', 'invoicing'); ?></div>
             </div>
             <div v-if='is_default'>
-                <div class='alert alert-info' role='alert'><?php _e( 'Item totals will appear here.', 'invoicing' ) ?></div>
+                <div class='alert alert-info' role='alert'><?php _e('Item totals will appear here.', 'invoicing') ?></div>
             </div>
         </div>
 
@@ -1259,25 +1259,25 @@ 
     /**
      * Renders the items element template.
      */
-    public function edit_items_template( $field ) {
+    public function edit_items_template($field) {
         global $wpinv_euvat, $post;
 
-        $restrict = $this->get_restrict_markup( $field, 'items' );
+        $restrict = $this->get_restrict_markup($field, 'items');
         $id2      = $field . '.id + "_edit2"';
         $id3      = $field . '.id + "_edit3"';
 
         // Item types.
-        $item_types = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
+        $item_types = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
 
         ?>
         <div <?php echo $restrict; ?>>
             <div v-if="!is_default">
                 <label class='form-group'>
                     <input v-model='<?php echo $field; ?>.hide_cart' type='checkbox' />
-                    <span class='form-check-label'><?php _e( 'Hide cart details', 'invoicing' ); ?></span>
+                    <span class='form-check-label'><?php _e('Hide cart details', 'invoicing'); ?></span>
                 </label>
 
-                <div class="mb-1"><?php _e( 'Form Items', 'invoicing' ); ?></div>
+                <div class="mb-1"><?php _e('Form Items', 'invoicing'); ?></div>
                 <draggable v-model='form_items' group='selectable_form_items'>
                     <div class='wpinv-available-items-editor' v-for='(item, index) in form_items' :class="'item_' + item.id" :key="item.id">
 
@@ -1295,35 +1295,35 @@ 
 
                                 <div class="form-group" v-if="! item.new">
                                     <span class='form-text'>
-                                        <a target="_blank" :href="'<?php echo esc_url( admin_url( '/post.php?action=edit&post' ) ) ?>=' + item.id">
-                                            <?php _e( 'Edit the item name, price and other details', 'invoicing' ); ?>
+                                        <a target="_blank" :href="'<?php echo esc_url(admin_url('/post.php?action=edit&post')) ?>=' + item.id">
+                                            <?php _e('Edit the item name, price and other details', 'invoicing'); ?>
                                         </a>
                                     </span>
                                 </div>
 
                                 <div class='form-group' v-if="item.new">
                                     <label class='mb-0 w-100'>
-                                        <span><?php _e( 'Item Name', 'invoicing' ); ?></span>
+                                        <span><?php _e('Item Name', 'invoicing'); ?></span>
                                         <input v-model='item.title' type='text' class='w-100'/>
                                     </label>
                                 </div>
 
                                 <div class='form-group'  v-if="item.new">
                                     <label class='mb-0 w-100'>
-                                        <span v-if='!item.custom_price'><?php _e( 'Item Price', 'invoicing' ); ?></span>
-                                        <span v-if='item.custom_price'><?php _e( 'Recommended Price', 'invoicing' ); ?></span>
+                                        <span v-if='!item.custom_price'><?php _e('Item Price', 'invoicing'); ?></span>
+                                        <span v-if='item.custom_price'><?php _e('Recommended Price', 'invoicing'); ?></span>
                                         <input v-model='item.price' type='text' class='w-100'/>
                                     </label>
                                 </div>
 
                                 <div class='form-group' v-if='item.new'>
                                     <label :for="'edit_item_type' + item.id" class='mb-0 w-100'>
-                                        <span><?php _e( 'Item Type', 'invoicing' ); ?></span>
+                                        <span><?php _e('Item Type', 'invoicing'); ?></span>
                                         <select class='w-100' v-model='item.type'>
                                             <?php
-                                                foreach ( $item_types as $type => $_label ) {
-                                                    $type  = esc_attr( $type );
-                                                    $_label = esc_html( $_label );
+                                                foreach ($item_types as $type => $_label) {
+                                                    $type = esc_attr($type);
+                                                    $_label = esc_html($_label);
                                                     echo "<option value='$type'>$_label</type>";
                                                 }
                                             ?>
@@ -1332,71 +1332,71 @@ 
                                 </div>
 
                                 <div v-if='item.new'>
-                                    <?php if ( $wpinv_euvat->allow_vat_rules() ) : ?>
+                                    <?php if ($wpinv_euvat->allow_vat_rules()) : ?>
                                         <div class='form-group'>
-                                            <label class='w-100 mb-0'><?php _e( 'VAT Rule', 'invoicing' ) ; ?>
+                                            <label class='w-100 mb-0'><?php _e('VAT Rule', 'invoicing'); ?>
                                                 <select class='w-100' v-model='item.rule'>
                                                     <?php
-                                                        foreach ( $wpinv_euvat->get_rules() as $type => $_label ) {
-                                                            $type  = esc_attr( $type );
-                                                            $_label = esc_html( $_label );
+                                                        foreach ($wpinv_euvat->get_rules() as $type => $_label) {
+                                                            $type = esc_attr($type);
+                                                            $_label = esc_html($_label);
                                                             echo "<option value='$type'>$_label</type>";
                                                         }
                                                     ?>
                                                 </select>
                                             </label>
                                         </div>
-                                    <?php endif;?>
+                                    <?php endif; ?>
 
-                                    <?php if ( $wpinv_euvat->allow_vat_classes() ) : ?>
+                                    <?php if ($wpinv_euvat->allow_vat_classes()) : ?>
                                         <div class='form-group'>
-                                            <label class='w-100 mb-0'><?php _e( 'VAT class', 'invoicing' ) ; ?>
+                                            <label class='w-100 mb-0'><?php _e('VAT class', 'invoicing'); ?>
                                                 <select class='w-100' v-model='item.class'>
                                                     <?php
-                                                        foreach ( $wpinv_euvat->get_all_classes() as $type => $_label ) {
-                                                            $type  = esc_attr( $type );
-                                                            $_label = esc_html( $_label );
+                                                        foreach ($wpinv_euvat->get_all_classes() as $type => $_label) {
+                                                            $type = esc_attr($type);
+                                                            $_label = esc_html($_label);
                                                             echo "<option value='$type'>$_label</type>"; 
                                                         }
                                                     ?>
                                                 </select>
                                             </label>
                                         </div>
-                                    <?php endif;?>
+                                    <?php endif; ?>
                                                         
                                 </div>
 
                                 <label v-if='item.new' class='form-group'>
                                     <input v-model='item.custom_price' type='checkbox' />
-                                    <span class='form-check-label'><?php _e( 'Allow users to pay what they want', 'invoicing' ); ?></span>
+                                    <span class='form-check-label'><?php _e('Allow users to pay what they want', 'invoicing'); ?></span>
                                 </label>
 
                                 <div class='form-group' v-if='item.new && item.custom_price'>
                                     <label class='mb-0 w-100'>
-                                        <span><?php _e( 'Minimum Price', 'invoicing' ); ?></span>
+                                        <span><?php _e('Minimum Price', 'invoicing'); ?></span>
                                         <input placeholder='0.00' v-model='item.minimum_price' class='w-100' />
-                                        <small class='form-text text-muted'><?php _e( 'Enter the minimum price that a user can pay', 'invoicing' ); ?></small>
+                                        <small class='form-text text-muted'><?php _e('Enter the minimum price that a user can pay', 'invoicing'); ?></small>
                                     </label>
                                 </div>
 
                                 <label class='form-group'>
                                     <input v-model='item.allow_quantities' type='checkbox' />
-                                    <span><?php _e( 'Allow users to buy several quantities', 'invoicing' ); ?></span>
+                                    <span><?php _e('Allow users to buy several quantities', 'invoicing'); ?></span>
                                 </label>
 
                                 <label class='form-group'>
                                     <input v-model='item.required' type='checkbox' />
-                                    <span><?php _e( 'This item is required', 'invoicing' ); ?></span>
+                                    <span><?php _e('This item is required', 'invoicing'); ?></span>
                                 </label>
 
                                 <div class='form-group'>
                                     <label class="mb-0 w-100">
-                                        <span><?php _e( 'Item Description', 'invoicing' ); ?></span>
+                                        <span><?php _e('Item Description', 'invoicing'); ?></span>
                                         <textarea v-model='item.description' class='w-100'></textarea>
                                     </label>
                                 </div>
 
-                                    <button type='button' class='button button-link button-link-delete' @click.prevent='removeItem(item)'><?php _e( 'Delete Item', 'invoicing' ); ?></button>
+                                    <button type='button' class='button button-link button-link-delete' @click.prevent='removeItem(item)'><?php _e('Delete Item', 'invoicing'); ?></button>
 
                                 </div>
                             </div>
@@ -1404,36 +1404,36 @@ 
                         </div>
                 </draggable>
 
-                <small v-if='! form_items.length' class='form-text text-danger'><?php _e( 'You have not set up any items. Please select an item below or create a new item.', 'invoicing' ); ?></small>
+                <small v-if='! form_items.length' class='form-text text-danger'><?php _e('You have not set up any items. Please select an item below or create a new item.', 'invoicing'); ?></small>
 
                 <div class='form-group mt-2'>
 
                     <select class='w-100' style="padding: 6px 24px 6px 8px; border-color: #e0e0e0;" v-model='selected_item' @change='addSelectedItem'>
-                        <option value=''><?php _e( 'Select an item to add...', 'invoicing' ) ?></option>
+                        <option value=''><?php _e('Select an item to add...', 'invoicing') ?></option>
                         <option v-for='(item, index) in all_items' :value='index'>{{item.title}}</option>
                     </select>
 
                 </div>
 
                 <div class='form-group'>
-                    <button @click.prevent='addNewItem' class="button button-link"><?php _e( 'Or create a new item.', 'invoicing' ) ?></button>
+                    <button @click.prevent='addNewItem' class="button button-link"><?php _e('Or create a new item.', 'invoicing') ?></button>
                 </div>
 
                 <div class='form-group mt-5'>
-                    <label :for='<?php echo $id2; ?>'><?php _e( 'Let customers...', 'invoicing' ) ?></label>
+                    <label :for='<?php echo $id2; ?>'><?php _e('Let customers...', 'invoicing') ?></label>
 
                     <select class='w-100' style="padding: 6px 24px 6px 8px; border-color: #e0e0e0;" :id='<?php echo $id2; ?>' v-model='<?php echo $field; ?>.items_type'>
-                        <option value='total' :disabled='canCheckoutSeveralSubscriptions(<?php echo $field; ?>)'><?php _e( 'Buy all items on the list', 'invoicing' ); ?></option>
-                        <option value='radio'><?php _e( 'Select a single item from the list', 'invoicing' ); ?></option>
-                        <option value='checkbox' :disabled='canCheckoutSeveralSubscriptions(<?php echo $field; ?>)'><?php _e( 'Select one or more items on the list', 'invoicing' ) ;?></option>
-                        <option value='select'><?php _e( 'Select a single item from a dropdown', 'invoicing' ); ?></option>
+                        <option value='total' :disabled='canCheckoutSeveralSubscriptions(<?php echo $field; ?>)'><?php _e('Buy all items on the list', 'invoicing'); ?></option>
+                        <option value='radio'><?php _e('Select a single item from the list', 'invoicing'); ?></option>
+                        <option value='checkbox' :disabled='canCheckoutSeveralSubscriptions(<?php echo $field; ?>)'><?php _e('Select one or more items on the list', 'invoicing'); ?></option>
+                        <option value='select'><?php _e('Select a single item from a dropdown', 'invoicing'); ?></option>
                     </select>
 
                 </div>
             </div>
             <div class='form-group'>
-                <label :for='<?php echo $id3; ?>'><?php _e( 'Help Text', 'invoicing' ); ?></label>
-                <textarea placeholder='<?php esc_attr_e( 'Add some help text for this element', 'invoicing' ); ?>' :id='<?php echo $id3; ?>' v-model='<?php echo $field; ?>.description' class='form-control' rows='3'></textarea>
+                <label :for='<?php echo $id3; ?>'><?php _e('Help Text', 'invoicing'); ?></label>
+                <textarea placeholder='<?php esc_attr_e('Add some help text for this element', 'invoicing'); ?>' :id='<?php echo $id3; ?>' v-model='<?php echo $field; ?>.description' class='form-control' rows='3'></textarea>
             </div>
 
         </div>
@@ -1452,7 +1452,7 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'meta_query'     => array(
                 array(
                     'key'       => '_wpinv_type',
@@ -1462,15 +1462,15 @@ 
             )
         );
 
-        $items = get_posts( apply_filters( 'getpaid_payment_form_item_dropdown_query_args', $item_args ) );
+        $items = get_posts(apply_filters('getpaid_payment_form_item_dropdown_query_args', $item_args));
 
-        if ( empty( $items ) ) {
+        if (empty($items)) {
             return array();
         }
 
-        $options    = array();
-        foreach ( $items as $item ) {
-            $item      = new GetPaid_Form_Item( $item );
+        $options = array();
+        foreach ($items as $item) {
+            $item      = new GetPaid_Form_Item($item);
             $options[] = $item->prepare_data_for_use();
         }
         return $options;
@@ -1480,39 +1480,39 @@ 
     /**
      * Returns an array of items for the currently being edited form.
      */
-    public function get_form_items( $id = false ) {
-        $form = new GetPaid_Payment_Form( $id );
+    public function get_form_items($id = false) {
+        $form = new GetPaid_Payment_Form($id);
 
         // Is this a default form?
-        if ( $form->is_default() ) {
+        if ($form->is_default()) {
             return array();
         }
 
-        return $form->get_items( 'view', 'arrays' );
+        return $form->get_items('view', 'arrays');
     }
 
     /**
      * Converts form items for use.
      */
-    public function convert_checkout_items( $items, $invoice ) {
+    public function convert_checkout_items($items, $invoice) {
 
         $converted = array();
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
 
             $item_id = $item['id'];
-            $_item   = new WPInv_Item( $item_id );
+            $_item   = new WPInv_Item($item_id);
 
-            if( ! $_item ) {
+            if (!$_item) {
                 continue;
             }
 
             $converted[] = array(
-                'title'            => esc_html( wpinv_get_cart_item_name( $item ) ) . wpinv_get_item_suffix( $_item ),
+                'title'            => esc_html(wpinv_get_cart_item_name($item)) . wpinv_get_item_suffix($_item),
                 'id'               => $item['id'],
                 'price'            => $item['subtotal'],
                 'custom_price'     => $_item->get_is_dynamic_pricing(),
                 'recurring'        => $_item->is_recurring(),
-                'description'      => apply_filters( 'wpinv_checkout_cart_line_item_summary', '', $item, $_item, $invoice ),
+                'description'      => apply_filters('wpinv_checkout_cart_line_item_summary', '', $item, $_item, $invoice),
                 'minimum_price'    => $_item->get_minimum_price(),
                 'allow_quantities' => false,
                 'quantity'         => $item['quantity'],
@@ -1526,27 +1526,27 @@ 
     /**
      * Converts an array of id => quantity for use.
      */
-    public function convert_normal_items( $items ) {
+    public function convert_normal_items($items) {
 
         $converted = array();
-        foreach ( $items as $item_id => $quantity ) {
+        foreach ($items as $item_id => $quantity) {
 
-            $item   = new WPInv_Item( $item_id );
+            $item = new WPInv_Item($item_id);
 
-            if( ! $item ) {
+            if (!$item) {
                 continue;
             }
 
             $converted[] = array(
-                'title'            => esc_html( $item->get_name() ) . wpinv_get_item_suffix( $item ),
+                'title'            => esc_html($item->get_name()) . wpinv_get_item_suffix($item),
                 'id'               => $item_id,
                 'price'            => $item->get_price(),
                 'custom_price'     => $item->get_is_dynamic_pricing(),
                 'recurring'        => $item->is_recurring(),
                 'description'      => $item->get_summary(),
                 'minimum_price'    => $item->get_minimum_price(),
-                'allow_quantities' => ! empty( $quantity ),
-                'quantity'         => empty( $quantity ) ? 1 : $quantity,
+                'allow_quantities' => !empty($quantity),
+                'quantity'         => empty($quantity) ? 1 : $quantity,
                 'required'         => true,
             );
 
@@ -1559,28 +1559,28 @@ 
     /**
      * Returns an array of elements for the currently being edited form.
      */
-    public function get_form_elements( $id = false ) {
+    public function get_form_elements($id = false) {
 
-        if ( empty( $id ) ) {
-            return wpinv_get_data( 'sample-payment-form' );
+        if (empty($id)) {
+            return wpinv_get_data('sample-payment-form');
         }
         
-        $form_elements = get_post_meta( $id, 'wpinv_form_elements', true );
+        $form_elements = get_post_meta($id, 'wpinv_form_elements', true);
 
-        if ( is_array( $form_elements ) ) {
+        if (is_array($form_elements)) {
             return $form_elements;
         }
 
-        return wpinv_get_data( 'sample-payment-form' );
+        return wpinv_get_data('sample-payment-form');
     }
 
     /**
      * Sends a redrect response to payment details.
      *
      */
-    public function send_redirect_response( $url ) {
-        $url = urlencode( $url );
-        wp_send_json_success( $url );
+    public function send_redirect_response($url) {
+        $url = urlencode($url);
+        wp_send_json_success($url);
     }
 
     /**
@@ -1591,12 +1591,12 @@ 
 
         $errors = wpinv_get_errors();
 
-        if ( ! empty( $errors ) ) {
+        if (!empty($errors)) {
             wpinv_print_errors();
             exit;
         }
 
-        wp_send_json_error( __( 'An error occured while processing your payment. Please try again.', 'invoicing' ) );
+        wp_send_json_error(__('An error occured while processing your payment. Please try again.', 'invoicing'));
         exit;
 
     }

includes/data/payment-form-elements.php

Spacing +70 added lines, -70 removed lines

@@ -9,41 +9,41 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
     array(
         'type'     => 'heading',
-        'name'     => __( 'Heading', 'invoicing' ),
+        'name'     => __('Heading', 'invoicing'),
         'defaults' => array(
             'level' => 'h2',
-            'text'  => __( 'Heading', 'invoicing' ),
+            'text'  => __('Heading', 'invoicing'),
         )
     ),
 
     array(
         'type' => 'paragraph',
-        'name' => __( 'Paragraph', 'invoicing' ),
+        'name' => __('Paragraph', 'invoicing'),
         'defaults'  => array(
-            'text'  => __( 'Paragraph text', 'invoicing' ),
+            'text'  => __('Paragraph text', 'invoicing'),
         )
     ),
 
     array( 
         'type' => 'alert',
-        'name' => __( 'Alert', 'invoicing' ),
+        'name' => __('Alert', 'invoicing'),
         'defaults'  => array(
             'value'        => '',
             'class'        => 'alert-warning',
-            'text'         => __( 'Alert', 'invoicing' ),
+            'text'         => __('Alert', 'invoicing'),
             'dismissible'  => false,
         )
     ),
 
     array( 
         'type' => 'separator',
-        'name' => __( 'Separator', 'invoicing' ),
+        'name' => __('Separator', 'invoicing'),
         'defaults'  => array(
             'value'        => '',
         ),
@@ -51,11 +51,11 @@ 
 
     array(
         'type' => 'text',
-        'name' => __( 'Text Input', 'invoicing' ),
+        'name' => __('Text Input', 'invoicing'),
         'defaults'  => array(
-            'placeholder'  => __( 'Enter some text', 'invoicing' ),
+            'placeholder'  => __('Enter some text', 'invoicing'),
             'value'        => '',
-            'label'        => __( 'Field Label', 'invoicing' ),
+            'label'        => __('Field Label', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -63,11 +63,11 @@ 
 
     array(
         'type' => 'textarea',
-        'name' => __( 'Textarea', 'invoicing' ),
+        'name' => __('Textarea', 'invoicing'),
         'defaults'         => array(
-            'placeholder'  => __( 'Enter your text hear', 'invoicing' ),
+            'placeholder'  => __('Enter your text hear', 'invoicing'),
             'value'        => '',
-            'label'        => __( 'Textarea Label', 'invoicing' ),
+            'label'        => __('Textarea Label', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -75,27 +75,27 @@ 
 
     array(
         'type' => 'select',
-        'name' => __( 'Dropdown', 'invoicing' ),
+        'name' => __('Dropdown', 'invoicing'),
         'defaults'         => array(
-            'placeholder'  => __( 'Select a value', 'invoicing' ),
+            'placeholder'  => __('Select a value', 'invoicing'),
             'value'        => '',
-            'label'        => __( 'Dropdown Label', 'invoicing' ),
+            'label'        => __('Dropdown Label', 'invoicing'),
             'description'  => '',
             'required'     => false,
             'options'      => array(
-                esc_attr__( 'Option One', 'invoicing' ),
-                esc_attr__( 'Option Two', 'invoicing' ),
-                esc_attr__( 'Option Three', 'invoicing' )
+                esc_attr__('Option One', 'invoicing'),
+                esc_attr__('Option Two', 'invoicing'),
+                esc_attr__('Option Three', 'invoicing')
             ),
         )
     ),
 
     array(
         'type' => 'checkbox',
-        'name' => __( 'Checkbox', 'invoicing' ),
+        'name' => __('Checkbox', 'invoicing'),
         'defaults'         => array(
             'value'        => '',
-            'label'        => __( 'Checkbox Label', 'invoicing' ),
+            'label'        => __('Checkbox Label', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -103,23 +103,23 @@ 
 
     array( 
         'type' => 'radio',
-        'name' => __( 'Radio', 'invoicing' ),
+        'name' => __('Radio', 'invoicing'),
         'defaults'     => array(
-            'label'    => __( 'Select one choice', 'invoicing' ),
+            'label'    => __('Select one choice', 'invoicing'),
             'options'  => array(
-                esc_attr__( 'Choice One', 'invoicing' ),
-                esc_attr__( 'Choice Two', 'invoicing' ),
-                esc_attr__( 'Choice Three', 'invoicing' )
+                esc_attr__('Choice One', 'invoicing'),
+                esc_attr__('Choice Two', 'invoicing'),
+                esc_attr__('Choice Three', 'invoicing')
             ),
         )
     ),
 
     array( 
         'type' => 'date',
-        'name' => __( 'Date', 'invoicing' ),
+        'name' => __('Date', 'invoicing'),
         'defaults' => array(
             'value'        => '',
-            'label'        => __( 'Date', 'invoicing' ),
+            'label'        => __('Date', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -127,10 +127,10 @@ 
 
     array( 
         'type' => 'time',
-        'name' => __( 'Time', 'invoicing' ),
+        'name' => __('Time', 'invoicing'),
         'defaults' => array(
             'value'        => '',
-            'label'        => __( 'Time', 'invoicing' ),
+            'label'        => __('Time', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -138,11 +138,11 @@ 
 
     array( 
         'type' => 'number',
-        'name' => __( 'Number', 'invoicing' ),
+        'name' => __('Number', 'invoicing'),
         'defaults' => array(
             'placeholder'  => '',
             'value'        => '',
-            'label'        => __( 'Number', 'invoicing' ),
+            'label'        => __('Number', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -150,11 +150,11 @@ 
 
     array( 
         'type' => 'website',
-        'name' => __( 'Website', 'invoicing' ),
+        'name' => __('Website', 'invoicing'),
         'defaults' => array(
             'placeholder'  => 'http://example.com',
             'value'        => '',
-            'label'        => __( 'Website', 'invoicing' ),
+            'label'        => __('Website', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -162,11 +162,11 @@ 
 
     array( 
         'type' => 'email',
-        'name' => __( 'Email', 'invoicing' ),
+        'name' => __('Email', 'invoicing'),
         'defaults'  => array(
             'placeholder'  => 'jon@snow.com',
             'value'        => '',
-            'label'        => __( 'Email Address', 'invoicing' ),
+            'label'        => __('Email Address', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -174,14 +174,14 @@ 
 
     array( 
         'type' => 'address',
-        'name' => __( 'Address', 'invoicing' ),
+        'name' => __('Address', 'invoicing'),
         'defaults'  => array(
 
             'fields' => array(
                 array(
                     'placeholder'  => 'Jon',
                     'value'        => '',
-                    'label'        => __( 'First Name', 'invoicing' ),
+                    'label'        => __('First Name', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -191,7 +191,7 @@ 
                 array(
                     'placeholder'  => 'Snow',
                     'value'        => '',
-                    'label'        => __( 'Last Name', 'invoicing' ),
+                    'label'        => __('Last Name', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -201,7 +201,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Address', 'invoicing' ),
+                    'label'        => __('Address', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -211,7 +211,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'City', 'invoicing' ),
+                    'label'        => __('City', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -219,9 +219,9 @@ 
                 ),
 
                 array(
-                    'placeholder'  => __( 'Select your country' ),
+                    'placeholder'  => __('Select your country'),
                     'value'        => '',
-                    'label'        => __( 'Country', 'invoicing' ),
+                    'label'        => __('Country', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -229,9 +229,9 @@ 
                 ),
 
                 array(
-                    'placeholder'  => __( 'Choose a state', 'invoicing' ),
+                    'placeholder'  => __('Choose a state', 'invoicing'),
                     'value'        => '',
-                    'label'        => __( 'State / Province', 'invoicing' ),
+                    'label'        => __('State / Province', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -241,7 +241,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'ZIP / Postcode', 'invoicing' ),
+                    'label'        => __('ZIP / Postcode', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -251,7 +251,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Phone', 'invoicing' ),
+                    'label'        => __('Phone', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -261,7 +261,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Company', 'invoicing' ),
+                    'label'        => __('Company', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => false,
@@ -271,7 +271,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'VAT Number', 'invoicing' ),
+                    'label'        => __('VAT Number', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => false,
@@ -283,11 +283,11 @@ 
 
     array( 
         'type' => 'billing_email',
-        'name' => __( 'Billing Email', 'invoicing' ),
+        'name' => __('Billing Email', 'invoicing'),
         'defaults'  => array(
             'placeholder'  => 'jon@snow.com',
             'value'        => '',
-            'label'        => __( 'Billing Email', 'invoicing' ),
+            'label'        => __('Billing Email', 'invoicing'),
             'description'  => '',
             'premade'      => true,
         )
@@ -295,18 +295,18 @@ 
 
     array( 
         'type' => 'discount',
-        'name' => __( 'Discount Input', 'invoicing' ),
+        'name' => __('Discount Input', 'invoicing'),
         'defaults'  => array(
             'value'        => '',
-            'input_label'  => __( 'Coupon Code', 'invoicing' ),
-            'button_label' => __( 'Apply Coupon', 'invoicing' ),
-            'description'  => __( 'Have a discount code? Enter it above.', 'invoicing' ),
+            'input_label'  => __('Coupon Code', 'invoicing'),
+            'button_label' => __('Apply Coupon', 'invoicing'),
+            'description'  => __('Have a discount code? Enter it above.', 'invoicing'),
         )
     ),
 
     array( 
         'type' => 'items',
-        'name' => __( 'Items', 'invoicing' ),
+        'name' => __('Items', 'invoicing'),
         'defaults'  => array(
             'value'        => '',
             'items_type'   => 'total',
@@ -318,21 +318,21 @@ 
 
     array( 
         'type' => 'price_input',
-        'name' => __( 'Price Input', 'invoicing' ),
+        'name' => __('Price Input', 'invoicing'),
         'defaults'  => array(
             'placeholder'  => wpinv_format_amount(0),
             'value'        => wpinv_format_amount(0),
-            'label'        => __( 'Enter Amount', 'invoicing' ),
+            'label'        => __('Enter Amount', 'invoicing'),
             'description'  => '',
         )
     ),
 
     array( 
         'type' => 'price_select',
-        'name' => __( 'Price Select', 'invoicing' ),
+        'name' => __('Price Select', 'invoicing'),
         'defaults'  => array(
             'description'  => '',
-            'label'        => __( 'Select Amount', 'invoicing' ),
+            'label'        => __('Select Amount', 'invoicing'),
             'options'      => 'Option 1|10, Option 2|20',
             'placeholder'  => '',
             'select_type'  => 'select',
@@ -341,38 +341,38 @@ 
 
     array( 
         'type'       => 'pay_button',
-        'name'       => __( 'Payment Button', 'invoicing' ),
+        'name'       => __('Payment Button', 'invoicing'),
         'defaults'   => array(
             'value'          => '',
             'class'          => 'btn-primary',
-            'label'          => __( 'Pay Now »', 'invoicing' ),
-            'description'    => __( 'By continuing with our payment, you are agreeing to our privacy policy and terms of service.', 'invoicing' ),
+            'label'          => __('Pay Now »', 'invoicing'),
+            'description'    => __('By continuing with our payment, you are agreeing to our privacy policy and terms of service.', 'invoicing'),
             'premade'        => true,
         )
     ),
 
     array(
         'type'       => 'gateway_select',
-        'name'       => __( 'Gateway Select', 'invoicing' ),
+        'name'       => __('Gateway Select', 'invoicing'),
         'defaults'   => array(
-            'text'    => __( 'Select Payment Method', 'invoicing' ),
+            'text'    => __('Select Payment Method', 'invoicing'),
             'premade' => true,
         )
     ),
 
     array( 
         'type'       => 'total_payable',
-        'name'       => __( 'Total Payable', 'invoicing' ),
+        'name'       => __('Total Payable', 'invoicing'),
         'defaults'   => array(
-            'text' => __( 'Total to pay:', 'invoicing' ),
+            'text' => __('Total to pay:', 'invoicing'),
         )
     ),
 
     array( 
         'type'       => 'ip_address',
-        'name'       => __( 'IP Address', 'invoicing' ),
+        'name'       => __('IP Address', 'invoicing'),
         'defaults'   => array(
-            'text' => __( 'Your IP address is:', 'invoicing' ),
+            'text' => __('Your IP address is:', 'invoicing'),
         )
     )
 );

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

Indentation +31 added lines, -31 removed lines

@@ -394,15 +394,15 @@ 
     }
 
     /**
-	 * Fetches the database from the MaxMind service.
-	 *
-	 * @param string $license_key The license key to be used when downloading the database.
-	 */
+     * Fetches the database from the MaxMind service.
+     *
+     * @param string $license_key The license key to be used when downloading the database.
+     */
     public static function geoip2_download_database() {
 
         // Allow us to easily interact with the filesystem.
         require_once ABSPATH . 'wp-admin/includes/file.php';
-		WP_Filesystem();
+        WP_Filesystem();
         global $wp_filesystem;
 
         $license_key = wpinv_get_option( 'maxmind_license_key' );
@@ -433,7 +433,7 @@ 
             }
 
             // Move the new database into position.
-		    $wp_filesystem->move( $database_path, $target_path, true );
+            $wp_filesystem->move( $database_path, $target_path, true );
             $wp_filesystem->delete( dirname( $database_path ) );
 
             wpinv_update_option( 'wpinv_geoip2_date_updated', current_time( 'timestamp' ) );
@@ -452,16 +452,16 @@ 
 
         // The download URI of the database.
         $source_url = add_query_arg(
-			array(
+            array(
                 'license_key' => urlencode( sanitize_text_field( $license_key ) ),
                 'edition_id'  => $database,
-				'suffix'      => 'tar.gz',
-			),
-			'https://download.maxmind.com/app/geoip_download'
+                'suffix'      => 'tar.gz',
+            ),
+            'https://download.maxmind.com/app/geoip_download'
         );
 
         // Needed for the download_url call right below.
-		require_once ABSPATH . 'wp-admin/includes/file.php';
+        require_once ABSPATH . 'wp-admin/includes/file.php';
 
         // Download the file.
         $tmp_archive_path = download_url( esc_url_raw( $source_url ) );
@@ -470,16 +470,16 @@ 
         if ( is_wp_error( $tmp_archive_path ) ) {
 
             // Transform the error into something more informative.
-			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) ) {
-				switch ( $error_data['code'] ) {
-					case 401:
-						return new WP_Error(
-							'invoicing_maxmind_geolocation_database_license_key',
-							__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
-						);
-				}
-			}
+            $error_data = $tmp_archive_path->get_error_data();
+            if ( isset( $error_data['code'] ) ) {
+                switch ( $error_data['code'] ) {
+                    case 401:
+                        return new WP_Error(
+                            'invoicing_maxmind_geolocation_database_license_key',
+                            __( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+                        );
+                }
+            }
 
             return new WP_Error( 'invoicing_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
 
@@ -487,19 +487,19 @@ 
 
         // Extract the database from the archive.
         try {
-			$file      = new PharData( $tmp_archive_path );
+            $file      = new PharData( $tmp_archive_path );
             $file_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb';
 
-			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb',
-				true
+            $file->extractTo(
+                dirname( $tmp_archive_path ),
+                trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb',
+                true
             );
 
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
-		} finally {
-			// Remove the archive since we only care about a single file in it.
+        } catch ( Exception $exception ) {
+            return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+        } finally {
+            // Remove the archive since we only care about a single file in it.
             unlink( $tmp_archive_path );
         }
 
@@ -1862,7 +1862,7 @@ 
         $valid_company = $vies_company && $company && ( $vies_company == '---' || strcasecmp( trim( $vies_company ), trim( $company ) ) == 0 ) ? true : false;
 
         if ( ! $valid_company && ! empty( $wpinv_options['vat_disable_company_name_check'] ) ) {
-           return wp_sprintf(
+            return wp_sprintf(
                 __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ),
                 getpaid_vat_name()
             );

Spacing +639 added lines, -639 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 class WPInv_EUVat {
 
@@ -24,128 +24,128 @@ 
     public function init() {
 
         // If this is an admin page...
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             // Register our scripts.
-            add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
-            add_action( 'wpinv_settings_sections_taxes', array( $this, 'section_vat_settings' ) );
-            add_action( 'wpinv_settings_taxes', array( $this, 'vat_settings' ) );
-            add_filter( 'wpinv_settings_taxes-vat_sanitize', array( $this, 'sanitize_vat_settings' ) );
-            add_filter( 'wpinv_settings_taxes-vat_rates_sanitize', array( $this, 'sanitize_vat_rates' ) );
-            add_action( 'wp_ajax_wpinv_add_vat_class', array( $this, 'add_class' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_add_vat_class', array( $this, 'add_class' ) );
-            add_action( 'wp_ajax_wpinv_delete_vat_class', array( $this, 'delete_class' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_delete_vat_class', array( $this, 'delete_class' ) );
-            add_action( 'wp_ajax_wpinv_update_vat_rates', array( $this, 'update_eu_rates' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_update_vat_rates', array( $this, 'update_eu_rates' ) );
-            add_action( 'wp_ajax_wpinv_geoip2', array( $this, 'geoip2_download_database' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_geoip2', array( $this, 'geoip2_download_database' ) );
+            add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'));
+            add_action('wpinv_settings_sections_taxes', array($this, 'section_vat_settings'));
+            add_action('wpinv_settings_taxes', array($this, 'vat_settings'));
+            add_filter('wpinv_settings_taxes-vat_sanitize', array($this, 'sanitize_vat_settings'));
+            add_filter('wpinv_settings_taxes-vat_rates_sanitize', array($this, 'sanitize_vat_rates'));
+            add_action('wp_ajax_wpinv_add_vat_class', array($this, 'add_class'));
+            add_action('wp_ajax_nopriv_wpinv_add_vat_class', array($this, 'add_class'));
+            add_action('wp_ajax_wpinv_delete_vat_class', array($this, 'delete_class'));
+            add_action('wp_ajax_nopriv_wpinv_delete_vat_class', array($this, 'delete_class'));
+            add_action('wp_ajax_wpinv_update_vat_rates', array($this, 'update_eu_rates'));
+            add_action('wp_ajax_nopriv_wpinv_update_vat_rates', array($this, 'update_eu_rates'));
+            add_action('wp_ajax_wpinv_geoip2', array($this, 'geoip2_download_database'));
+            add_action('wp_ajax_nopriv_wpinv_geoip2', array($this, 'geoip2_download_database'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_vat_scripts' ) );
-        add_filter( 'wpinv_default_billing_country', array( $this, 'get_user_country' ), 10 );
-        add_filter( 'wpinv_get_user_country', array( $this, 'set_user_country' ), 10 );
-        add_action( 'wp_ajax_wpinv_vat_validate', array( $this, 'ajax_vat_validate' ) );
-        add_action( 'wp_ajax_nopriv_wpinv_vat_validate', array( $this, 'ajax_vat_validate' ) );
+        add_action('wp_enqueue_scripts', array($this, 'enqueue_vat_scripts'));
+        add_filter('wpinv_default_billing_country', array($this, 'get_user_country'), 10);
+        add_filter('wpinv_get_user_country', array($this, 'set_user_country'), 10);
+        add_action('wp_ajax_wpinv_vat_validate', array($this, 'ajax_vat_validate'));
+        add_action('wp_ajax_nopriv_wpinv_vat_validate', array($this, 'ajax_vat_validate'));
 
-        if ( wpinv_use_taxes() && self::allow_vat_rules() ) {
-            add_filter( 'wpinv_tax_rate', array( $this, 'get_rate' ), 10, 4 );
+        if (wpinv_use_taxes() && self::allow_vat_rules()) {
+            add_filter('wpinv_tax_rate', array($this, '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 function enqueue_vat_scripts() {
-        if( wpinv_use_taxes() && wpinv_get_option( 'apply_vat_rules' ) ) {
+        if (wpinv_use_taxes() && wpinv_get_option('apply_vat_rules')) {
             $this->load_vat_scripts();
         }
     }
 
-    public function load_vat_scripts(){
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+    public function load_vat_scripts() {
+        $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   = $this->get_vat_name();
+        $vat_name = $this->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['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::load_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;
@@ -154,52 +154,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' ) ) ),
-            'placeholder' => __( 'Select a VAT Rate', 'invoicing' ),
+            'options'     => array_merge($vat_classes, array('_new' => __('Add New Rate Class', 'invoicing'))),
+            'placeholder' => __('Select a VAT Rate', 'invoicing'),
             'selected'    => $vat_class,
             'class'       => 'wpi_select2',
             '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',
             );
@@ -211,7 +211,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',
             );
         }
@@ -219,12 +219,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'
@@ -232,22 +232,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'
@@ -255,8 +255,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'
             );
@@ -272,8 +272,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'
             );
 
@@ -281,22 +281,22 @@ 
 
             $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'         => '',
                 'class'   => 'wpi_select2',
             );
 
             $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'
@@ -304,22 +304,22 @@ 
 
             $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['maxmind_license_key'] = array(
                 'id'   => 'maxmind_license_key',
-                'name' => __( 'MaxMind License Key', 'invoicing' ),
+                'name' => __('MaxMind License Key', 'invoicing'),
                 'type' => 'text',
                 'size' => 'regular',
-                'desc' => '<a href="https://support.maxmind.com/account-faq/license-keys/how-do-i-generate-a-license-key/">' . __( 'The key that will be used when dealing with MaxMind Geolocation services.', 'invoicing' ) . '</a>',
+                'desc' => '<a href="https://support.maxmind.com/account-faq/license-keys/how-do-i-generate-a-license-key/">' . __('The key that will be used when dealing with MaxMind Geolocation services.', 'invoicing') . '</a>',
             );
 
             $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',
@@ -328,14 +328,14 @@ 
 
             $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'
@@ -343,37 +343,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' => __( 'Disable basic JS checks for correct format of VAT number. (Not Recommended)', 'invoicing' ),
+                'name' => __('Disable Basic Checks', 'invoicing'),
+                'desc' => __('Disable basic JS checks for correct format of VAT number. (Not Recommended)', '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'
             );
@@ -388,7 +388,7 @@ 
      */
     public static function maxmind_folder() {
 
-        $upload_dir      = wp_upload_dir();
+        $upload_dir = wp_upload_dir();
         return $upload_dir['basedir'] . '/invoicing';
 
     }
@@ -405,39 +405,39 @@ 
 		WP_Filesystem();
         global $wp_filesystem;
 
-        $license_key = wpinv_get_option( 'maxmind_license_key' );
+        $license_key = wpinv_get_option('maxmind_license_key');
 
-        if ( empty( $license_key ) ) {
-            echo __( 'Please enter your MaxMind license key then save the settings first before downloading the databases.', 'invoicing' );
+        if (empty($license_key)) {
+            echo __('Please enter your MaxMind license key then save the settings first before downloading the databases.', 'invoicing');
             exit;
         }
 
         // The database files that we will download.
-        $database_files     = array( 'GeoLite2-Country', 'GeoLite2-City' );
+        $database_files = array('GeoLite2-Country', 'GeoLite2-City');
 
         // The destination dir of all databases.
         $destination_dir = self::maxmind_folder();
 
-        if ( ! $wp_filesystem->is_dir( $destination_dir ) ) {
-            $wp_filesystem->mkdir( $destination_dir );
+        if (!$wp_filesystem->is_dir($destination_dir)) {
+            $wp_filesystem->mkdir($destination_dir);
         }
 
-        foreach( $database_files as $database ) {
+        foreach ($database_files as $database) {
 
-            $database_path = self::geoip2_download_file( $license_key, $database );
-            $target_path   = trailingslashit( $destination_dir ) .  $database . '.mmdb';
+            $database_path = self::geoip2_download_file($license_key, $database);
+            $target_path   = trailingslashit($destination_dir) . $database . '.mmdb';
 
-            if ( is_wp_error( $database_path ) ) {
+            if (is_wp_error($database_path)) {
                 echo $database_path->get_error_message();
                 exit;
             }
 
             // Move the new database into position.
-		    $wp_filesystem->move( $database_path, $target_path, true );
-            $wp_filesystem->delete( dirname( $database_path ) );
+		    $wp_filesystem->move($database_path, $target_path, true);
+            $wp_filesystem->delete(dirname($database_path));
 
-            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;
@@ -448,12 +448,12 @@ 
      *
      * @return string|WP_Error
      */
-    public static function geoip2_download_file( $license_key, $database ) {
+    public static function geoip2_download_file($license_key, $database) {
 
         // The download URI of the database.
         $source_url = add_query_arg(
 			array(
-                'license_key' => urlencode( sanitize_text_field( $license_key ) ),
+                'license_key' => urlencode(sanitize_text_field($license_key)),
                 'edition_id'  => $database,
 				'suffix'      => 'tar.gz',
 			),
@@ -464,54 +464,54 @@ 
 		require_once ABSPATH . 'wp-admin/includes/file.php';
 
         // Download the file.
-        $tmp_archive_path = download_url( esc_url_raw( $source_url ) );
+        $tmp_archive_path = download_url(esc_url_raw($source_url));
 
         // Did we encounter an error?
-        if ( is_wp_error( $tmp_archive_path ) ) {
+        if (is_wp_error($tmp_archive_path)) {
 
             // Transform the error into something more informative.
 			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) ) {
-				switch ( $error_data['code'] ) {
+			if (isset($error_data['code'])) {
+				switch ($error_data['code']) {
 					case 401:
 						return new WP_Error(
 							'invoicing_maxmind_geolocation_database_license_key',
-							__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+							__('The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing')
 						);
 				}
 			}
 
-            return new WP_Error( 'invoicing_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
+            return new WP_Error('invoicing_maxmind_geolocation_database_download', __('Failed to download the MaxMind database.', 'invoicing'));
 
         }
 
         // Extract the database from the archive.
         try {
-			$file      = new PharData( $tmp_archive_path );
-            $file_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb';
+			$file = new PharData($tmp_archive_path);
+            $file_path = trailingslashit(dirname($tmp_archive_path)) . trailingslashit($file->current()->getFilename()) . $database . '.mmdb';
 
 			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb',
+				dirname($tmp_archive_path),
+				trailingslashit($file->current()->getFilename()) . $database . '.mmdb',
 				true
             );
 
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+		} catch (Exception $exception) {
+			return new WP_Error('invoicing_maxmind_geolocation_database_archive', $exception->getMessage());
 		} finally {
 			// Remove the archive since we only care about a single file in it.
-            unlink( $tmp_archive_path );
+            unlink($tmp_archive_path);
         }
 
         return $file_path;
     }
 
     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',
@@ -520,12 +520,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',
@@ -559,23 +559,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;
         }
 
@@ -585,12 +585,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;
         }
 
@@ -601,10 +601,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;
         }
 
@@ -615,183 +615,183 @@ 
         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;
         return '';
-        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' ) && ini_get('allow_url_fopen') && ( $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') && ini_get('allow_url_fopen') && ($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 ) ) {
-                    $wpinv_ip_address_country = (string)$load_xml->geoplugin_countryCode;
+                if (!empty($load_xml) && !empty($load_xml->geoplugin_countryCode)) {
+                    $wpinv_ip_address_country = (string) $load_xml->geoplugin_countryCode;
                 }
-            }elseif(!empty( $ip )){
+            }elseif (!empty($ip)) {
                 $url = 'http://ip-api.com/json/' . $ip;
                 $response = wp_remote_get($url);
 
-                if ( is_array( $response ) && wp_remote_retrieve_response_code( $response ) == '200' ) {
-                    $data = json_decode(wp_remote_retrieve_body( $response ),true);
-                    if(!empty($data['countryCode'])){
-                        $wpinv_ip_address_country = (string)$data['countryCode'];
+                if (is_array($response) && wp_remote_retrieve_response_code($response) == '200') {
+                    $data = json_decode(wp_remote_retrieve_body($response), true);
+                    if (!empty($data['countryCode'])) {
+                        $wpinv_ip_address_country = (string) $data['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( !wpinv_current_user_can_manage_invoicing() ) {
-            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 (!wpinv_current_user_can_manage_invoicing()) {
+            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;
@@ -801,71 +801,71 @@ 
         $response = array();
         $response['success'] = false;
 
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing()) {
+            $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();
+        $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 ( !wpinv_current_user_can_manage_invoicing() || !isset( $_POST['class'] ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing() || !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_classes = (array)self::get_rate_classes();
+        $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() {
@@ -874,73 +874,73 @@ 
         $response['error']      = null;
         $response['data']       = null;
 
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing()) {
+            $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);
     }
 
     /**
      * Retrieves the vat name.
      */
     public function get_vat_name() {
-        $vat_name = wpinv_get_option( 'vat_name' );
-        return empty( $vat_name ) ? __( 'VAT', 'invoicing' ) : sanitize_text_field( $vat_name );
+        $vat_name = wpinv_get_option('vat_name');
+        return empty($vat_name) ? __('VAT', 'invoicing') : sanitize_text_field($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;
         }
@@ -953,140 +953,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;
                 }
@@ -1096,75 +1096,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;
                     }
                 }
@@ -1176,62 +1176,62 @@ 
         }
     }
 
-    public static function check_vat( $vat_number, $country_code = '' ) {
+    public static function check_vat($vat_number, $country_code = '') {
         $vat_name           = getpaid_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'] );
-                if ( isset( $body->rates ) ) {
+                $body = json_decode($api_response['body']);
+                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;
-                        $vat_rate['reduced']        = (float)$rate->reduced_rate;
-                        $vat_rate['superreduced']   = (float)$rate->super_reduced_rate;
-                        $vat_rate['parking']        = (float)$rate->parking_rate;
+                        $vat_rate['standard']       = (float) $rate->standard_rate;
+                        $vat_rate['reduced']        = (float) $rate->reduced_rate;
+                        $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];
@@ -1243,79 +1243,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( wpinv_get_default_country() ) || $is_digital ) ) || ( self::is_gst_country( $country_code ) && self::is_gst_country( wpinv_get_default_country() ) );
+        if (!empty($country_code)) {
+            $requires_vat = (self::is_eu_state($country_code) && (self::is_eu_state(wpinv_get_default_country()) || $is_digital)) || (self::is_gst_country($country_code) && self::is_gst_country(wpinv_get_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;
             }
@@ -1326,15 +1326,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'];
         }
 
@@ -1350,107 +1350,107 @@ 
             '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' ),
-            '_exempt' => __( 'Tax-Free Product', 'invoicing' ),
+            'digital' => __('Digital Product', 'invoicing'),
+            'physical' => __('Physical Product', 'invoicing'),
+            '_exempt' => __('Tax-Free 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;
                 }
@@ -1462,71 +1462,71 @@ 
         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;
         }
 
-        if ( !empty( $item_id ) && self::get_item_rule( $item_id ) == '_exempt' ) {
+        if (!empty($item_id) && self::get_item_rule($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);
                     }
                 }
             }
@@ -1535,84 +1535,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);
             }
         }
 
@@ -1622,48 +1622,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 ) {
@@ -1674,38 +1674,38 @@ 
         }
         */
 
-        return apply_filters('wpinv_get_user_vat_number', $vat_number, $user_id, $is_valid );
+        return apply_filters('wpinv_get_user_vat_number', $vat_number, $user_id, $is_valid);
     }
 
-    public static function get_user_company( $company = '', $user_id = 0 ) {
+    public static function get_user_company($company = '', $user_id = 0) {
         global $wpi_current_id, $wpi_userID;
 
-        if ( empty( $user_id ) ) {
-            $user_id = !empty( $wpi_userID ) ? $wpi_userID : ( $wpi_current_id ? wpinv_get_user_id( $wpi_current_id ) : get_current_user_id() );
+        if (empty($user_id)) {
+            $user_id = !empty($wpi_userID) ? $wpi_userID : ($wpi_current_id ? wpinv_get_user_id($wpi_current_id) : get_current_user_id());
         }
 
-        $company = empty( $user_id ) ? "" : get_user_meta( $user_id, '_wpinv_company', true );
+        $company = empty($user_id) ? "" : get_user_meta($user_id, '_wpinv_company', true);
 
-        return apply_filters( 'wpinv_user_company', $company, $user_id );
+        return apply_filters('wpinv_user_company', $company, $user_id);
     }
 
-    public static function save_user_vat_details( $company = '', $vat_number = '' ) {
-        $save = apply_filters( 'wpinv_allow_save_user_vat_details', true );
+    public static function save_user_vat_details($company = '', $vat_number = '') {
+        $save = apply_filters('wpinv_allow_save_user_vat_details', true);
 
-        if ( is_user_logged_in() && $save ) {
+        if (is_user_logged_in() && $save) {
             $user_id = get_current_user_id();
 
-            if ( !empty( $vat_number ) ) {
-                update_user_meta( $user_id, '_wpinv_vat_number', $vat_number );
+            if (!empty($vat_number)) {
+                update_user_meta($user_id, '_wpinv_vat_number', $vat_number);
             } else {
-                delete_user_meta( $user_id, '_wpinv_vat_number');
+                delete_user_meta($user_id, '_wpinv_vat_number');
             }
 
-            if ( !empty( $company ) ) {
-                update_user_meta( $user_id, '_wpinv_company', $company );
+            if (!empty($company)) {
+                update_user_meta($user_id, '_wpinv_company', $company);
             } else {
-                delete_user_meta( $user_id, '_wpinv_company');
-                delete_user_meta( $user_id, '_wpinv_vat_number');
+                delete_user_meta($user_id, '_wpinv_company');
+                delete_user_meta($user_id, '_wpinv_vat_number');
             }
         }
 
@@ -1715,113 +1715,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);
     }
 
     /**
@@ -1829,16 +1829,16 @@ 
      * 
      * @return string
      */
-    public static function validate_vat_number( $vat_number, $company, $country ) {
+    public static function validate_vat_number($vat_number, $company, $country) {
         global $wpinv_options;
 
         // If we are not checking the vat number via view...
-        if ( ! empty( $wpinv_options['vat_vies_check'] ) ) {
+        if (!empty($wpinv_options['vat_vies_check'])) {
 
             // Try validating via regex.
-            if ( empty( $wpinv_options['vat_offline_check'] ) && ! self::offline_check( $vat_number, $country ) ) {
+            if (empty($wpinv_options['vat_offline_check']) && !self::offline_check($vat_number, $country)) {
                 return wp_sprintf(
-                    __( 'Your %s number is invalid', 'invoicing' ),
+                    __('Your %s number is invalid', 'invoicing'),
                     getpaid_vat_name()
                 );
             }
@@ -1847,23 +1847,23 @@ 
         }
 
         // Validate the vat number.
-        $result = self::check_vat( $vat_number, $country );
+        $result = self::check_vat($vat_number, $country);
 
-        if ( empty( $result['valid'] ) ) {
+        if (empty($result['valid'])) {
             return wp_sprintf(
-                __( 'Failed to validate the %s number via EU Commission VAT server (VIES).', 'invoicing' ),
+                __('Failed to validate the %s number via EU Commission VAT server (VIES).', 'invoicing'),
                 getpaid_vat_name()
             );
         }
 
         // Validate the 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;
+        $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;
 
-        if ( ! $valid_company && ! empty( $wpinv_options['vat_disable_company_name_check'] ) ) {
+        if (!$valid_company && !empty($wpinv_options['vat_disable_company_name_check'])) {
            return wp_sprintf(
-                __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ),
+                __('The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing'),
                 getpaid_vat_name()
             );
         }

Braces +7 added lines, -5 removed lines

@@ -712,7 +712,7 @@ 
                 if ( !empty( $load_xml ) && !empty( $load_xml->geoplugin_countryCode ) ) {
                     $wpinv_ip_address_country = (string)$load_xml->geoplugin_countryCode;
                 }
-            }elseif(!empty( $ip )){
+            } elseif(!empty( $ip )){
                 $url = 'http://ip-api.com/json/' . $ip;
                 $response = wp_remote_get($url);
 
@@ -1513,16 +1513,18 @@ 
 
         if ( !empty( $tax_rates ) ) {
             foreach ( $tax_rates as $key => $tax_rate ) {
-                if ( $country != $tax_rate['country'] )
-                    continue;
+                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 );
                     }
                 } else {
-                    if ( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) )
-                        continue;
+                    if ( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) ) {
+                                            continue;
+                    }
 
                     $state_rate = $tax_rate['rate'];
                     if ( 0 !== $state_rate || !empty( $state_rate ) ) {

includes/class-wpinv.php

Spacing +270 added lines, -270 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -38,35 +38,35 @@ 
     }
     
     public function define_constants() {
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
     }
 
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        if ( class_exists( 'BuddyPress' ) ) {
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        if (class_exists('BuddyPress')) {
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-        add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
-        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
+        add_action('wp_footer', array(&$this, 'wp_footer'));
+        add_action('widgets_init', array(&$this, 'register_widgets'));
+        add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
 
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_filter( 'admin_body_class', array( &$this, 'admin_body_class' ) );
-            add_action( 'admin_init', array( &$this, 'init_ayecode_connect_helper' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_filter('admin_body_class', array(&$this, 'admin_body_class'));
+            add_action('admin_init', array(&$this, 'init_ayecode_connect_helper'));
 
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -76,28 +76,28 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
 
     /**
      * Maybe show the AyeCode Connect Notice.
      */
-    public function init_ayecode_connect_helper(){
+    public function init_ayecode_connect_helper() {
         // AyeCode Connect notice
-        if ( is_admin() ){
+        if (is_admin()) {
             // set the strings so they can be translated
             $strings = array(
-                'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-                'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-                'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-                'connect_button'    => __("Connect Site","invoicing"),
-                'connecting_button'    => __("Connecting...","invoicing"),
-                'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-                'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+                'connect_title' => __("WP Invoicing - an AyeCode product!", "invoicing"),
+                'connect_external'  => __("Please confirm you wish to connect your site?", "invoicing"),
+                'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", "invoicing"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+                'connect_button'    => __("Connect Site", "invoicing"),
+                'connecting_button'    => __("Connecting...", "invoicing"),
+                'error_localhost'   => __("This service will only work with a live domain, not a localhost.", "invoicing"),
+                'error'             => __("Something went wrong, please refresh and try again.", "invoicing"),
             );
-            new AyeCode_Connect_Helper($strings,array('wpi-addons'));
+            new AyeCode_Connect_Helper($strings, array('wpi-addons'));
         }
     }
     
@@ -105,10 +105,10 @@ 
         /* Internationalize the text strings used. */
         $this->load_textdomain();
 
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
 
         // Fix oxygen page builder conflict
-        if ( function_exists( 'ct_css_output' ) ) {
+        if (function_exists('ct_css_output')) {
             wpinv_oxygen_fix_conflict();
         }
     }
@@ -118,147 +118,147 @@ 
      *
      * @since 1.0
      */
-    public function load_textdomain( $locale = NULL ) {
-        if ( empty( $locale ) ) {
-            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+    public function load_textdomain($locale = NULL) {
+        if (empty($locale)) {
+            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
         }
 
-        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+        $locale = apply_filters('plugin_locale', $locale, 'invoicing');
         
-        unload_textdomain( 'invoicing' );
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        unload_textdomain('invoicing');
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
         
         /**
          * Define language constants.
          */
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
     }
 
     public function includes() {
         global $wpinv_options;
 
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
 
         // Load composer packages.
-        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
+        require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
 
         // load AUI
-        require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+        require_once(WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php');
 
         // Load the action scheduler.
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/action-scheduler/action-scheduler.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/action-scheduler/action-scheduler.php');
 
         // Load functions.
-        require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/invoice-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
 
         // Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
-        }
-
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-getpaid-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-discount.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-payment-form-elements.php' );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
+        }
+
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-getpaid-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-discount.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'widgets/getpaid.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-payment-form-elements.php');
 
         /**
          * Load the tax class.
          */
-        if ( ! class_exists( 'WPInv_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        if (!class_exists('WPInv_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
 
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
         
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
             GetPaid_Post_Types_Admin::init();
 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
             // load the user class only on the users.php page
             global $pagenow;
-            if($pagenow=='users.php'){
+            if ($pagenow == 'users.php') {
                 new WPInv_Admin_Users();
             }
         }
 
         // Register cli commands
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        if (defined('WP_CLI') && WP_CLI) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+            WP_CLI::add_command('invoicing', 'WPInv_CLI');
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
 
     /**
@@ -269,18 +269,18 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -291,11 +291,11 @@ 
 		);
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
-		foreach ( $locations as $location ) {
+		foreach ($locations as $location) {
 
-			if ( file_exists( "$plugin_path/$location/$file_name" ) ) {
+			if (file_exists("$plugin_path/$location/$file_name")) {
 				include "$plugin_path/$location/$file_name";
 				break;
 			}
@@ -309,117 +309,117 @@ 
     
     public function admin_init() {
         self::$instance->default_payment_form = wpinv_get_default_payment_form();
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
         
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
-        wp_enqueue_style( 'wpinv_front_style' );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css');
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version);
+        wp_enqueue_style('wpinv_front_style');
                
         // Register scripts
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ) );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), filemtime(WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js'));
 
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_separator();
         $localize['decimal_sep']          = wpinv_decimal_separator();
         $localize['decimals']             = wpinv_decimals();
-        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['txtComplete']          = __('Continue', 'invoicing');
         $localize['UseTaxes']             = wpinv_use_taxes();
-        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
-        $localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-        $localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+        $localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
+        $localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+        $localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
+        wp_enqueue_script('jquery-blockui');
         $autofill_api = wpinv_get_option('address_autofill_api');
         $autofill_active = wpinv_get_option('address_autofill_active');
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-                wp_dequeue_script( 'google-maps-api' );
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+            if (wp_script_is('google-maps-api', 'enqueued')) {
+                wp_dequeue_script('google-maps-api');
             }
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('wpinv-front-script');
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-        wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script', 'wp-hooks' ),  $version, true );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+        wp_enqueue_script('wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('wpinv-front-script', 'wp-hooks'), $version, true);
     }
 
-    public function admin_enqueue_scripts( $hook ) {
+    public function admin_enqueue_scripts($hook) {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
+        $suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
 
         $jquery_ui_css = false;
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $jquery_ui_css = true;
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
             $jquery_ui_css = true;
         }
-        if ( $jquery_ui_css ) {
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-            wp_enqueue_style( 'jquery-ui-css' );
-            wp_deregister_style( 'yoast-seo-select2' );
-	        wp_deregister_style( 'yoast-seo-monorepo' );
+        if ($jquery_ui_css) {
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+            wp_enqueue_style('jquery-ui-css');
+            wp_deregister_style('yoast-seo-select2');
+	        wp_deregister_style('yoast-seo-monorepo');
         }
 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), $version );
-        wp_enqueue_style( 'wpinv_admin_style' );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), $version);
+        wp_enqueue_style('wpinv_admin_style');
 
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
-            wp_deregister_style( 'yoast-seo-select2' );
-	        wp_deregister_style( 'yoast-seo-monorepo' );
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
+        if ($page == 'wpinv-subscriptions') {
+            wp_enqueue_script('jquery-ui-datepicker');
+            wp_deregister_style('yoast-seo-select2');
+	        wp_deregister_style('yoast-seo-monorepo');
         }
         
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
 
         if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $autofill_api = wpinv_get_option('address_autofill_api');
@@ -430,21 +430,21 @@ 
             }
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  $version );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), $version);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -452,104 +452,104 @@ 
         $localize['thousand_sep']               = wpinv_thousands_separator();
         $localize['decimal_sep']                = wpinv_decimal_separator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
-        $localize['item_description']           = __( 'Item Description', 'invoicing' );
-        $localize['discount_description']       = __( 'Discount Description', 'invoicing' );
-        $localize['invoice_description']        = __( 'Invoice Description', 'invoicing' );
-        $localize['searching']                  = __( 'Searching', 'invoicing' );
-
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
-
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
+        $localize['action_edit']                = __('Edit', 'invoicing');
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
+        $localize['item_description']           = __('Item Description', 'invoicing');
+        $localize['discount_description']       = __('Discount Description', 'invoicing');
+        $localize['invoice_description']        = __('Invoice Description', 'invoicing');
+        $localize['searching']                  = __('Searching', 'invoicing');
+
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
+
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
 
         // Load payment form scripts on our admin pages only.
-        if ( ( $hook == 'post-new.php' || $hook == 'post.php' ) && 'wpi_payment_form' === $post->post_type ) {
+        if (($hook == 'post-new.php' || $hook == 'post.php') && 'wpi_payment_form' === $post->post_type) {
 
-            wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-            wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-            wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+            wp_enqueue_script('vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION);
+            wp_enqueue_script('sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION);
+            wp_enqueue_script('vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array('sortable', 'vue'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-            wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js');
+            wp_register_script('wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array('wpinv-admin-script', 'vue_draggable'), $version);
         
-            wp_localize_script( 'wpinv-admin-payment-form-script', 'wpinvPaymentFormAdmin', array(
+            wp_localize_script('wpinv-admin-payment-form-script', 'wpinvPaymentFormAdmin', array(
                 'elements'      => $this->form_elements->get_elements(),
-                'form_elements' => $this->form_elements->get_form_elements( $post->ID ),
+                'form_elements' => $this->form_elements->get_form_elements($post->ID),
                 'all_items'     => $this->form_elements->get_published_items(),
                 'currency'      => wpinv_currency_symbol(),
                 'position'      => wpinv_currency_position(),
                 'decimals'      => (int) wpinv_decimals(),
                 'thousands_sep' => wpinv_thousands_separator(),
                 'decimals_sep'  => wpinv_decimal_separator(),
-                'form_items'    => $this->form_elements->get_form_items( $post->ID ),
+                'form_items'    => $this->form_elements->get_form_items($post->ID),
                 'is_default'    => $post->ID == $this->default_payment_form,
-            ) );
+            ));
 
-            wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+            wp_enqueue_script('wpinv-admin-payment-form-script');
         }
 
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        if ($page == 'wpinv-subscriptions') {
+            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION);
+            wp_enqueue_script('wpinv-sub-admin-script');
         }
 
-        if ( $page == 'wpinv-reports' ) {
-            wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
+        if ($page == 'wpinv-reports') {
+            wp_enqueue_script('jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array('jquery'), '0.7');
         }
 
     }
 
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow, $post, $current_screen;
         
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_payment_form' || $current_screen->post_type == 'wpi_quote' ) ) {
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_payment_form' || $current_screen->post_type == 'wpi_quote')) {
             $classes .= ' wpinv-cpt';
         }
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
-        if ( $add_class ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
+        if ($add_class) {
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
             return $classes .= ' wpinv';
         }
         
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
             $classes .= ' wpi-editable-n';
         }
 
@@ -561,21 +561,21 @@ 
     }
     
     public function wpinv_actions() {
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        if (isset($_REQUEST['wpi_action'])) {
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         return $wp_query;
     }
     
     public function bp_invoicing_init() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
     }
 
 	/**
@@ -583,13 +583,13 @@ 
 	 *
 	 */
 	public function register_widgets() {
-		register_widget( "WPInv_Checkout_Widget" );
-		register_widget( "WPInv_History_Widget" );
-		register_widget( "WPInv_Receipt_Widget" );
-		register_widget( "WPInv_Subscriptions_Widget" );
-		register_widget( "WPInv_Buy_Item_Widget" );
-        register_widget( "WPInv_Messages_Widget" );
-        register_widget( 'WPInv_GetPaid_Widget' );
+		register_widget("WPInv_Checkout_Widget");
+		register_widget("WPInv_History_Widget");
+		register_widget("WPInv_Receipt_Widget");
+		register_widget("WPInv_Subscriptions_Widget");
+		register_widget("WPInv_Buy_Item_Widget");
+        register_widget("WPInv_Messages_Widget");
+        register_widget('WPInv_GetPaid_Widget');
 	}
     
     /**
@@ -598,10 +598,10 @@ 
      * @since 1.0.19
      * @param int[] $excluded_posts_ids
      */
-    public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+    public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
         // Ensure that we have an array.
-        if ( ! is_array( $excluded_posts_ids ) ) {
+        if (!is_array($excluded_posts_ids)) {
             $excluded_posts_ids = array();
         }
 
@@ -609,24 +609,24 @@ 
         $our_pages = array();
     
         // Checkout page.
-        $our_pages[] = wpinv_get_option( 'checkout_page', false );
+        $our_pages[] = wpinv_get_option('checkout_page', false);
 
         // Success page.
-        $our_pages[] = wpinv_get_option( 'success_page', false );
+        $our_pages[] = wpinv_get_option('success_page', false);
 
         // Failure page.
-        $our_pages[] = wpinv_get_option( 'failure_page', false );
+        $our_pages[] = wpinv_get_option('failure_page', false);
 
         // History page.
-        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+        $our_pages[] = wpinv_get_option('invoice_history_page', false);
 
         // Subscriptions page.
-        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+        $our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+        $our_pages   = array_map('intval', array_filter($our_pages));
 
         $excluded_posts_ids = $excluded_posts_ids + $our_pages;
-        return array_unique( $excluded_posts_ids );
+        return array_unique($excluded_posts_ids);
 
     }
 

includes/wpinv-tax-functions.php

Indentation +4 added lines, -4 removed lines

@@ -618,10 +618,10 @@
 
     }
 
-   if ( empty( $iso )  ) {
-       return false;
-   }
+    if ( empty( $iso )  ) {
+        return false;
+    }
 
-   return compact( 'iso', 'country', 'region', 'city', 'longitude', 'latitude', 'credit' );
+    return compact( 'iso', 'country', 'region', 'city', 'longitude', 'latitude', 'credit' );
 
 }

Spacing +194 added lines, -194 removed lines

@@ -1,7 +1,7 @@ 
 <?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__));
 }
 
 /**
@@ -18,8 +18,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_eu_state( $country ) {
-    return WPInv_EUVat::is_eu_state( $country );
+function getpaid_is_eu_state($country) {
+    return WPInv_EUVat::is_eu_state($country);
 }
 
 /**
@@ -27,8 +27,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_gst_country( $country ) {
-    return WPInv_EUVat::is_gst_country( $country );
+function getpaid_is_gst_country($country) {
+    return WPInv_EUVat::is_gst_country($country);
 }
 
 /**
@@ -42,117 +42,117 @@ 
 
 
 function wpinv_use_taxes() {
-    $ret = wpinv_get_option( 'enable_taxes', false );
+    $ret = wpinv_get_option('enable_taxes', false);
     
-    return (bool) apply_filters( 'wpinv_use_taxes', $ret );
+    return (bool) apply_filters('wpinv_use_taxes', $ret);
 }
 
 function wpinv_get_tax_rates() {
-    $rates = get_option( 'wpinv_tax_rates', array() );
+    $rates = get_option('wpinv_tax_rates', array());
     
-    return apply_filters( 'wpinv_get_tax_rates', $rates );
+    return apply_filters('wpinv_get_tax_rates', $rates);
 }
 
-function wpinv_get_tax_rate( $country = false, $state = false, $item_id = 0 ) {
+function wpinv_get_tax_rate($country = false, $state = false, $item_id = 0) {
     global $wpinv_euvat, $wpi_tax_rates, $wpi_userID;
-    $wpi_tax_rates = !empty( $wpi_tax_rates ) ? $wpi_tax_rates : array();
+    $wpi_tax_rates = !empty($wpi_tax_rates) ? $wpi_tax_rates : array();
     
-    if ( !empty( $wpi_tax_rates ) && !empty( $item_id ) && isset( $wpi_tax_rates[$item_id] ) ) {
+    if (!empty($wpi_tax_rates) && !empty($item_id) && isset($wpi_tax_rates[$item_id])) {
         return $wpi_tax_rates[$item_id];
     }
     
-    if ( !$wpinv_euvat->item_is_taxable( $item_id, $country, $state ) ) {
+    if (!$wpinv_euvat->item_is_taxable($item_id, $country, $state)) {
         $wpi_tax_rates[$item_id] = 0;
         return 0;
     }
 
     $is_global = false;
-    if ( $item_id == 'global' ) {
+    if ($item_id == 'global') {
         $is_global = true;
         $item_id = 0;
     }
     
-    $rate           = (float)wpinv_get_option( 'tax_rate', 0 );
-    $user_address   = wpinv_get_user_address( $wpi_userID );
+    $rate           = (float) wpinv_get_option('tax_rate', 0);
+    $user_address   = wpinv_get_user_address($wpi_userID);
     
-    if( empty( $country ) ) {
-        if( !empty( $_POST['wpinv_country'] ) ) {
+    if (empty($country)) {
+        if (!empty($_POST['wpinv_country'])) {
             $country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['wpinv_country'] ) ) {
+        } elseif (!empty($_POST['wpinv_country'])) {
             $country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['country'] ) ) {
+        } elseif (!empty($_POST['country'])) {
             $country = $_POST['country'];
-        } elseif( is_user_logged_in() && !empty( $user_address ) ) {
+        } elseif (is_user_logged_in() && !empty($user_address)) {
             $country = $user_address['country'];
         }
-        $country = !empty( $country ) ? $country : wpinv_get_default_country();
+        $country = !empty($country) ? $country : wpinv_get_default_country();
     }
 
-    if( empty( $state ) ) {
-        if( !empty( $_POST['wpinv_state'] ) ) {
+    if (empty($state)) {
+        if (!empty($_POST['wpinv_state'])) {
             $state = $_POST['wpinv_state'];
-        } elseif( !empty( $_POST['wpinv_state'] ) ) {
+        } elseif (!empty($_POST['wpinv_state'])) {
             $state = $_POST['wpinv_state'];
-        } elseif( !empty( $_POST['state'] ) ) {
+        } elseif (!empty($_POST['state'])) {
             $state = $_POST['state'];
-        } elseif( is_user_logged_in() && !empty( $user_address ) ) {
+        } elseif (is_user_logged_in() && !empty($user_address)) {
             $state = $user_address['state'];
         }
-        $state = !empty( $state ) ? $state : wpinv_get_default_state();
+        $state = !empty($state) ? $state : wpinv_get_default_state();
     }
     
-    if( !empty( $country ) ) {
-        $tax_rates   = wpinv_get_tax_rates();
+    if (!empty($country)) {
+        $tax_rates = wpinv_get_tax_rates();
 
-        if( !empty( $tax_rates ) ) {
+        if (!empty($tax_rates)) {
             // Locate the tax rate for this country / state, if it exists
-            foreach( $tax_rates as $key => $tax_rate ) {
-                if( $country != $tax_rate['country'] )
+            foreach ($tax_rates as $key => $tax_rate) {
+                if ($country != $tax_rate['country'])
                     continue;
 
-                if( !empty( $tax_rate['global'] ) ) {
-                    if( !empty( $tax_rate['rate'] ) ) {
-                        $rate = number_format( $tax_rate['rate'], 4 );
+                if (!empty($tax_rate['global'])) {
+                    if (!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);
                     }
                 }
             }
         }
     }
     
-    $rate = apply_filters( 'wpinv_tax_rate', $rate, $country, $state, $item_id );
+    $rate = apply_filters('wpinv_tax_rate', $rate, $country, $state, $item_id);
     
-    if ( !empty( $item_id ) ) {
+    if (!empty($item_id)) {
         $wpi_tax_rates[$item_id] = $rate;
-    } else if ( $is_global ) {
+    } else if ($is_global) {
         $wpi_tax_rates['global'] = $rate;
     }
     
     return $rate;
 }
 
-function wpinv_get_formatted_tax_rate( $country = false, $state = false, $item_id ) {
-    $rate = wpinv_get_tax_rate( $country, $state, $item_id );
-    $rate = round( $rate, 4 );
+function wpinv_get_formatted_tax_rate($country = false, $state = false, $item_id) {
+    $rate = wpinv_get_tax_rate($country, $state, $item_id);
+    $rate = round($rate, 4);
     $formatted = $rate .= '%';
-    return apply_filters( 'wpinv_formatted_tax_rate', $formatted, $rate, $country, $state, $item_id );
+    return apply_filters('wpinv_formatted_tax_rate', $formatted, $rate, $country, $state, $item_id);
 }
 
-function wpinv_calculate_tax( $amount = 0, $country = false, $state = false, $item_id = 0 ) {
-    $rate = wpinv_get_tax_rate( $country, $state, $item_id );
+function wpinv_calculate_tax($amount = 0, $country = false, $state = false, $item_id = 0) {
+    $rate = wpinv_get_tax_rate($country, $state, $item_id);
     $tax  = 0.00;
 
-    if ( wpinv_use_taxes() ) {        
-        if ( wpinv_prices_include_tax() ) {
-            $pre_tax = ( $amount / ( ( 1 + $rate ) * 0.01 ) );
+    if (wpinv_use_taxes()) {        
+        if (wpinv_prices_include_tax()) {
+            $pre_tax = ($amount / ((1 + $rate) * 0.01));
             $tax     = $amount - $pre_tax;
         } else {
             $tax = $amount * $rate * 0.01;
@@ -160,46 +160,46 @@ 
 
     }
 
-    return apply_filters( 'wpinv_taxed_amount', $tax, $rate, $country, $state, $item_id );
+    return apply_filters('wpinv_taxed_amount', $tax, $rate, $country, $state, $item_id);
 }
 
 function wpinv_prices_include_tax() {
     return false; // TODO
-    $ret = ( wpinv_get_option( 'prices_include_tax', false ) == 'yes' && wpinv_use_taxes() );
+    $ret = (wpinv_get_option('prices_include_tax', false) == 'yes' && wpinv_use_taxes());
 
-    return apply_filters( 'wpinv_prices_include_tax', $ret );
+    return apply_filters('wpinv_prices_include_tax', $ret);
 }
 
-function wpinv_sales_tax_for_year( $year = null ) {
-    return wpinv_price( wpinv_format_amount( wpinv_get_sales_tax_for_year( $year ) ) );
+function wpinv_sales_tax_for_year($year = null) {
+    return wpinv_price(wpinv_format_amount(wpinv_get_sales_tax_for_year($year)));
 }
 
-function wpinv_get_sales_tax_for_year( $year = null ) {
+function wpinv_get_sales_tax_for_year($year = null) {
     global $wpdb;
 
     // Start at zero
     $tax = 0;
 
-    if ( ! empty( $year ) ) {
+    if (!empty($year)) {
         $args = array(
             'post_type'      => 'wpi_invoice',
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'posts_per_page' => -1,
             'year'           => $year,
             'fields'         => 'ids'
         );
 
-        $payments    = get_posts( $args );
-        $payment_ids = implode( ',', $payments );
+        $payments    = get_posts($args);
+        $payment_ids = implode(',', $payments);
 
-        if ( count( $payments ) > 0 ) {
+        if (count($payments) > 0) {
             $sql = "SELECT SUM( meta_value ) FROM $wpdb->postmeta WHERE meta_key = '_wpinv_tax' AND post_id IN( $payment_ids )";
-            $tax = $wpdb->get_var( $sql );
+            $tax = $wpdb->get_var($sql);
         }
 
     }
 
-    return apply_filters( 'wpinv_get_sales_tax_for_year', $tax, $year );
+    return apply_filters('wpinv_get_sales_tax_for_year', $tax, $year);
 }
 
 function wpinv_is_cart_taxed() {
@@ -208,33 +208,33 @@ 
 
 function wpinv_prices_show_tax_on_checkout() {
     return false; // TODO
-    $ret = ( wpinv_get_option( 'checkout_include_tax', false ) == 'yes' && wpinv_use_taxes() );
+    $ret = (wpinv_get_option('checkout_include_tax', false) == 'yes' && wpinv_use_taxes());
 
-    return apply_filters( 'wpinv_taxes_on_prices_on_checkout', $ret );
+    return apply_filters('wpinv_taxes_on_prices_on_checkout', $ret);
 }
 
 function wpinv_display_tax_rate() {
-    $ret = wpinv_use_taxes() && wpinv_get_option( 'display_tax_rate', false );
+    $ret = wpinv_use_taxes() && wpinv_get_option('display_tax_rate', false);
 
-    return apply_filters( 'wpinv_display_tax_rate', $ret );
+    return apply_filters('wpinv_display_tax_rate', $ret);
 }
 
 function wpinv_cart_needs_tax_address_fields() {
-    if( !wpinv_is_cart_taxed() )
+    if (!wpinv_is_cart_taxed())
         return false;
 
-    return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' );
+    return !did_action('wpinv_after_cc_fields', 'wpinv_default_cc_address_fields');
 }
 
-function wpinv_item_is_tax_exclusive( $item_id = 0 ) {
-    $ret = (bool)get_post_meta( $item_id, '_wpinv_tax_exclusive', false );
-    return apply_filters( 'wpinv_is_tax_exclusive', $ret, $item_id );
+function wpinv_item_is_tax_exclusive($item_id = 0) {
+    $ret = (bool) get_post_meta($item_id, '_wpinv_tax_exclusive', false);
+    return apply_filters('wpinv_is_tax_exclusive', $ret, $item_id);
 }
 
-function wpinv_currency_decimal_filter( $decimals = 2 ) {
+function wpinv_currency_decimal_filter($decimals = 2) {
     $currency = wpinv_get_currency();
 
-    switch ( $currency ) {
+    switch ($currency) {
         case 'RIAL' :
         case 'JPY' :
         case 'TWD' :
@@ -243,48 +243,48 @@ 
             break;
     }
 
-    return apply_filters( 'wpinv_currency_decimal_count', $decimals, $currency );
+    return apply_filters('wpinv_currency_decimal_count', $decimals, $currency);
 }
 
 function wpinv_tax_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_tax_amount', $output );
+    return apply_filters('wpinv_tax_amount', $output);
 }
 
 function wpinv_recalculated_tax() {
-    define( 'WPINV_RECALCTAX', true );
+    define('WPINV_RECALCTAX', true);
 }
-add_action( 'wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculated_tax', 1 );
+add_action('wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculated_tax', 1);
 
-function wpinv_recalculate_tax( $return = false ) {
-    $invoice_id = (int)wpinv_get_invoice_cart_id();
-    if ( empty( $invoice_id ) ) {
+function wpinv_recalculate_tax($return = false) {
+    $invoice_id = (int) wpinv_get_invoice_cart_id();
+    if (empty($invoice_id)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice_cart( $invoice_id );
+    $invoice = wpinv_get_invoice_cart($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( empty( $_POST['country'] ) ) {
+    if (empty($_POST['country'])) {
         $_POST['country'] = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
     }
         
     $invoice->country = sanitize_text_field($_POST['country']);
-    $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
+    $invoice->set('country', sanitize_text_field($_POST['country']));
     if (isset($_POST['state'])) {
         $invoice->state = sanitize_text_field($_POST['state']);
-        $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->set('state', sanitize_text_field($_POST['state']));
     }
 
     $invoice->cart_details  = wpinv_get_cart_content_details();
     
-    $subtotal               = wpinv_get_cart_subtotal( $invoice->cart_details );
-    $tax                    = wpinv_get_cart_tax( $invoice->cart_details );
-    $total                  = wpinv_get_cart_total( $invoice->cart_details );
+    $subtotal               = wpinv_get_cart_subtotal($invoice->cart_details);
+    $tax                    = wpinv_get_cart_tax($invoice->cart_details);
+    $total                  = wpinv_get_cart_total($invoice->cart_details);
 
     $invoice->tax           = $tax;
     $invoice->subtotal      = $subtotal;
@@ -292,61 +292,61 @@ 
 
     $invoice->save();
     
-    if ( $invoice->is_free_trial() ) {
+    if ($invoice->is_free_trial()) {
         $total = 0;
     }
     
     $response = array(
-        'total'        => html_entity_decode( wpinv_price( wpinv_format_amount( $total ) ), ENT_COMPAT, 'UTF-8' ),
+        'total'        => html_entity_decode(wpinv_price(wpinv_format_amount($total)), ENT_COMPAT, 'UTF-8'),
         'total_raw'    => $total,
-        'free'         => !( (float)$total > 0 ) && $invoice->is_free() ? true : false,
-        'html'         => wpinv_checkout_cart( $invoice->cart_details, false ),
+        'free'         => !((float) $total > 0) && $invoice->is_free() ? true : false,
+        'html'         => wpinv_checkout_cart($invoice->cart_details, false),
     );
     
-    if ( $return ) {
+    if ($return) {
         return $response;
     }
 
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculate_tax' );
-add_action( 'wp_ajax_nopriv_wpinv_recalculate_tax', 'wpinv_recalculate_tax' );
+add_action('wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculate_tax');
+add_action('wp_ajax_nopriv_wpinv_recalculate_tax', 'wpinv_recalculate_tax');
 
 // VAT Settings
-function wpinv_vat_rate_add_callback( $args ) {
+function wpinv_vat_rate_add_callback($args) {
     ?>
-    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_add" type="button" value="<?php esc_attr_e( 'Add', 'invoicing' );?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
+    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_add" type="button" value="<?php esc_attr_e('Add', 'invoicing'); ?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
     <?php
 }
 
-function wpinv_vat_rate_delete_callback( $args ) {
+function wpinv_vat_rate_delete_callback($args) {
     global $wpinv_euvat;
     
     $vat_classes = $wpinv_euvat->get_rate_classes();
-    $vat_class = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '';
-    if ( isset( $vat_classes[$vat_class] ) ) {
+    $vat_class = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '';
+    if (isset($vat_classes[$vat_class])) {
     ?>
-    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_delete" type="button" value="<?php echo wp_sprintf( esc_attr__( 'Delete class "%s"', 'invoicing' ), $vat_classes[$vat_class] );?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
+    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_delete" type="button" value="<?php echo wp_sprintf(esc_attr__('Delete class "%s"', 'invoicing'), $vat_classes[$vat_class]); ?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
     <?php
     }
 }
 
-function wpinv_vat_rates_callback( $args ) {
+function wpinv_vat_rates_callback($args) {
     global $wpinv_euvat;
     
     $vat_classes    = $wpinv_euvat->get_rate_classes();
-    $vat_class      = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '_standard';
+    $vat_class      = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '_standard';
     
     $eu_states      = $wpinv_euvat->get_eu_states();
     $countries      = wpinv_get_country_list();
     $vat_groups     = $wpinv_euvat->get_vat_groups();
-    $rates          = $wpinv_euvat->get_vat_rates( $vat_class );
+    $rates          = $wpinv_euvat->get_vat_rates($vat_class);
     ob_start();
 ?>
 </td><tr>
     <td colspan="2" class="wpinv_vat_tdbox">
-    <input type="hidden" name="wpi_vat_class" value="<?php echo $vat_class;?>" />
-    <p><?php echo ( isset( $args['desc'] ) ? $args['desc'] : '' ); ?></p>
+    <input type="hidden" name="wpi_vat_class" value="<?php echo $vat_class; ?>" />
+    <p><?php echo (isset($args['desc']) ? $args['desc'] : ''); ?></p>
     <table id="wpinv_vat_rates" class="wp-list-table widefat fixed posts">
         <colgroup>
             <col width="50px" />
@@ -358,43 +358,43 @@ 
         </colgroup>
         <thead>
             <tr>
-                <th scope="col" colspan="2" class="wpinv_vat_country_name"><?php _e( 'Country', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_global" title="<?php esc_attr_e( 'Apply rate to whole country', 'invoicing' ); ?>"><?php _e( 'Country Wide', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_rate"><?php _e( 'Rate %', 'invoicing' ); ?></th> 
-                <th scope="col" class="wpinv_vat_name"><?php _e( 'VAT Name', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_group"><?php _e( 'Tax Group', 'invoicing' ); ?></th>
+                <th scope="col" colspan="2" class="wpinv_vat_country_name"><?php _e('Country', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_global" title="<?php esc_attr_e('Apply rate to whole country', 'invoicing'); ?>"><?php _e('Country Wide', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_rate"><?php _e('Rate %', 'invoicing'); ?></th> 
+                <th scope="col" class="wpinv_vat_name"><?php _e('VAT Name', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_group"><?php _e('Tax Group', 'invoicing'); ?></th>
             </tr>
         </thead>
         <tbody>
-        <?php if( !empty( $eu_states ) ) { ?>
+        <?php if (!empty($eu_states)) { ?>
         <?php 
-        foreach ( $eu_states as $state ) { 
-            $country_name = isset( $countries[$state] ) ? $countries[$state] : '';
+        foreach ($eu_states as $state) { 
+            $country_name = isset($countries[$state]) ? $countries[$state] : '';
             
             // Filter the rate for each country
-            $country_rate = array_filter( $rates, function( $rate ) use( $state ) { return $rate['country'] === $state; } );
+            $country_rate = array_filter($rates, function($rate) use($state) { return $rate['country'] === $state; } );
             
             // If one does not exist create a default
-            $country_rate = is_array( $country_rate ) && count( $country_rate ) > 0 ? reset( $country_rate ) : array();
+            $country_rate = is_array($country_rate) && count($country_rate) > 0 ? reset($country_rate) : array();
             
-            $vat_global = isset( $country_rate['global'] ) ? !empty( $country_rate['global'] ) : true;
-            $vat_rate = isset( $country_rate['rate'] ) ? $country_rate['rate'] : '';
-            $vat_name = !empty( $country_rate['name'] ) ? esc_attr( stripslashes( $country_rate['name'] ) ) : '';
-            $vat_group = !empty( $country_rate['group'] ) ? $country_rate['group'] : ( $vat_class === '_standard' ? 'standard' : 'reduced' );
+            $vat_global = isset($country_rate['global']) ? !empty($country_rate['global']) : true;
+            $vat_rate = isset($country_rate['rate']) ? $country_rate['rate'] : '';
+            $vat_name = !empty($country_rate['name']) ? esc_attr(stripslashes($country_rate['name'])) : '';
+            $vat_group = !empty($country_rate['group']) ? $country_rate['group'] : ($vat_class === '_standard' ? 'standard' : 'reduced');
         ?>
         <tr>
             <td class="wpinv_vat_country"><?php echo $state; ?><input type="hidden" name="vat_rates[<?php echo $state; ?>][country]" value="<?php echo $state; ?>" /><input type="hidden" name="vat_rates[<?php echo $state; ?>][state]" value="" /></td>
             <td class="wpinv_vat_country_name"><?php echo $country_name; ?></td>
             <td class="wpinv_vat_global">
-                <input type="checkbox" name="vat_rates[<?php echo $state;?>][global]" id="vat_rates[<?php echo $state;?>][global]" value="1" <?php checked( true, $vat_global );?> disabled="disabled" />
-                <label for="tax_rates[<?php echo $state;?>][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
-                <input type="hidden" name="vat_rates[<?php echo $state;?>][global]" value="1" checked="checked" />
+                <input type="checkbox" name="vat_rates[<?php echo $state; ?>][global]" id="vat_rates[<?php echo $state; ?>][global]" value="1" <?php checked(true, $vat_global); ?> disabled="disabled" />
+                <label for="tax_rates[<?php echo $state; ?>][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
+                <input type="hidden" name="vat_rates[<?php echo $state; ?>][global]" value="1" checked="checked" />
             </td>
-            <td class="wpinv_vat_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="vat_rates[<?php echo $state;?>][rate]" value="<?php echo $vat_rate; ?>" /></td>
-            <td class="wpinv_vat_name"><input type="text" class="regular-text" name="vat_rates[<?php echo $state;?>][name]" value="<?php echo $vat_name; ?>" /></td>
+            <td class="wpinv_vat_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="vat_rates[<?php echo $state; ?>][rate]" value="<?php echo $vat_rate; ?>" /></td>
+            <td class="wpinv_vat_name"><input type="text" class="regular-text" name="vat_rates[<?php echo $state; ?>][name]" value="<?php echo $vat_name; ?>" /></td>
             <td class="wpinv_vat_group">
             <?php
-            echo wpinv_html_select( array(
+            echo wpinv_html_select(array(
                                         'name'             => 'vat_rates[' . $state . '][group]',
                                         'selected'         => $vat_group,
                                         'id'               => 'vat_rates[' . $state . '][group]',
@@ -403,14 +403,14 @@ 
                                         'multiple'         => false,
                                         'show_option_all'  => false,
                                         'show_option_none' => false
-                                    ) );
+                                    ));
             ?>
             </td>
         </tr>
         <?php } ?>
         <tr>
             <td colspan="6" style="background-color:#fafafa;">
-                <span><input id="wpi_vat_get_rates_group" type="button" class="button-secondary" value="<?php esc_attr_e( 'Update EU VAT Rates', 'invoicing' ); ?>" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span><span id="wpinv-rates-error-wrap" class="wpinv_errors" style="display:none;"></span>
+                <span><input id="wpi_vat_get_rates_group" type="button" class="button-secondary" value="<?php esc_attr_e('Update EU VAT Rates', 'invoicing'); ?>" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span><span id="wpinv-rates-error-wrap" class="wpinv_errors" style="display:none;"></span>
             </td>
         </tr>
         <?php } ?>
@@ -422,35 +422,35 @@ 
     echo $content;
 }
 
-function wpinv_vat_number_callback( $args ) {
+function wpinv_vat_number_callback($args) {
     global $wpinv_euvat;
     
     $vat_number     = $wpinv_euvat->get_vat_number();
     $vat_valid      = $wpinv_euvat->is_vat_validated();
 
-    $size           = ( isset( $args['size'] ) && !is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $validated_text = $vat_valid ? __( 'VAT number validated', 'invoicing' ) : __( 'VAT number not validated', 'invoicing' );
+    $size           = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $validated_text = $vat_valid ? __('VAT number validated', 'invoicing') : __('VAT number not validated', 'invoicing');
     $disabled       = $vat_valid ? 'disabled="disabled"' : " ";
     
-    $html = '<input type="text" class="' . $size . '-text" id="wpinv_settings[' . $args['id'] . ']" name="wpinv_settings[' . $args['id'] . ']" placeholder="GB123456789" value="' . esc_attr( stripslashes( $vat_number ) ) . '"/>';
-    $html .= '<span>&nbsp;<input type="button" id="wpinv_vat_validate" class="wpinv_validate_vat_button button-secondary" ' . $disabled . ' value="' . esc_attr__( 'Validate VAT Number', 'invoicing' ) . '" /></span>';
-    $html .= '<span class="wpinv-vat-stat wpinv-vat-stat-' . (int)$vat_valid . '"><i class="fa"></i> <font>' . $validated_text . '</font></span>';
-    $html .= '<label for="wpinv_settings[' . $args['id'] . ']">' . '<p>' . __( 'Enter your VAT number including country identifier, eg: GB123456789 (Settings must be saved after validation)', 'invoicing' ).'</p>' . '</label>';
-    $html .= '<input type="hidden" name="_wpi_nonce" value="' . wp_create_nonce( 'vat_validation' ) . '">';
+    $html = '<input type="text" class="' . $size . '-text" id="wpinv_settings[' . $args['id'] . ']" name="wpinv_settings[' . $args['id'] . ']" placeholder="GB123456789" value="' . esc_attr(stripslashes($vat_number)) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" id="wpinv_vat_validate" class="wpinv_validate_vat_button button-secondary" ' . $disabled . ' value="' . esc_attr__('Validate VAT Number', 'invoicing') . '" /></span>';
+    $html .= '<span class="wpinv-vat-stat wpinv-vat-stat-' . (int) $vat_valid . '"><i class="fa"></i> <font>' . $validated_text . '</font></span>';
+    $html .= '<label for="wpinv_settings[' . $args['id'] . ']">' . '<p>' . __('Enter your VAT number including country identifier, eg: GB123456789 (Settings must be saved after validation)', 'invoicing') . '</p>' . '</label>';
+    $html .= '<input type="hidden" name="_wpi_nonce" value="' . wp_create_nonce('vat_validation') . '">';
 
     echo $html;
 }
 
-function wpinv_eu_fallback_rate_callback( $args ) {
+function wpinv_eu_fallback_rate_callback($args) {
     global $wpinv_options;
 
-    $value = isset( $wpinv_options[$args['id']] ) ? $wpinv_options[ $args['id'] ] : ( isset( $args['std'] ) ? $args['std'] : '' );
-    $size = ( isset( $args['size'] ) && !is_null( $args['size'] ) ) ? $args['size'] : 'small';
+    $value = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : (isset($args['std']) ? $args['std'] : '');
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'small';
     
-    $html = '<input type="number" min="0" max="99" step="any" class="' . $size . '-text" id="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '" name="wpinv_settings[' . $args['id'] . ']" value="' . esc_attr( stripslashes( $value ) ) . '" />';
-    $html .= '<span>&nbsp;<input id="wpi_add_eu_states" type="button" class="button-secondary" value="' . esc_attr__( 'Add EU Member States', 'invoicing' ) . '" /></span>';
-    $html .= '<span>&nbsp;<input id="wpi_remove_eu_states" type="button" class="button-secondary" value="' . esc_attr__( 'Remove EU Member States', 'invoicing' ) . '" /></span>';
-    $html .= '<span>&nbsp;<input id="wpi_vat_get_rates" type="button" class="button-secondary" value="' . esc_attr__( 'Update EU VAT Rates', 'invoicing' ) . '" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span>';
+    $html = '<input type="number" min="0" max="99" step="any" class="' . $size . '-text" id="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '" name="wpinv_settings[' . $args['id'] . ']" value="' . esc_attr(stripslashes($value)) . '" />';
+    $html .= '<span>&nbsp;<input id="wpi_add_eu_states" type="button" class="button-secondary" value="' . esc_attr__('Add EU Member States', 'invoicing') . '" /></span>';
+    $html .= '<span>&nbsp;<input id="wpi_remove_eu_states" type="button" class="button-secondary" value="' . esc_attr__('Remove EU Member States', 'invoicing') . '" /></span>';
+    $html .= '<span>&nbsp;<input id="wpi_vat_get_rates" type="button" class="button-secondary" value="' . esc_attr__('Update EU VAT Rates', 'invoicing') . '" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span>';
     $html .= '<p><label for="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '">' . $args['desc'] . '</label></p>';
     echo $html;
     ?>
@@ -458,36 +458,36 @@ 
     <?php
 }
 
-function wpinv_vat_ip_lookup_callback( $args ) {
+function wpinv_vat_ip_lookup_callback($args) {
     global $wpinv_options, $wpinv_euvat;
 
-    $value =  isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ]  : ( isset( $args['std'] ) ? $args['std'] : 'default' );
+    $value = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : (isset($args['std']) ? $args['std'] : 'default');
     
     $options = array();
-    if ( function_exists( 'geoip_country_code_by_name' ) ) {
-        $options['geoip'] = __( 'PHP GeoIP extension', 'invoicing' );
+    if (function_exists('geoip_country_code_by_name')) {
+        $options['geoip'] = __('PHP GeoIP extension', 'invoicing');
     }
     
     $geoip2_database = $wpinv_euvat->geoip2_country_dbfile();
     
-    if ( !function_exists( 'bcadd' ) ) {
-        $geoip2_message = __( 'GeoIP2 service requires the BC Math PHP extension, it is not loaded in your version of PHP!', 'invoicing' );
+    if (!function_exists('bcadd')) {
+        $geoip2_message = __('GeoIP2 service requires the BC Math PHP extension, it is not loaded in your version of PHP!', 'invoicing');
     } else {
-        $geoip2_message = ini_get('safe_mode') ? __( 'GeoIP2 is not supported with PHP safe mode enabled!', 'invoicing' ) : '';
+        $geoip2_message = ini_get('safe_mode') ? __('GeoIP2 is not supported with PHP safe mode enabled!', 'invoicing') : '';
     }
     
-    if ( $geoip2_database !== false && empty( $geoip2_message ) ) {
-        $options['geoip2'] = __( 'GeoIP2 Database', 'invoicing' );
+    if ($geoip2_database !== false && empty($geoip2_message)) {
+        $options['geoip2'] = __('GeoIP2 Database', 'invoicing');
     }
     
-    if ( function_exists( 'simplexml_load_file' ) ) {
-        $options['geoplugin'] = __( 'geoPlugin Web Service', 'invoicing' );
+    if (function_exists('simplexml_load_file')) {
+        $options['geoplugin'] = __('geoPlugin Web Service', 'invoicing');
     }
     
-    $options['site']    = __( 'Use default country', 'invoicing' );
-    $options['default'] = __( 'Auto', 'invoicing' );
+    $options['site']    = __('Use default country', 'invoicing');
+    $options['default'] = __('Auto', 'invoicing');
 
-    $html = wpinv_html_select( array(
+    $html = wpinv_html_select(array(
         'name'             => "wpinv_settings[{$args['id']}]",
         'selected'         => $value,
         'id'               => "wpinv_settings[{$args['id']}]",
@@ -499,23 +499,23 @@ 
     ));
     
     $desc = '<label for="wpinv_settings[' . $args['id'] . ']">';
-    $desc .= __( 'Select the option Invoicing should use to determine the country from the IP address of the user.', 'invoicing' );
+    $desc .= __('Select the option Invoicing should use to determine the country from the IP address of the user.', 'invoicing');
     $desc .= '<p>';
-    if ( empty( $geoip2_message ) ) {
-        if ( $geoip2_database ) {
+    if (empty($geoip2_message)) {
+        if ($geoip2_database) {
             $last_updated = '';
-            if ( $time_updated = wpinv_get_option( 'wpinv_geoip2_date_updated' ) ) {
-                $date_updated = date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $time_updated );
-                $last_updated = '<br>' . sprintf( __( 'The GeoIP2 database was last updated on: <b>%s</b>', 'invoicing' ), $date_updated );
+            if ($time_updated = wpinv_get_option('wpinv_geoip2_date_updated')) {
+                $date_updated = date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $time_updated);
+                $last_updated = '<br>' . sprintf(__('The GeoIP2 database was last updated on: <b>%s</b>', 'invoicing'), $date_updated);
             }
-            $desc .= __(  'GeoIP2 database exists:', 'invoicing' ) . $last_updated . '&nbsp;<input type="button" id="wpi_geoip2" action="update" class="wpinv-refresh-geoip2-btn button-secondary" value="' . __( 'Update GeoIP2 database now (~30MB)', 'invoicing' ) . '"></input>';
+            $desc .= __('GeoIP2 database exists:', 'invoicing') . $last_updated . '&nbsp;<input type="button" id="wpi_geoip2" action="update" class="wpinv-refresh-geoip2-btn button-secondary" value="' . __('Update GeoIP2 database now (~30MB)', 'invoicing') . '"></input>';
         } else {
-            $desc .= __( 'GeoIP2 database does not exist:', 'invoicing' ) . '&nbsp;<input type="button" id="wpi_geoip2" action="download" class="wpinv-download-geoip2-btn button-secondary" value="' . __( 'Download GeoIP2 database now', 'invoicing' ) . ' (~30MB)"></input><br>' . __(  'After downloading the GeoIP2 database the GeoIP2 lookup option will show.', 'invoicing' );
+            $desc .= __('GeoIP2 database does not exist:', 'invoicing') . '&nbsp;<input type="button" id="wpi_geoip2" action="download" class="wpinv-download-geoip2-btn button-secondary" value="' . __('Download GeoIP2 database now', 'invoicing') . ' (~30MB)"></input><br>' . __('After downloading the GeoIP2 database the GeoIP2 lookup option will show.', 'invoicing');
         }
     } else {
         $desc .= $geoip2_message;
     }
-    $desc .= '</p><p>'. __( 'geoPlugin is a great free service please consider supporting them: ', 'invoicing' ) . ' <a href="http://www.geoplugin.com/" target="_blank">GeoPlugin.com</a></p>';
+    $desc .= '</p><p>' . __('geoPlugin is a great free service please consider supporting them: ', 'invoicing') . ' <a href="http://www.geoplugin.com/" target="_blank">GeoPlugin.com</a></p>';
     $desc .= '</label>';
     
     $html .= $desc;
@@ -531,40 +531,40 @@ 
  * 
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_rule( $vat_rule ) {
+function getpaid_filter_vat_rule($vat_rule) {
     global $wpinv_euvat;
 
-    if ( empty( $vat_rule ) ) {        
+    if (empty($vat_rule)) {        
         return $wpinv_euvat->allow_vat_rules() ? 'digital' : 'physical';
     }
 
     return $vat_rule;
 }
-add_filter( 'wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule' );
+add_filter('wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule');
 
 /**
  * Filters the VAT class to ensure that each item has a VAT class.
  * 
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_class( $vat_class ) {
-    return empty( $vat_class ) ? '_standard' : $vat_class;
+function getpaid_filter_vat_class($vat_class) {
+    return empty($vat_class) ? '_standard' : $vat_class;
 }
-add_filter( 'wpinv_get_item_vat_class', 'getpaid_filter_vat_class' );
+add_filter('wpinv_get_item_vat_class', 'getpaid_filter_vat_class');
 
 /**
  * Returns the ip address location url.
  * 
  */
-function getpaid_ip_location_url( $ip_address ) {
+function getpaid_ip_location_url($ip_address) {
 
     return add_query_arg(
         array(
             'action'   => 'wpinv_ip_geolocation',
             'ip'       => $ip_address,
-            '_wpnonce' => wp_create_nonce( 'getpaid-ip-location' )
+            '_wpnonce' => wp_create_nonce('getpaid-ip-location')
         ),
-        admin_url( 'admin-ajax.php' )
+        admin_url('admin-ajax.php')
     );
 
 }
@@ -574,54 +574,54 @@ 
  * 
  * @return array|bool
  */
-function getpaid_geolocate_ip_address( $ip_address ) {
+function getpaid_geolocate_ip_address($ip_address) {
 
     // Do we have an ip address?
-    if ( empty( $ip_address ) ) {
+    if (empty($ip_address)) {
         return false;
     }
 
     /**
      * Retrieve ip address using max mind.
      */
-    if ( wpinv_get_option( 'vat_ip_lookup' ) == 'geoip2' && $geoip2_city = getpaid_tax()->geoip2_city_record( $ip_address ) ) {
+    if (wpinv_get_option('vat_ip_lookup') == 'geoip2' && $geoip2_city = getpaid_tax()->geoip2_city_record($ip_address)) {
 
         try {
             $iso        = $geoip2_city->country->isoCode;
             $country    = $geoip2_city->country->name;
-            $region     = ! empty( $geoip2_city->subdivisions ) && ! empty( $geoip2_city->subdivisions[0]->name ) ? $geoip2_city->subdivisions[0]->name : '';
+            $region     = !empty($geoip2_city->subdivisions) && !empty($geoip2_city->subdivisions[0]->name) ? $geoip2_city->subdivisions[0]->name : '';
             $city       = $geoip2_city->city->name;
             $longitude  = $geoip2_city->location->longitude;
             $latitude   = $geoip2_city->location->latitude;
-            $credit     = __( 'Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing' );
-        } catch( Exception $e ) { }
+            $credit     = __('Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing');
+        } catch (Exception $e) { }
 
     }
 
     // If that fails, GeoLocate using GeoPlugin.
-    if ( ( empty( $iso ) || empty( $longitude ) || empty( $latitude ) ) && function_exists( 'simplexml_load_file' ) ) {
+    if ((empty($iso) || empty($longitude) || empty($latitude)) && function_exists('simplexml_load_file')) {
 
         try {
-            $load_xml = simplexml_load_file( 'http://www.geoplugin.net/xml.gp?ip=' . $ip_address );
+            $load_xml = simplexml_load_file('http://www.geoplugin.net/xml.gp?ip=' . $ip_address);
             
-            if ( ! empty( $load_xml ) && isset( $load_xml->geoplugin_countryCode ) && ! empty( $load_xml->geoplugin_latitude ) && ! empty( $load_xml->geoplugin_longitude ) ) {
+            if (!empty($load_xml) && isset($load_xml->geoplugin_countryCode) && !empty($load_xml->geoplugin_latitude) && !empty($load_xml->geoplugin_longitude)) {
                 $iso        = $load_xml->geoplugin_countryCode;
                 $country    = $load_xml->geoplugin_countryName;
-                $region     = ! empty( $load_xml->geoplugin_regionName ) ? $load_xml->geoplugin_regionName : '';
-                $city       = ! empty( $load_xml->geoplugin_city ) ? $load_xml->geoplugin_city : '';
+                $region     = !empty($load_xml->geoplugin_regionName) ? $load_xml->geoplugin_regionName : '';
+                $city       = !empty($load_xml->geoplugin_city) ? $load_xml->geoplugin_city : '';
                 $longitude  = $load_xml->geoplugin_longitude;
                 $latitude   = $load_xml->geoplugin_latitude;
                 $credit     = $load_xml->geoplugin_credit;
-                $credit     = __( 'Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing' ) . '<br>' . $load_xml->geoplugin_credit;
+                $credit     = __('Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing') . '<br>' . $load_xml->geoplugin_credit;
             }
-        } catch( Exception $e ) { }
+        } catch (Exception $e) { }
 
     }
 
-   if ( empty( $iso )  ) {
+   if (empty($iso)) {
        return false;
    }
 
-   return compact( 'iso', 'country', 'region', 'city', 'longitude', 'latitude', 'credit' );
+   return compact('iso', 'country', 'region', 'city', 'longitude', 'latitude', 'credit');
 
 }