AyeCode / invoicing

uninstall.php

Indentation +2 added lines, -2 removed lines

@@ -68,13 +68,13 @@
     // Delete invoices table.
     $table = $wpdb->prefix . 'getpaid_invoices';
     if ( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $table ) ) === $table ) {
-	    $wpdb->query( $wpdb->prepare( 'DROP TABLE %s', $table ) );
+        $wpdb->query( $wpdb->prepare( 'DROP TABLE %s', $table ) );
     }
 
     // Delete invoice items table.
     $table = $wpdb->prefix . 'getpaid_invoice_items';
     if ( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $table ) ) === $table ) {
-	    $wpdb->query( $wpdb->prepare( 'DROP TABLE %s', $table ) );
+        $wpdb->query( $wpdb->prepare( 'DROP TABLE %s', $table ) );
     }
 
 }

Spacing +23 added lines, -23 removed lines

@@ -9,72 +9,72 @@
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
     exit;
 }
 
 global $wpdb, $wp_version;
 
-$remove_data = get_option( 'wpinv_remove_data_on_invoice_unistall' );
+$remove_data = get_option('wpinv_remove_data_on_invoice_unistall');
 
 /*
  * Only remove ALL product and page data if WPINV_REMOVE_ALL_DATA constant is set to true in user's
  * wp-config.php. This is to prevent data loss when deleting the plugin from the backend
  * and to ensure only the site owner can perform this action.
  */
-if ( defined( 'WPINV_REMOVE_ALL_DATA' ) ) {
+if (defined('WPINV_REMOVE_ALL_DATA')) {
     $remove_data = true === WPINV_REMOVE_ALL_DATA ? true : false;
 }
 
-if ( $remove_data ) {
+if ($remove_data) {
     // Load Invoicing file.
-    include_once( 'invoicing.php' );
+    include_once('invoicing.php');
 
     // Roles + caps.
-    include_once( dirname( __FILE__ ) . '/includes/admin/install.php' );
+    include_once(dirname(__FILE__) . '/includes/admin/install.php');
     wpinv_remove_admin_caps();
     
-    $settings = get_option( 'wpinv_settings' );
+    $settings = get_option('wpinv_settings');
     
     // Delete pages.
-    $wpi_pages = array( 'checkout_page', 'success_page', 'failure_page', 'invoice_history_page', 'quote_history_page', 'invoice_subscription_page' );
-    foreach ( $wpi_pages as $page ) {
-        if ( !empty( $page ) && !empty( $settings[ $page ] ) ) {
-            wp_delete_post( $settings[ $page ], true );
+    $wpi_pages = array('checkout_page', 'success_page', 'failure_page', 'invoice_history_page', 'quote_history_page', 'invoice_subscription_page');
+    foreach ($wpi_pages as $page) {
+        if (!empty($page) && !empty($settings[$page])) {
+            wp_delete_post($settings[$page], true);
         }
     }
     
     // Delete posts + data.
-    $wpdb->query( "DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'wpi_invoice', 'wpi_item', 'wpi_discount', 'wpi_quote' );" );
-    $wpdb->query( "DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;" );
+    $wpdb->query("DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'wpi_invoice', 'wpi_item', 'wpi_discount', 'wpi_quote' );");
+    $wpdb->query("DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;");
     
     // Delete comments.
-    $wpdb->query( "DELETE FROM {$wpdb->comments} WHERE comment_type LIKE 'wpinv_note';" );
-    $wpdb->query( "DELETE meta FROM {$wpdb->commentmeta} meta LEFT JOIN {$wpdb->comments} comments ON comments.comment_ID = meta.comment_id WHERE comments.comment_ID IS NULL;" );
+    $wpdb->query("DELETE FROM {$wpdb->comments} WHERE comment_type LIKE 'wpinv_note';");
+    $wpdb->query("DELETE meta FROM {$wpdb->commentmeta} meta LEFT JOIN {$wpdb->comments} comments ON comments.comment_ID = meta.comment_id WHERE comments.comment_ID IS NULL;");
     
     // Delete user meta.
-    $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE '%_wpinv_%' OR meta_key LIKE '%_wpi_invoice%' OR meta_key LIKE '%_wpi_item%' OR meta_key LIKE '%_wpi_discount%' OR meta_key LIKE '_wpi_stripe%' OR meta_key LIKE '%_wpi_quote%';" );
+    $wpdb->query("DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE '%_wpinv_%' OR meta_key LIKE '%_wpi_invoice%' OR meta_key LIKE '%_wpi_item%' OR meta_key LIKE '%_wpi_discount%' OR meta_key LIKE '_wpi_stripe%' OR meta_key LIKE '%_wpi_quote%';");
     
     // Cleanup Cron Schedule
-    wp_clear_scheduled_hook( 'wp_session_garbage_collection' );
-    wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
+    wp_clear_scheduled_hook('wp_session_garbage_collection');
+    wp_clear_scheduled_hook('wpinv_register_schedule_event_twicedaily');
     
     // Delete options.
-    $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpinv_%' OR option_name LIKE '_wpinv_%' OR option_name LIKE '\_transient\_wpinv\_%';" );
+    $wpdb->query("DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpinv_%' OR option_name LIKE '_wpinv_%' OR option_name LIKE '\_transient\_wpinv\_%';");
     
     // Clear any cached data that has been removed
     wp_cache_flush();
 
     // Delete invoices table.
     $table = $wpdb->prefix . 'getpaid_invoices';
-    if ( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $table ) ) === $table ) {
-	    $wpdb->query( $wpdb->prepare( 'DROP TABLE %s', $table ) );
+    if ($wpdb->get_var($wpdb->prepare('SHOW TABLES LIKE %s', $table)) === $table) {
+	    $wpdb->query($wpdb->prepare('DROP TABLE %s', $table));
     }
 
     // Delete invoice items table.
     $table = $wpdb->prefix . 'getpaid_invoice_items';
-    if ( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $table ) ) === $table ) {
-	    $wpdb->query( $wpdb->prepare( 'DROP TABLE %s', $table ) );
+    if ($wpdb->get_var($wpdb->prepare('SHOW TABLES LIKE %s', $table)) === $table) {
+	    $wpdb->query($wpdb->prepare('DROP TABLE %s', $table));
     }
 
 }

includes/wpinv-invoice-functions.php

Indentation +67 added lines, -67 removed lines

@@ -700,7 +700,7 @@ 
 }
 
 function wpinv_get_payment_key( $invoice_id = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice( $invoice_id );
     return $invoice->get_key();
 }
 
@@ -966,7 +966,7 @@ 
         return false;
     }
     $invoice = wpinv_get_invoice_cart();
-	if ( empty( $invoice ) ) {
+    if ( empty( $invoice ) ) {
         return false;
     }
 
@@ -1259,20 +1259,20 @@ 
 }
 
 function wpinv_checkout_get_cc_info() {
-	$cc_info = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
-	$cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
-	$cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
-	$cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
-
-	// Return cc info
-	return $cc_info;
+    $cc_info = array();
+    $cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
+    $cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
+    $cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
+    $cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
+    $cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
+    $cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
+    $cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
+    $cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
+    $cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
+    $cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
+
+    // Return cc info
+    return $cc_info;
 }
 
 function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
@@ -1479,7 +1479,7 @@ 
         $required_fields  = wpinv_checkout_required_fields();
 
         // Loop through required fields and show error messages
-         if ( !empty( $required_fields ) ) {
+            if ( !empty( $required_fields ) ) {
             foreach ( $required_fields as $field_name => $value ) {
                 if ( in_array( $value, $required_fields ) && empty( $_POST[ 'wpinv_' . $field_name ] ) ) {
                     wpinv_set_error( $value['error_id'], $value['error_message'] );
@@ -1582,7 +1582,7 @@ 
 }
 
 function wpinv_get_checkout_session() {
-	global $wpi_session;
+    global $wpi_session;
 
     return $wpi_session->get( 'wpinv_checkout' );
 }
@@ -1663,7 +1663,7 @@ 
         $response['data']['taxf']       = $invoice->get_tax( true );
         $response['data']['total']      = $invoice->get_total();
         $response['data']['totalf']     = $invoice->get_total( true );
-	    $response['data']['free']       = $invoice->is_free() && ( ! ( (float) $response['data']['total'] > 0 ) || $invoice->is_free_trial() ) ? true : false;
+        $response['data']['free']       = $invoice->is_free() && ( ! ( (float) $response['data']['total'] > 0 ) || $invoice->is_free_trial() ) ? true : false;
 
         wp_send_json( $response );
     }
@@ -1951,52 +1951,52 @@ 
  * Given an invoice key, this function returns the id.
  */
 function wpinv_get_invoice_id_by_key( $key ) {
-	global $wpdb;
+    global $wpdb;
     $table      = $wpdb->prefix . 'getpaid_invoices';
-	return (int) $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $table WHERE`key` = %s LIMIT 1", $key ) );
+    return (int) $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $table WHERE`key` = %s LIMIT 1", $key ) );
 }
 
 function wpinv_can_view_receipt( $invoice_key = '' ) {
-	$return = false;
+    $return = false;
 
-	if ( empty( $invoice_key ) ) {
-		return $return;
-	}
+    if ( empty( $invoice_key ) ) {
+        return $return;
+    }
 
-	global $wpinv_receipt_args;
+    global $wpinv_receipt_args;
 
-	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
-	if ( isset( $_GET['invoice-id'] ) ) {
-		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
-	}
+    $wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
+    if ( isset( $_GET['invoice-id'] ) ) {
+        $wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
+    }
 
-	if ( empty( $wpinv_receipt_args['id'] ) ) {
-		return $return;
-	}
+    if ( empty( $wpinv_receipt_args['id'] ) ) {
+        return $return;
+    }
 
-	$invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
-	if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
-		return $return;
-	}
+    $invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
+    if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
+        return $return;
+    }
 
-	if ( is_user_logged_in() ) {
-		if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
-			$return = true;
-		}
-	}
+    if ( is_user_logged_in() ) {
+        if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
+            $return = true;
+        }
+    }
 
-	$session = wpinv_get_checkout_session();
-	if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
-		$check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
+    $session = wpinv_get_checkout_session();
+    if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
+        $check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
 
-		if ( wpinv_require_login_to_checkout() ) {
-			$return = $return && $check_key === $invoice_key;
-		} else {
-			$return = $check_key === $invoice_key;
-		}
-	}
+        if ( wpinv_require_login_to_checkout() ) {
+            $return = $return && $check_key === $invoice_key;
+        } else {
+            $return = $check_key === $invoice_key;
+        }
+    }
 
-	return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
+    return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
 }
 
 function wpinv_pay_for_invoice() {
@@ -2306,14 +2306,14 @@ 
 
     if ( isset( $_GET['invoice_key'] ) || is_singular( 'wpi_invoice' ) || is_singular( 'wpi_quote' ) ) {
         $invoice_key = isset( $_GET['invoice_key'] ) ? urldecode($_GET['invoice_key']) : '';
-	    global $post;
+        global $post;
 
         if(!empty($invoice_key)){
-	        $invoice_id = wpinv_get_invoice_id_by_key($invoice_key);
+            $invoice_id = wpinv_get_invoice_id_by_key($invoice_key);
         } else if(!empty( $post ) && ($post->post_type == 'wpi_invoice' || $post->post_type == 'wpi_quote')) {
-			$invoice_id = $post->ID;
+            $invoice_id = $post->ID;
         } else {
-        	return;
+            return;
         }
 
         $invoice = new WPInv_Invoice($invoice_id);
@@ -2322,17 +2322,17 @@ 
             return;
         }
 
-	    if ( is_user_logged_in() ) {
-		    if ( (int)$invoice->get_user_id() === get_current_user_id() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    }
-	    } else {
-		    if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    }
-	    }
+        if ( is_user_logged_in() ) {
+            if ( (int)$invoice->get_user_id() === get_current_user_id() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            }
+        } else {
+            if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            }
+        }
     }
 
 }

Spacing +777 added lines, -777 removed lines

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

Braces +18 added lines, -14 removed lines

@@ -568,8 +568,9 @@ 
 
     $invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = %s LIMIT 1", $key ) );
 
-    if ( $invoice_id != NULL )
-        return $invoice_id;
+    if ( $invoice_id != NULL ) {
+            return $invoice_id;
+    }
 
     return 0;
 }
@@ -1278,8 +1279,9 @@ 
 function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
     $ret = false;
 
-    if ( empty( $zip ) || empty( $country_code ) )
-        return $ret;
+    if ( empty( $zip ) || empty( $country_code ) ) {
+            return $ret;
+    }
 
     $country_code = strtoupper( $country_code );
 
@@ -1441,8 +1443,9 @@ 
         "ZM" => "\d{5}"
     );
 
-    if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) )
-        $ret = true;
+    if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) ) {
+            $ret = true;
+    }
 
     return apply_filters( 'wpinv_is_zip_valid', $ret, $zip, $country_code );
 }
@@ -1807,14 +1810,15 @@ 
         }
     }
 
-    if ( get_query_var( 'paged' ) )
-        $args['page'] = get_query_var('paged');
-    else if ( get_query_var( 'page' ) )
-        $args['page'] = get_query_var( 'page' );
-    else if ( !empty( $args[ 'page' ] ) )
-        $args['page'] = $args[ 'page' ];
-    else
-        $args['page'] = 1;
+    if ( get_query_var( 'paged' ) ) {
+            $args['page'] = get_query_var('paged');
+    } else if ( get_query_var( 'page' ) ) {
+            $args['page'] = get_query_var( 'page' );
+    } else if ( !empty( $args[ 'page' ] ) ) {
+            $args['page'] = $args[ 'page' ];
+    } else {
+            $args['page'] = 1;
+    }
 
     /**
      * Generate WP_Query args. This logic will change if orders are moved to

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

Spacing +638 added lines, -638 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -13,19 +13,19 @@ 
 
     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);
             }
 
-            if ( method_exists( $this, "frontend_render_{$element}_template" ) ) {
-                add_action( "wpinv_frontend_render_payment_form_$element", array( $this, "frontend_render_{$element}_template" ), 10, 3 );
+            if (method_exists($this, "frontend_render_{$element}_template")) {
+                add_action("wpinv_frontend_render_payment_form_$element", array($this, "frontend_render_{$element}_template"), 10, 3);
             }
 
         }
@@ -37,7 +37,7 @@ 
      */
     public function get_elements() {
 
-        if ( ! empty( $this->elements ) ) {
+        if (!empty($this->elements)) {
             return $this->elements;
         }
 
@@ -45,28 +45,28 @@ 
 
             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,
                 )
             ),
@@ -82,11 +82,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,
                 )
@@ -94,11 +94,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,
                 )
@@ -106,27 +106,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,
                 )
@@ -134,23 +134,23 @@ 
 
             array( 
                 'type' => 'radio',
-                'name' => __( 'Multiple Choice', 'invoicing' ),
+                'name' => __('Multiple Choice', '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,
                 )
@@ -158,10 +158,10 @@ 
 
             array( 
                 'type' => 'time',
-                'name' => __( 'Time', 'invoicing' ),
+                'name' => __('Time', 'invoicing'),
                 'defaults' => array(
                     'value'        => '',
-                    'label'        => __( 'Time', 'invoicing' ),
+                    'label'        => __('Time', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -169,11 +169,11 @@ 
 
             array( 
                 'type' => 'number',
-                'name' => __( 'Number', 'invoicing' ),
+                'name' => __('Number', 'invoicing'),
                 'defaults' => array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Number', 'invoicing' ),
+                    'label'        => __('Number', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -181,11 +181,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,
                 )
@@ -193,11 +193,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,
                 )
@@ -205,14 +205,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,
@@ -222,7 +222,7 @@ 
                         array(
                             'placeholder'  => 'Snow',
                             'value'        => '',
-                            'label'        => __( 'Last Name', 'invoicing' ),
+                            'label'        => __('Last Name', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -232,7 +232,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'Address', 'invoicing' ),
+                            'label'        => __('Address', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -242,7 +242,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'City', 'invoicing' ),
+                            'label'        => __('City', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -250,9 +250,9 @@ 
                         ),
 
                         array(
-                            'placeholder'  => __( 'Select your country' ),
+                            'placeholder'  => __('Select your country'),
                             'value'        => '',
-                            'label'        => __( 'Country', 'invoicing' ),
+                            'label'        => __('Country', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -260,9 +260,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,
@@ -272,7 +272,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'ZIP / Postcode', 'invoicing' ),
+                            'label'        => __('ZIP / Postcode', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -282,7 +282,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'Phone', 'invoicing' ),
+                            'label'        => __('Phone', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -292,7 +292,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'Company', 'invoicing' ),
+                            'label'        => __('Company', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => false,
@@ -302,7 +302,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'VAT Number', 'invoicing' ),
+                            'label'        => __('VAT Number', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => false,
@@ -314,11 +314,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,
                 )
@@ -337,7 +337,7 @@ 
 
             array( 
                 'type' => 'items',
-                'name' => __( 'Items', 'invoicing' ),
+                'name' => __('Items', 'invoicing'),
                 'defaults'  => array(
                     'value'        => '',
                     'items_type'   => 'total',
@@ -348,10 +348,10 @@ 
 
             array(
                 'type' => 'terms',
-                'name' => __( 'Terms', 'invoicing' ),
+                'name' => __('Terms', 'invoicing'),
                 'defaults'         => array(
                     'value'        => '',
-                    'text'         => __( 'I\'ve read and accept the <a href="" target="_blank">terms &amp; conditions</a>', 'invoicing' ),
+                    'text'         => __('I\'ve read and accept the <a href="" target="_blank">terms &amp; conditions</a>', 'invoicing'),
                     'description'  => '',
                     'required'     => true,
                 )
@@ -359,34 +359,34 @@ 
 
             array(
                 'type' => 'privacy',
-                'name' => __( 'Privacy', 'invoicing' ),
+                'name' => __('Privacy', 'invoicing'),
                 'defaults'         => array(
                     'value'        => '',
-                    'text'         => __( 'Your personal data will be used to process your invoice, payment and for other purposes described in our privacy policy.', 'invoicing' ),
+                    'text'         => __('Your personal data will be used to process your invoice, payment and for other purposes described in our privacy policy.', 'invoicing'),
                 )
             ),
 
             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,
                 )
             )
         );
 
-        $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\"";
     }
@@ -394,15 +394,15 @@ 
     /**
      * 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 title element on the frontend.
      */
-    public function frontend_render_heading_template( $field ) {
+    public function frontend_render_heading_template($field) {
         $tag = $field['level'];
         echo "<$tag>{$field['text']}</$tag>";
     }
@@ -410,10 +410,10 @@ 
     /**
      * 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"';
 
@@ -445,8 +445,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>";
     }
@@ -454,8 +454,8 @@ 
     /**
      * Renders a privacy element template.
      */
-    public function render_privacy_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'privacy' );
+    public function render_privacy_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'privacy');
         $label    = "$field.text";
         echo "<p $restrict v-html='$label' style='font-size: 16px;'></p>";
     }
@@ -463,23 +463,23 @@ 
     /**
      * Renders the paragraph element on the frontend.
      */
-    public function frontend_render_paragraph_template( $field ) {
+    public function frontend_render_paragraph_template($field) {
         echo "<p>{$field['text']}</p>";
     }
 
     /**
      * Renders the privacy element on the frontend.
      */
-    public function frontend_render_privacy_template( $field ) {
+    public function frontend_render_privacy_template($field) {
         echo "<p>{$field['text']}</p>";
     }
 
     /**
      * 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>
@@ -495,9 +495,9 @@ 
     /**
      * Renders the edit privacy element template.
      */
-    public function edit_privacy_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'privacy' );
-        $label    = __( 'Privacy Text', 'invoicing' );
+    public function edit_privacy_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'privacy');
+        $label    = __('Privacy Text', 'invoicing');
         $id       = $field . '.id + "_edit"';
         echo "
             <div $restrict>
@@ -513,8 +513,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'>
@@ -529,23 +529,23 @@ 
     /**
      * Renders the text element on the frontend.
      */
-    public function frontend_render_text_template( $field ) {
+    public function frontend_render_text_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
-                'placeholder'=> esc_attr( $field['placeholder'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
+                'placeholder'=> esc_attr($field['placeholder']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -556,16 +556,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>
@@ -593,8 +593,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'>
@@ -609,24 +609,24 @@ 
     /**
      * Renders the textarea element on the frontend.
      */
-    public function frontend_render_textarea_template( $field ) {
+    public function frontend_render_textarea_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->textarea(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
-                'placeholder'=> esc_attr( $field['placeholder'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
+                'placeholder'=> esc_attr($field['placeholder']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
                 'rows'       => 3,
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -637,16 +637,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>
@@ -674,8 +674,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';
@@ -695,24 +695,24 @@ 
     /**
      * Renders the select element on the frontend.
      */
-    public function frontend_render_select_template( $field ) {
+    public function frontend_render_select_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->select(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
-                'placeholder'=> esc_attr( $field['placeholder'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
+                'placeholder'=> esc_attr($field['placeholder']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'options'    => array_combine( $field['options'], $field['options'] ),
+                'options'    => array_combine($field['options'], $field['options']),
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -723,18 +723,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'>
@@ -772,8 +772,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>
@@ -787,8 +787,8 @@ 
     /**
      * Renders the terms element template.
      */
-    public function render_terms_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'terms' );
+    public function render_terms_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'terms');
         echo "
             <div class='form-check' $restrict>
                 <div class='wpinv-payment-form-field-preview-overlay'></div>
@@ -802,24 +802,24 @@ 
     /**
      * Renders the checkbox element on the frontend.
      */
-    public function frontend_render_checkbox_template( $field ) {
+    public function frontend_render_checkbox_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'value'      => esc_attr__( 'Yes', 'invoicing' ),
+                'value'      => esc_attr__('Yes', 'invoicing'),
                 'type'       => 'checkbox',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -830,24 +830,24 @@ 
         /**
      * Renders the terms element on the frontend.
      */
-    public function frontend_render_terms_template( $field ) {
+    public function frontend_render_terms_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['text'] ),
+                'label'      => wp_kses_post($field['text']),
                 'no_wrap'    => true,
-                'value'      => esc_attr__( 'Yes', 'invoicing' ),
+                'value'      => esc_attr__('Yes', 'invoicing'),
                 'type'       => 'checkbox',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -858,14 +858,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>
@@ -889,14 +889,14 @@ 
     /**
      * Renders the edit terms element template.
      */
-    public function edit_terms_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'terms' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_terms_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'terms');
+        $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>
@@ -920,8 +920,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 "
@@ -940,20 +940,20 @@ 
     /**
      * Renders the radio element on the frontend.
      */
-    public function frontend_render_radio_template( $field ) {
+    public function frontend_render_radio_template($field) {
         
         echo "<div class='form-group'>";
 
-        if ( ! empty( $field['label'] ) ) {
-            $label = wp_kses_post( $field['label'] );
+        if (!empty($field['label'])) {
+            $label = wp_kses_post($field['label']);
             echo "<legend class='col-form-label'>$label</legend>";
         }
 
-        foreach( $field['options'] as $index => $option ) {
+        foreach ($field['options'] as $index => $option) {
             $id    = $field['id'] . $index;
             $name  = $field['id'];
-            $value = esc_attr( $option );
-            $label = wp_kses_post( $option );
+            $value = esc_attr($option);
+            $label = wp_kses_post($option);
 
             echo "
                 <div class='form-check'>
@@ -963,8 +963,8 @@ 
             ";
         }
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -975,16 +975,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'>
@@ -1018,8 +1018,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>
@@ -1041,55 +1041,55 @@ 
     /**
      * Renders the address element on the frontend.
      */
-    public function frontend_render_address_template( $field ) {
+    public function frontend_render_address_template($field) {
         
         echo "<div class='wpinv-address-fields'>";
 
-        foreach( $field['fields'] as $address_field ) {
+        foreach ($field['fields'] as $address_field) {
 
-            if ( empty( $address_field['visible'] ) ) {
+            if (empty($address_field['visible'])) {
                 continue;
             }
 
-            $class = esc_attr( $address_field['name'] );
+            $class = esc_attr($address_field['name']);
             echo "<div class='form-group $class'>";
 
             $label = $address_field['label'];
 
-            if ( ! empty( $address_field['required'] ) ) {
+            if (!empty($address_field['required'])) {
                 $label .= "<span class='text-danger'> *</span>";
             }
 
-            if ( 'wpinv_country' == $address_field['name'] ) {
+            if ('wpinv_country' == $address_field['name']) {
 
-                echo aui()->select( array(
+                echo aui()->select(array(
                     'options'          => wpinv_get_country_list(),
-                    'name'             => esc_attr( $address_field['name'] ),
-                    'id'               => esc_attr( $address_field['name'] ),
+                    'name'             => esc_attr($address_field['name']),
+                    'id'               => esc_attr($address_field['name']),
                     'value'            => wpinv_get_default_country(),
-                    'placeholder'      => esc_attr( $address_field['placeholder'] ),
+                    '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,
                 ));
     
-            } else if ( 'wpinv_state' == $address_field['name'] ) {
+            } else if ('wpinv_state' == $address_field['name']) {
 
-                $states = wpinv_get_country_states( wpinv_get_default_country() );
+                $states = wpinv_get_country_states(wpinv_get_default_country());
                 $state  = wpinv_get_default_state();
 
-                if ( ! empty( $states ) ) {
+                if (!empty($states)) {
 
-                    echo aui()->select( array(
+                    echo aui()->select(array(
                         'options'          => $states,
-                        'name'             => esc_attr( $address_field['name'] ),
-                        'id'               => esc_attr( $address_field['name'] ),
+                        'name'             => esc_attr($address_field['name']),
+                        'id'               => esc_attr($address_field['name']),
                         'value'            => $state,
-                        'placeholder'      => esc_attr( $address_field['placeholder'] ),
+                        '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,
                     ));
 
@@ -1097,10 +1097,10 @@ 
 
                     echo 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',
                         )
@@ -1112,12 +1112,12 @@ 
 
                 echo 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,
-                        'placeholder' => esc_attr( $address_field['placeholder'] ),
+                        'placeholder' => esc_attr($address_field['placeholder']),
                         'type'       => 'text',
                     )
                 );
@@ -1125,8 +1125,8 @@ 
             }
             
 
-            if ( ! empty( $address_field['description'] ) ) {
-                $description = wp_kses_post( $address_field['description'] );
+            if (!empty($address_field['description'])) {
+                $description = wp_kses_post($address_field['description']);
                 echo "<small class='form-text text-muted'>$description</small>";
             }
     
@@ -1141,13 +1141,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"';
@@ -1215,8 +1215,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'>
@@ -1231,8 +1231,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>
@@ -1246,24 +1246,24 @@ 
     /**
      * Renders the email element on the frontend.
      */
-    public function frontend_render_email_template( $field ) {
+    public function frontend_render_email_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'placeholder' => esc_attr($field['placeholder']),
                 'type'       => 'email',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1274,30 +1274,30 @@ 
     /**
      * Renders the billing email element on the frontend.
      */
-    public function frontend_render_billing_email_template( $field ) {
+    public function frontend_render_billing_email_template($field) {
         
         echo "<div class='form-group'>";
         $value = '';
 
-        if ( is_user_logged_in() ) {
+        if (is_user_logged_in()) {
             $user  = wp_get_current_user();
-            $value = sanitize_email( $user->user_email );
+            $value = sanitize_email($user->user_email);
         }
         echo aui()->input(
             array(
                 'name'       => 'billing_email',
                 'value'      => $value,
-                'id'         => esc_attr( $field['id'] ),
+                'id'         => esc_attr($field['id']),
                 'required'   => true,
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'placeholder' => esc_attr($field['placeholder']),
                 'type'       => 'email',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1308,16 +1308,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>
@@ -1345,16 +1345,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>
@@ -1378,8 +1378,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'>
@@ -1394,24 +1394,24 @@ 
     /**
      * Renders the website element on the frontend.
      */
-    public function frontend_render_website_template( $field ) {
+    public function frontend_render_website_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'placeholder' => esc_attr($field['placeholder']),
                 'type'       => 'url',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1422,16 +1422,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>
@@ -1459,8 +1459,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'>
@@ -1475,23 +1475,23 @@ 
     /**
      * Renders the date element on the frontend.
      */
-    public function frontend_render_date_template( $field ) {
+    public function frontend_render_date_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
                 'type'       => 'date',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1502,14 +1502,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>
@@ -1533,8 +1533,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'>
@@ -1549,23 +1549,23 @@ 
     /**
      * Renders the time element on the frontend.
      */
-    public function frontend_render_time_template( $field ) {
+    public function frontend_render_time_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
                 'type'       => 'time',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1576,14 +1576,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>
@@ -1607,8 +1607,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'>
@@ -1623,24 +1623,24 @@ 
     /**
      * Renders the number element on the frontend.
      */
-    public function frontend_render_number_template( $field ) {
+    public function frontend_render_number_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'label'      => wp_kses_post($field['label']),
+                'placeholder' => esc_attr($field['placeholder']),
                 'no_wrap'    => true,
                 'type'       => 'number',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1651,16 +1651,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>
@@ -1688,23 +1688,23 @@ 
     /**
      * 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 mt-0 mb-2' $restrict>";
     }
 
     /**
      * Renders the separator element on the frontend.
      */
-    public function frontend_render_separator_template( $field ) {
+    public function frontend_render_separator_template($field) {
         echo '<hr class="featurette-divider mt-0 mb-2" />';
     }
 
     /**
      * 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>
@@ -1717,28 +1717,28 @@ 
     /**
      * Renders the pay_button element on the frontend.
      */
-    public function frontend_render_pay_button_template( $field ) {
+    public function frontend_render_pay_button_template($field) {
 
         echo "<div class='mt-4 mb-4'>";
-            do_action( 'wpinv_payment_mode_select' );
+            do_action('wpinv_payment_mode_select');
         echo "</div>";
 
         echo "<div class='form-group'>";
 
-        $class = 'wpinv-payment-form-submit btn btn-block submit-button ' . sanitize_html_class( $field['class'] );
+        $class = 'wpinv-payment-form-submit btn btn-block submit-button ' . sanitize_html_class($field['class']);
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
-                'value'      => esc_attr( $field['label'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
+                'value'      => esc_attr($field['label']),
                 'no_wrap'    => true,
                 'type'       => 'submit',
                 'class'      => $class,
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1749,14 +1749,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 "
             <div $restrict>
@@ -1772,15 +1772,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>
@@ -1791,8 +1791,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'>
@@ -1807,15 +1807,15 @@ 
     /**
      * Renders the alert element on the frontend.
      */
-    public function frontend_render_alert_template( $field ) {
+    public function frontend_render_alert_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->alert(
             array(
-                'content'     => wp_kses_post( $field['text'] ),
+                'content'     => wp_kses_post($field['text']),
                 'dismissible' => $field['dismissible'],
-                'type'        => str_replace( 'alert-', '', $field['class'] ),
+                'type'        => str_replace('alert-', '', $field['class']),
             )
         );
 
@@ -1826,14 +1826,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>
@@ -1849,14 +1849,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>
@@ -1867,8 +1867,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">
@@ -1885,13 +1885,13 @@ 
     /**
      * Renders the discount element on the frontend.
      */
-    public function frontend_render_discount_template( $field ) {
+    public function frontend_render_discount_template($field) {
         
-        $placeholder = esc_attr( $field['input_label'] );
-        $label       = sanitize_text_field( $field['button_label'] );
+        $placeholder = esc_attr($field['input_label']);
+        $label       = sanitize_text_field($field['button_label']);
         $description = '';
 
-        if ( ! empty( $field['description'] ) ) {
+        if (!empty($field['description'])) {
             $description = "<small class='form-text text-muted'>{$field['description']}</small>";
         }
 ?>
@@ -1912,12 +1912,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"';
@@ -1946,12 +1946,12 @@ 
     /**
      * Renders the items element template.
      */
-    public function render_items_template( $field ) {
-        $restrict  = $this->get_restrict_markup( $field, 'items' );
-        $label     = __( 'Item totals will appear here. Click to set items.', 'invoicing' );
-        $label2    = __( 'Your form allows customers to buy several recurring items. This is not supported and will lead to unexpected behaviour.', 'invoicing' );
-        $label2   .= ' ' . __( 'To prevent this, limit customers to selecting a single item.', 'invoicing' );
-        $label3    = __( 'Item totals will appear here.', 'invoicing' );
+    public function render_items_template($field) {
+        $restrict  = $this->get_restrict_markup($field, 'items');
+        $label     = __('Item totals will appear here. Click to set items.', 'invoicing');
+        $label2    = __('Your form allows customers to buy several recurring items. This is not supported and will lead to unexpected behaviour.', 'invoicing');
+        $label2   .= ' ' . __('To prevent this, limit customers to selecting a single item.', 'invoicing');
+        $label3    = __('Item totals will appear here.', 'invoicing');
         echo "
             <div $restrict class='item_totals text-center'>
                 <div v-if='!is_default'>
@@ -1968,17 +1968,17 @@ 
     /**
      * Renders the items element on the frontend.
      */
-    public function frontend_render_items_template( $field, $items ) {
+    public function frontend_render_items_template($field, $items) {
 
         echo "<div class='form-group item_totals'>";
         
-        $id = esc_attr( $field['id'] );
+        $id = esc_attr($field['id']);
 
-        if ( empty( $field[ 'items_type' ] ) ) {
-            $field[ 'items_type' ] = 'total';
+        if (empty($field['items_type'])) {
+            $field['items_type'] = 'total';
         }
 
-        if ( 'total' == $field[ 'items_type' ] ) {
+        if ('total' == $field['items_type']) {
             $total     = 0;
             $tax       = 0;
             $sub_total = 0;
@@ -1987,16 +1987,16 @@ 
             <div class="border item_totals_type_total">
 
                 <?php
-                    foreach( $items as $item ) {
+                    foreach ($items as $item) {
 
-                        $amount = floatval( $item['price'] );
+                        $amount = floatval($item['price']);
 
-                        if ( wpinv_use_taxes() ) {
+                        if (wpinv_use_taxes()) {
 
-                            $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                            $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                            if ( wpinv_prices_include_tax() ) {
-                                $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                            if (wpinv_prices_include_tax()) {
+                                $pre_tax  = ($amount - $amount * $rate * 0.01);
                                 $item_tax = $amount - $pre_tax;
                             } else {
                                 $pre_tax  = $amount;
@@ -2008,32 +2008,32 @@ 
                             $total     = $sub_total + $tax;
 
                         } else {
-                            $total  = $total + $amount;
+                            $total = $total + $amount;
                         }
 
                         $class  = 'col-8';
                         $class2 = '';
 
-                        if ( ! empty( $item['allow_quantities'] ) ) {
+                        if (!empty($item['allow_quantities'])) {
                             $class = 'col-6 pt-2';
                             $class2 = 'pt-2';
                         }
 
-                        if ( ! empty( $item['custom_price'] ) ) {
+                        if (!empty($item['custom_price'])) {
                             $class .= ' pt-2';
                         }
 
                         $quantity = 1;
-                        if ( ! empty( $item['quantity'] ) ) {
-                            $quantity = absint( $item['quantity'] );
+                        if (!empty($item['quantity'])) {
+                            $quantity = absint($item['quantity']);
                         }
             
                 ?>
                     <div  class="item_totals_item">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='<?php echo $quantity ?>' min='1' required>
@@ -2041,11 +2041,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='<?php echo $quantity ?>'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='wpinv-items[<?php echo (int) $item['id']; ?>]' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='wpinv-items[<?php echo (int) $item['id']; ?>]' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -2053,15 +2053,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='text' name='wpinv-items[<?php echo (int) $item['id']; ?>]' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='text' name='wpinv-items[<?php echo (int) $item['id']; ?>]' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -2072,28 +2072,28 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total p-2'>
 
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
 
                     <div class='row'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
 
                 </div>
@@ -2101,22 +2101,22 @@ 
             </div>
         <?php } ?>
 
-        <?php if ( 'radio' == $field[ 'items_type' ] ) { ?>
+        <?php if ('radio' == $field['items_type']) { ?>
             <div class="item_totals_type_radio">
 
                 <?php
-                    foreach( $items as $index => $item ) {
+                    foreach ($items as $index => $item) {
 
-                        if ( ! empty( $item['required'] ) ) {
+                        if (!empty($item['required'])) {
                             continue;
                         }
                 ?>
                     <div  class="form-check">
-                        <input class='form-check-input wpinv-items-selector' <?php checked( ! isset( $selected_radio_item ) ); $selected_radio_item = 1; ?> type='radio' value='<?php echo $item['id']; ?>' id='<?php echo $id . $index; ?>' name='wpinv-payment-form-selected-item'>
-                        <label class='form-check-label' for='<?php echo $id . $index; ?>'><?php echo sanitize_text_field( $item['title'] ); ?>&nbsp;<strong><?php echo wpinv_price( wpinv_format_amount( (float) sanitize_text_field(  $item['price'] ) ) ); ?></strong></label>
+                        <input class='form-check-input wpinv-items-selector' <?php checked(!isset($selected_radio_item)); $selected_radio_item = 1; ?> type='radio' value='<?php echo $item['id']; ?>' id='<?php echo $id . $index; ?>' name='wpinv-payment-form-selected-item'>
+                        <label class='form-check-label' for='<?php echo $id . $index; ?>'><?php echo sanitize_text_field($item['title']); ?>&nbsp;<strong><?php echo wpinv_price(wpinv_format_amount((float) sanitize_text_field($item['price']))); ?></strong></label>
                     </div>
-                    <?php if ( ! empty( $item['description'] )) { ?>
-                        <small class='form-text text-muted pl-4 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                    <?php if (!empty($item['description'])) { ?>
+                        <small class='form-text text-muted pl-4 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                     <?php } ?>
                 <?php } ?>
 
@@ -2128,32 +2128,32 @@ 
                         $tax       = 0;
                         $sub_total = 0;
 
-                        foreach ( $items as $item ) {
+                        foreach ($items as $item) {
 
                             $class  = 'col-8';
                             $class2 = '';
 
-                            if ( ! empty( $item['allow_quantities'] ) ) {
+                            if (!empty($item['allow_quantities'])) {
                                 $class = 'col-6 pt-2';
                                 $class2 = 'pt-2';
                             }
 
-                            if ( ! empty( $item['custom_price'] ) ) {
+                            if (!empty($item['custom_price'])) {
                                 $class .= ' pt-2';
                             }
 
                             $class3 = 'd-none';
                             $name   = '';
-                            if ( ! empty( $item['required'] ) || ! isset( $totals_selected_radio_item ) ) {
+                            if (!empty($item['required']) || !isset($totals_selected_radio_item)) {
 
-                                $amount = floatval( $item['price'] );
+                                $amount = floatval($item['price']);
 
-                                if ( wpinv_use_taxes() ) {
+                                if (wpinv_use_taxes()) {
 
-                                    $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                                    $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                                    if ( wpinv_prices_include_tax() ) {
-                                        $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                                    if (wpinv_prices_include_tax()) {
+                                        $pre_tax  = ($amount - $amount * $rate * 0.01);
                                         $item_tax = $amount - $pre_tax;
                                     } else {
                                         $pre_tax  = $amount;
@@ -2165,13 +2165,13 @@ 
                                     $total     = $sub_total + $tax;
 
                                 } else {
-                                    $total  = $total + $amount;
+                                    $total = $total + $amount;
                                 }
 
                                 $class3 = '';
                                 $name   = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_radio_item = 1;
                                 }
 
@@ -2183,9 +2183,9 @@ 
 
                     <div  class="item_totals_item <?php echo $class3; ?>" data-id="<?php echo (int) $item['id']; ?>">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -2193,11 +2193,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -2205,15 +2205,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='text' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='text' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -2224,27 +2224,27 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total p-2'>
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
 
                     <div class='row'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
 
@@ -2252,22 +2252,22 @@ 
             </div>
         <?php } ?>
 
-        <?php if ( 'checkbox' == $field[ 'items_type' ] ) { ?>
+        <?php if ('checkbox' == $field['items_type']) { ?>
 
             <div class="item_totals_type_checkbox">
 
                 <?php
-                    foreach ( $items as $index => $item ) {
+                    foreach ($items as $index => $item) {
 
-                        if ( ! empty( $item['required'] ) ) {
+                        if (!empty($item['required'])) {
                             continue;
                         }
 
-                        $title = sanitize_text_field(  $item['title'] );
-                        $price = wpinv_price( wpinv_format_amount( (float) sanitize_text_field(  $item['price'] ) ) );
-                        $item_id    = esc_attr( $id . "_$index" );
-                        $value = esc_attr( $item['id'] );
-                        $checked = checked( ! isset( $selected_checkbox_item ), true, false );
+                        $title = sanitize_text_field($item['title']);
+                        $price = wpinv_price(wpinv_format_amount((float) sanitize_text_field($item['price'])));
+                        $item_id = esc_attr($id . "_$index");
+                        $value = esc_attr($item['id']);
+                        $checked = checked(!isset($selected_checkbox_item), true, false);
                         $selected_checkbox_item = 1;
 
                         echo "
@@ -2276,7 +2276,7 @@ 
                                 <label for='$item_id' class='custom-control-label'>$title &nbsp; ($price)</label>
                             </div>";
 
-                        if ( ! empty( $item['description'] ) ) {
+                        if (!empty($item['description'])) {
                             echo "<small class='form-text text-muted'>{$item['description']}</small>";
                         }
                     }
@@ -2290,31 +2290,31 @@ 
                         $tax       = 0;
                         $sub_total = 0;
 
-                        foreach ( $items as $item ) {
+                        foreach ($items as $item) {
 
                             $class  = 'col-8';
                             $class2 = '';
 
-                            if ( ! empty( $item['allow_quantities'] ) ) {
+                            if (!empty($item['allow_quantities'])) {
                                 $class = 'col-6 pt-2';
                                 $class2 = 'pt-2';
                             }
 
-                            if ( ! empty( $item['custom_price'] ) ) {
+                            if (!empty($item['custom_price'])) {
                                 $class .= ' pt-2';
                             }
 
                             $class3 = 'd-none';
-                            $name  = '';
-                            if ( ! empty( $item['required'] ) || ! isset( $totals_selected_checkbox_item ) ) {
+                            $name = '';
+                            if (!empty($item['required']) || !isset($totals_selected_checkbox_item)) {
 
-                                $amount = floatval( $item['price'] );
-                                if ( wpinv_use_taxes() ) {
+                                $amount = floatval($item['price']);
+                                if (wpinv_use_taxes()) {
 
-                                    $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                                    $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                                    if ( wpinv_prices_include_tax() ) {
-                                        $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                                    if (wpinv_prices_include_tax()) {
+                                        $pre_tax  = ($amount - $amount * $rate * 0.01);
                                         $item_tax = $amount - $pre_tax;
                                     } else {
                                         $pre_tax  = $amount;
@@ -2326,13 +2326,13 @@ 
                                     $total     = $sub_total + $tax;
 
                                 } else {
-                                    $total  = $total + $amount;
+                                    $total = $total + $amount;
                                 }
 
                                 $class3 = '';
-                                $name  = "wpinv-items[{$item['id']}]";
+                                $name = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_checkbox_item = 1;
                                 }
 
@@ -2344,9 +2344,9 @@ 
 
                     <div  class="item_totals_item <?php echo $class3; ?>" data-id="<?php echo (int) $item['id']; ?>">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -2354,11 +2354,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -2366,15 +2366,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='text' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='text' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -2385,35 +2385,35 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total p-2'>
 
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
 
                     <div class='row'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
             </div>
             </div>
         <?php } ?>
 
-        <?php if ( 'select' == $field[ 'items_type' ] ) { ?>
+        <?php if ('select' == $field['items_type']) { ?>
 
             <div class="item_totals_type_select">
 
@@ -2421,17 +2421,17 @@ 
 
                     $options  = array();
                     $selected = '';
-                    foreach ( $items as $index => $item ) {
+                    foreach ($items as $index => $item) {
 
-                        if ( ! empty( $item['required'] ) ) {
+                        if (!empty($item['required'])) {
                             continue;
                         }
 
-                        $title = sanitize_text_field(  $item['title'] );
-                        $price = wpinv_price( wpinv_format_amount( (float) sanitize_text_field(  $item['price'] ) ) );
-                        $options[ $item['id'] ] = "$title &nbsp; ($price)";
+                        $title = sanitize_text_field($item['title']);
+                        $price = wpinv_price(wpinv_format_amount((float) sanitize_text_field($item['price'])));
+                        $options[$item['id']] = "$title &nbsp; ($price)";
 
-                        if ( ! isset( $selected_item ) ) {
+                        if (!isset($selected_item)) {
                             $selected = $item['id'];
                             $selected_item = 1;
                         }
@@ -2442,7 +2442,7 @@ 
                         array(
                                 'name'        => 'payment-form-items',
                                 'id'          => $id,
-                                'placeholder' => __( 'Select an item', 'invoicing' ),
+                                'placeholder' => __('Select an item', 'invoicing'),
                                 'no_wrap'     => true,
                                 'options'     => $options,
                                 'class'       => 'wpi_select2 wpinv-items-select-selector',
@@ -2459,31 +2459,31 @@ 
                         $tax       = 0;
                         $sub_total = 0;
 
-                        foreach ( $items as $item ) {
+                        foreach ($items as $item) {
 
                             $class  = 'col-8';
                             $class2 = '';
 
-                            if ( ! empty( $item['allow_quantities'] ) ) {
+                            if (!empty($item['allow_quantities'])) {
                                 $class = 'col-6 pt-2';
                                 $class2 = 'pt-2';
                             }
 
-                            if ( ! empty( $item['custom_price'] ) ) {
+                            if (!empty($item['custom_price'])) {
                                 $class .= ' pt-2';
                             }
 
                             $class3 = 'd-none';
-                            $name  = '';
-                            if ( ! empty( $item['required'] ) || ! isset( $totals_selected_select_item ) ) {
+                            $name = '';
+                            if (!empty($item['required']) || !isset($totals_selected_select_item)) {
 
-                                $amount = floatval( $item['price'] );
-                                if ( wpinv_use_taxes() ) {
+                                $amount = floatval($item['price']);
+                                if (wpinv_use_taxes()) {
 
-                                    $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                                    $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                                    if ( wpinv_prices_include_tax() ) {
-                                        $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                                    if (wpinv_prices_include_tax()) {
+                                        $pre_tax  = ($amount - $amount * $rate * 0.01);
                                         $item_tax = $amount - $pre_tax;
                                     } else {
                                         $pre_tax  = $amount;
@@ -2495,13 +2495,13 @@ 
                                     $total     = $sub_total + $tax;
 
                                 } else {
-                                    $total  = $total + $amount;
+                                    $total = $total + $amount;
                                 }
 
                                 $class3 = '';
-                                $name  = "wpinv-items[{$item['id']}]";
+                                $name = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_select_item = 1;
                                 }
 
@@ -2513,9 +2513,9 @@ 
 
                     <div  class="item_totals_item <?php echo $class3; ?>" data-id="<?php echo (int) $item['id']; ?>">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -2523,11 +2523,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -2535,15 +2535,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='text' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='text' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -2554,34 +2554,34 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total p-2'>
 
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
                     <div class='row'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
 
             </div>
         <?php } ?>
 
-        <?php if ( 'multi_select' == $field[ 'items_type' ] ) { ?>
+        <?php if ('multi_select' == $field['items_type']) { ?>
 
             <div class="item_totals_type_multi_select">
 
@@ -2590,18 +2590,18 @@ 
                     $options  = array();
                     $selected = array();
 
-                    foreach ( $items as $index => $item ) {
+                    foreach ($items as $index => $item) {
 
-                        if ( ! empty( $item['required'] ) ) {
+                        if (!empty($item['required'])) {
                             continue;
                         }
 
-                        $title = sanitize_text_field(  $item['title'] );
-                        $price = wpinv_price( wpinv_format_amount( (float) sanitize_text_field(  $item['price'] ) ) );
-                        $options[ $item['id'] ] = "$title &nbsp; ($price)";
+                        $title = sanitize_text_field($item['title']);
+                        $price = wpinv_price(wpinv_format_amount((float) sanitize_text_field($item['price'])));
+                        $options[$item['id']] = "$title &nbsp; ($price)";
 
-                        if ( ! isset( $selected_item ) ) {
-                            $selected = array( $item['id'] );
+                        if (!isset($selected_item)) {
+                            $selected = array($item['id']);
                             $selected_item = 1;
                         }
 
@@ -2628,31 +2628,31 @@ 
                         $tax       = 0;
                         $sub_total = 0;
 
-                        foreach ( $items as $item ) {
+                        foreach ($items as $item) {
 
                             $class  = 'col-8';
                             $class2 = '';
 
-                            if ( ! empty( $item['allow_quantities'] ) ) {
+                            if (!empty($item['allow_quantities'])) {
                                 $class = 'col-6 pt-2';
                                 $class2 = 'pt-2';
                             }
 
-                            if ( ! empty( $item['custom_price'] ) ) {
+                            if (!empty($item['custom_price'])) {
                                 $class .= ' pt-2';
                             }
 
                             $class3 = 'd-none';
-                            $name  = '';
-                            if ( ! empty( $item['required'] ) || ! isset( $totals_selected_select_item ) ) {
+                            $name = '';
+                            if (!empty($item['required']) || !isset($totals_selected_select_item)) {
 
-                                $amount = floatval( $item['price'] );
-                                if ( wpinv_use_taxes() ) {
+                                $amount = floatval($item['price']);
+                                if (wpinv_use_taxes()) {
 
-                                    $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                                    $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                                    if ( wpinv_prices_include_tax() ) {
-                                        $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                                    if (wpinv_prices_include_tax()) {
+                                        $pre_tax  = ($amount - $amount * $rate * 0.01);
                                         $item_tax = $amount - $pre_tax;
                                     } else {
                                         $pre_tax  = $amount;
@@ -2664,13 +2664,13 @@ 
                                     $total     = $sub_total + $tax;
 
                                 } else {
-                                    $total  = $total + $amount;
+                                    $total = $total + $amount;
                                 }
 
                                 $class3 = '';
-                                $name  = "wpinv-items[{$item['id']}]";
+                                $name = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_select_item = 1;
                                 }
 
@@ -2682,9 +2682,9 @@ 
 
                     <div  class="item_totals_item <?php echo $class3; ?>" data-id="<?php echo (int) $item['id']; ?>">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -2692,11 +2692,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -2704,15 +2704,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='text' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='text' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -2723,35 +2723,35 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total p-2'>
 
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
 
                     <div class='row'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
 
             </div>
         <?php } ?>
-        <?php if ( ! empty( $field[ 'description' ] ) ) { ?>
-            <small class='form-text text-muted'><?php echo wp_kses_post( $field[ 'description' ] ); ?></small>
+        <?php if (!empty($field['description'])) { ?>
+            <small class='form-text text-muted'><?php echo wp_kses_post($field['description']); ?></small>
         <?php } ?>
         </div>
         <?php
@@ -2760,57 +2760,57 @@ 
     /**
      * 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' );
-        $label    = __( 'Let customers...', 'invoicing' );
-        $label2   = __( 'Available Items', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this element', 'invoicing' );
+        $restrict = $this->get_restrict_markup($field, 'items');
+        $label    = __('Let customers...', 'invoicing');
+        $label2   = __('Available Items', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this element', 'invoicing');
         $id       = $field . '.id + "_edit"';
         $id2      = $field . '.id + "_edit2"';
         $id3      = $field . '.id + "_edit3"';
         $id4      = $field . '.id + "_edit4"';
-        $label4   = esc_attr__( 'This will be shown to the customer as the recommended price', 'invoicing' );
-        $label5   = esc_attr__( 'Allow users to pay what they want', 'invoicing' );
-        $label6   = esc_attr__( 'Enter the minimum price that a user can pay', 'invoicing' );
-        $label7   = esc_attr__( 'Allow users to buy several quantities', 'invoicing' );
-        $label8   = esc_attr__( 'This item is required', 'invoicing' );
+        $label4   = esc_attr__('This will be shown to the customer as the recommended price', 'invoicing');
+        $label5   = esc_attr__('Allow users to pay what they want', 'invoicing');
+        $label6   = esc_attr__('Enter the minimum price that a user can pay', 'invoicing');
+        $label7   = esc_attr__('Allow users to buy several quantities', 'invoicing');
+        $label8   = esc_attr__('This item is required', 'invoicing');
 
         // 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);
         $item_types_html = '';
 
-        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);
             $item_types_html .= "<option value='$type'>$_label</type>";
         }
 
         // Taxes.
         $taxes = '';
-        if ( $wpinv_euvat->allow_vat_rules() ) {
+        if ($wpinv_euvat->allow_vat_rules()) {
             $taxes .= "<div class='form-group'> <label :for='$id + item.id + \"rule\"'>";
-            $taxes .= __( 'VAT rule type', 'invoicing' );
+            $taxes .= __('VAT rule type', 'invoicing');
             $taxes .= "</label><select :id='$id + item.id + \"rule\"' class='form-control custom-select' v-model='item.rule'>";
 
-            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);
                 $taxes  .= "<option value='$type'>$_label</type>";
             }
 
             $taxes .= '</select></div>';
         }
 
-        if ( $wpinv_euvat->allow_vat_classes() ) {
+        if ($wpinv_euvat->allow_vat_classes()) {
             $taxes .= "<div class='form-group'> <label :for='$id + item.id + \"class\"'>";
-            $taxes .= __( 'VAT class', 'invoicing' );
+            $taxes .= __('VAT class', 'invoicing');
             $taxes .= "</label><select :id='$id + item.id + \"class\"' class='form-control custom-select' v-model='item.class'>";
 
-            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);
                 $taxes  .= "<option value='$type'>$_label</type>";
             }
 
@@ -2895,7 +2895,7 @@ 
                 <div class='form-group mt-2' v-if='!is_default'>
 
                     <select class='form-control custom-select' v-model='selected_item' @change='addSelectedItem'>
-                        <option value=''>"        . __( 'Add an existing item to the form', 'invoicing' ) ."</option>
+                        <option value=''>" . __('Add an existing item to the form', 'invoicing') . "</option>
                         <option v-for='(item, index) in all_items' :value='index'>{{item.title}}</option>
                     </select>
 
@@ -2910,11 +2910,11 @@ 
                     <label :for='$id2'>$label</label>
 
                     <select class='form-control custom-select' :id='$id2' v-model='$field.items_type'>
-                        <option value='total' :disabled='canCheckoutSeveralSubscriptions($field)'>"        . __( 'Buy all items on the list', 'invoicing' ) ."</option>
-                        <option value='radio'>"        . __( 'Select a single item from the list', 'invoicing' ) ."</option>
-                        <option value='checkbox' :disabled='canCheckoutSeveralSubscriptions($field)'>"     . __( 'Select one or more items on the list', 'invoicing' ) ."</option>
-                        <option value='select'>"       . __( 'Select a single item from a dropdown', 'invoicing' ) ."</option>
-                        <option value='multi_select' :disabled='canCheckoutSeveralSubscriptions($field)'>" . __( 'Select a one or more items from a dropdown', 'invoicing' ) ."</option>
+                        <option value='total' :disabled='canCheckoutSeveralSubscriptions($field)'>" . __('Buy all items on the list', 'invoicing') . "</option>
+                        <option value='radio'>"        . __('Select a single item from the list', 'invoicing') . "</option>
+                        <option value='checkbox' :disabled='canCheckoutSeveralSubscriptions($field)'>" . __('Select one or more items on the list', 'invoicing') . "</option>
+                        <option value='select'>"       . __('Select a single item from a dropdown', 'invoicing') . "</option>
+                        <option value='multi_select' :disabled='canCheckoutSeveralSubscriptions($field)'>" . __('Select a one or more items from a dropdown', 'invoicing') . "</option>
                     </select>
 
                 </div>
@@ -2939,7 +2939,7 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'meta_query'     => array(
                 array(
                     'key'       => '_wpinv_type',
@@ -2949,24 +2949,24 @@ 
             )
         );
     
-        $items = get_posts( apply_filters( 'wpinv_payment_form_item_dropdown_query_args', $item_args ) );
+        $items = get_posts(apply_filters('wpinv_payment_form_item_dropdown_query_args', $item_args));
 
-        if ( empty( $items ) ) {
+        if (empty($items)) {
             return array();
         }
 
-        $options    = array();
-        foreach ( $items as $item ) {
-            $title            = esc_html( $item->post_title );
-            $title           .= wpinv_get_item_suffix( $item->ID, false );
-            $id               = absint( $item->ID );
-            $price            = wpinv_sanitize_amount( get_post_meta( $id, '_wpinv_price', true ) );
-            $recurring        = (bool) get_post_meta( $id, '_wpinv_is_recurring', true );
+        $options = array();
+        foreach ($items as $item) {
+            $title            = esc_html($item->post_title);
+            $title           .= wpinv_get_item_suffix($item->ID, false);
+            $id               = absint($item->ID);
+            $price            = wpinv_sanitize_amount(get_post_meta($id, '_wpinv_price', true));
+            $recurring        = (bool) get_post_meta($id, '_wpinv_is_recurring', true);
             $description      = $item->post_excerpt;
-            $custom_price     = (bool) get_post_meta( $id, '_wpinv_dynamic_pricing', true );
-            $minimum_price    = (float) get_post_meta( $id, '_minimum_price', true );
+            $custom_price     = (bool) get_post_meta($id, '_wpinv_dynamic_pricing', true);
+            $minimum_price    = (float) get_post_meta($id, '_minimum_price', true);
             $allow_quantities = false;
-            $options[]        = compact( 'title', 'id', 'price', 'recurring', 'description', 'custom_price', 'minimum_price', 'allow_quantities' );
+            $options[]        = compact('title', 'id', 'price', 'recurring', 'description', 'custom_price', 'minimum_price', 'allow_quantities');
 
         }
         return $options;
@@ -2976,44 +2976,44 @@ 
     /**
      * Returns an array of items for the currently being edited form.
      */
-    public function get_form_items( $id = false ) {
+    public function get_form_items($id = false) {
         
-        if ( empty( $id ) ) {
-            return wpinv_get_data( 'sample-payment-form-items' );
+        if (empty($id)) {
+            return wpinv_get_data('sample-payment-form-items');
         }
         
-        $form_elements = get_post_meta( $id, 'wpinv_form_items', true );
+        $form_elements = get_post_meta($id, 'wpinv_form_items', true);
 
-        if ( is_array( $form_elements ) ) {
+        if (is_array($form_elements)) {
             return $form_elements;
         }
 
-        return wpinv_get_data( 'sample-payment-form-items' );
+        return wpinv_get_data('sample-payment-form-items');
 
     }
 
     /**
      * 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'],
@@ -3027,27 +3027,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,
             );
 
@@ -3060,28 +3060,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);
     }
 
     /**
@@ -3092,12 +3092,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/class-wpinv-invoice.php

Spacing +574 added lines, -574 removed lines

@@ -1,8 +1,8 @@ 
 <?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__));
 }
 
 /**
@@ -13,7 +13,7 @@ 
     /**
      * @var int the invoice ID.
      */
-    public $ID  = 0;
+    public $ID = 0;
 
     /**
      * @var string the invoice title.
@@ -258,22 +258,22 @@ 
     /**
      * @param int|WPInv_Invoice|WP_Post $invoice The invoice.
      */
-    public function __construct( $invoice = false ) {
+    public function __construct($invoice = false) {
         
         // Do we have an invoice?
-        if ( empty( $invoice ) ) {
+        if (empty($invoice)) {
             return false;
         }
 
-        $this->setup_invoice( $invoice );
+        $this->setup_invoice($invoice);
     }
 
     /**
      * Retrieves an invoice key.
      */
-    public function get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            $value = call_user_func( array( $this, 'get_' . $key ) );
+    public function get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            $value = call_user_func(array($this, 'get_' . $key));
         } else {
             $value = $this->$key;
         }
@@ -284,18 +284,18 @@ 
      /**
      * Sets an invoice key.
      */
-    public function set( $key, $value ) {
-        $ignore = array( 'items', 'cart_details', 'fees', '_ID' );
+    public function set($key, $value) {
+        $ignore = array('items', 'cart_details', 'fees', '_ID');
 
-        if ( $key === 'status' ) {
+        if ($key === 'status') {
             $this->old_status = $this->status;
         }
 
-        if ( ! in_array( $key, $ignore ) ) {
-            $this->pending[ $key ] = $value;
+        if (!in_array($key, $ignore)) {
+            $this->pending[$key] = $value;
         }
 
-        if( '_ID' !== $key ) {
+        if ('_ID' !== $key) {
             $this->$key = $value;
         }
     }
@@ -303,9 +303,9 @@ 
     /**
      * Checks if an invoice key is set.
      */
-    public function _isset( $name ) {
-        if ( property_exists( $this, $name) ) {
-            return false === empty( $this->$name );
+    public function _isset($name) {
+        if (property_exists($this, $name)) {
+            return false === empty($this->$name);
         } else {
             return null;
         }
@@ -314,66 +314,66 @@ 
     /**
      * @param int|WPInv_Invoice|WP_Post $invoice The invoice.
      */
-    private function setup_invoice( $invoice ) {
+    private function setup_invoice($invoice) {
         global $wpdb;
         $this->pending = array();
 
-        if ( empty( $invoice ) ) {
+        if (empty($invoice)) {
             return false;
         }
 
-        if ( is_a( $invoice, 'WPInv_Invoice' ) ) {
-            foreach ( get_object_vars( $invoice ) as $prop => $value ) {
+        if (is_a($invoice, 'WPInv_Invoice')) {
+            foreach (get_object_vars($invoice) as $prop => $value) {
                 $this->$prop = $value;
             }
             return true;
         }
 
         // Retrieve post object.
-        $invoice      = get_post( $invoice );
+        $invoice = get_post($invoice);
 
-        if( ! $invoice || is_wp_error( $invoice ) ) {
+        if (!$invoice || is_wp_error($invoice)) {
             return false;
         }
 
-        if( ! ( 'wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type ) ) {
+        if (!('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type)) {
             return false;
         }
 
         // Retrieve post data.
         $table = $wpdb->prefix . 'getpaid_invoices';
         $data  = $wpdb->get_row(
-            $wpdb->prepare( "SELECT * FROM $table WHERE post_id=%d", $invoice->ID )
+            $wpdb->prepare("SELECT * FROM $table WHERE post_id=%d", $invoice->ID)
         );
 
-        do_action( 'wpinv_pre_setup_invoice', $this, $invoice->ID, $data );
+        do_action('wpinv_pre_setup_invoice', $this, $invoice->ID, $data);
 
         // Primary Identifier
-        $this->ID              = absint( $invoice->ID );
+        $this->ID              = absint($invoice->ID);
         $this->post_type       = $invoice->post_type;
 
         $this->date            = $invoice->post_date;
         $this->status          = $invoice->post_status;
 
-        if ( 'future' == $this->status ) {
+        if ('future' == $this->status) {
             $this->status = 'publish';
         }
 
         $this->post_status     = $this->status;
         $this->parent_invoice  = $invoice->post_parent;
-        $this->post_name       = $this->setup_post_name( $invoice );
-        $this->status_nicename = $this->setup_status_nicename( $invoice->post_status );
+        $this->post_name       = $this->setup_post_name($invoice);
+        $this->status_nicename = $this->setup_status_nicename($invoice->post_status);
 
-        $this->user_id         = ! empty( $invoice->post_author ) ? $invoice->post_author : get_current_user_id();
-        $this->email           = get_the_author_meta( 'email', $this->user_id );
+        $this->user_id         = !empty($invoice->post_author) ? $invoice->post_author : get_current_user_id();
+        $this->email           = get_the_author_meta('email', $this->user_id);
         $this->currency        = wpinv_get_currency();
-        $this->setup_invoice_data( $data );
+        $this->setup_invoice_data($data);
 
         // Other Identifiers
-        $this->title           = ! empty( $invoice->post_title ) ? $invoice->post_title : $this->number;
+        $this->title = !empty($invoice->post_title) ? $invoice->post_title : $this->number;
 
         // Allow extensions to add items to this object via hook
-        do_action( 'wpinv_setup_invoice', $this, $invoice->ID, $data );
+        do_action('wpinv_setup_invoice', $this, $invoice->ID, $data);
 
         return true;
     }
@@ -381,16 +381,16 @@ 
     /**
      * @param stdClass $data The invoice data.
      */
-    private function setup_invoice_data( $data ) {
+    private function setup_invoice_data($data) {
 
-        if ( empty( $data ) ) {
-            $this->number = $this->setup_invoice_number( $data );
+        if (empty($data)) {
+            $this->number = $this->setup_invoice_number($data);
             return;
         }
 
-        $data = map_deep( $data, 'maybe_unserialize' );
+        $data = map_deep($data, 'maybe_unserialize');
 
-        $this->payment_meta    = is_array( $data->custom_meta ) ? $data->custom_meta : array();
+        $this->payment_meta    = is_array($data->custom_meta) ? $data->custom_meta : array();
         $this->due_date        = $data->due_date;
         $this->completed_date  = $data->completed_date;
         $this->mode            = $data->mode;
@@ -398,7 +398,7 @@ 
         // Items
         $this->fees            = $this->setup_fees();
         $this->cart_details    = $this->setup_cart_details();
-        $this->items           = ! empty( $this->payment_meta['items'] ) ? $this->payment_meta['items'] : array();
+        $this->items           = !empty($this->payment_meta['items']) ? $this->payment_meta['items'] : array();
 
         // Currency Based
         $this->total           = $data->total;
@@ -406,7 +406,7 @@ 
         $this->tax             = $data->tax;
         $this->fees_total      = $data->fees_total;
         $this->subtotal        = $data->subtotal;
-        $this->currency        = empty( $data->currency ) ? wpinv_get_currency() : $data->currency ;
+        $this->currency        = empty($data->currency) ? wpinv_get_currency() : $data->currency;
 
         // Gateway based
         $this->gateway         = $data->gateway;
@@ -415,30 +415,30 @@ 
 
         // User based
         $this->ip              = $data->user_ip;
-        $this->user_info       = ! empty( $this->payment_meta['user_info'] ) ? $this->payment_meta['user_info'] : array();
+        $this->user_info       = !empty($this->payment_meta['user_info']) ? $this->payment_meta['user_info'] : array();
 
         $this->first_name      = $data->first_name;
         $this->last_name       = $data->last_name;
         $this->company         = $data->company;
         $this->vat_number      = $data->vat_number;
         $this->vat_rate        = $data->vat_rate;
-        $this->adddress_confirmed  = (int) $data->adddress_confirmed;
+        $this->adddress_confirmed = (int) $data->adddress_confirmed;
         $this->address         = $data->address;
         $this->city            = $data->city;
         $this->country         = $data->country;
         $this->state           = $data->state;
         $this->zip             = $data->zip;
-        $this->phone           = ! empty( $this->user_info['phone'] ) ? $this->user_info['phone'] : '';
+        $this->phone           = !empty($this->user_info['phone']) ? $this->user_info['phone'] : '';
 
-        $this->discounts       = ! empty( $this->user_info['discount'] ) ? $this->user_info['discount'] : '';
+        $this->discounts       = !empty($this->user_info['discount']) ? $this->user_info['discount'] : '';
         $this->discount        = $data->discount;
         $this->discount_code   = $data->discount_code;
 
         // Other Identifiers
         $this->key             = $data->key;
-        $this->number          = $this->setup_invoice_number( $data );
+        $this->number          = $this->setup_invoice_number($data);
 
-        $this->full_name       = trim( $this->first_name . ' '. $this->last_name );
+        $this->full_name       = trim($this->first_name . ' ' . $this->last_name);
 
 
         return true;
@@ -448,52 +448,52 @@ 
     /**
      * Sets up the status nice name.
      */
-    private function setup_status_nicename( $status ) {
-        $all_invoice_statuses  = wpinv_get_invoice_statuses( true, true, $this );
+    private function setup_status_nicename($status) {
+        $all_invoice_statuses = wpinv_get_invoice_statuses(true, true, $this);
 
-        if ( $this->is_quote() && class_exists( 'Wpinv_Quotes_Shared' ) ) {
-            $all_invoice_statuses  = Wpinv_Quotes_Shared::wpinv_get_quote_statuses();
+        if ($this->is_quote() && class_exists('Wpinv_Quotes_Shared')) {
+            $all_invoice_statuses = Wpinv_Quotes_Shared::wpinv_get_quote_statuses();
         }
-        $status   = isset( $all_invoice_statuses[$status] ) ? $all_invoice_statuses[$status] : __( $status, 'invoicing' );
+        $status = isset($all_invoice_statuses[$status]) ? $all_invoice_statuses[$status] : __($status, 'invoicing');
 
-        return apply_filters( 'setup_status_nicename', $status );
+        return apply_filters('setup_status_nicename', $status);
     }
 
     /**
      * Set's up the invoice number.
      */
-    private function setup_invoice_number( $data ) {
+    private function setup_invoice_number($data) {
 
-        if ( ! empty( $data ) && ! empty( $data->number ) ) {
+        if (!empty($data) && !empty($data->number)) {
             return $data->number;
         }
 
         $number = $this->ID;
 
-        if ( $this->status == 'auto-draft' && wpinv_sequential_number_active( $this->post_type ) ) {
-            $next_number = wpinv_get_next_invoice_number( $this->post_type );
+        if ($this->status == 'auto-draft' && wpinv_sequential_number_active($this->post_type)) {
+            $next_number = wpinv_get_next_invoice_number($this->post_type);
             $number      = $next_number;
         }
         
-        return wpinv_format_invoice_number( $number, $this->post_type );
+        return wpinv_format_invoice_number($number, $this->post_type);
 
     }
 
     /**
      * Invoice's post name.
      */
-    private function setup_post_name( $post = NULL ) {
+    private function setup_post_name($post = NULL) {
         global $wpdb;
         
         $post_name = '';
 
-        if ( !empty( $post ) ) {
-            if( !empty( $post->post_name ) ) {
+        if (!empty($post)) {
+            if (!empty($post->post_name)) {
                 $post_name = $post->post_name;
-            } else if ( !empty( $post->ID ) ) {
-                $post_name = wpinv_generate_post_name( $post->ID );
+            } else if (!empty($post->ID)) {
+                $post_name = wpinv_generate_post_name($post->ID);
 
-                $wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
+                $wpdb->update($wpdb->posts, array('post_name' => $post_name), array('ID' => $post->ID));
             }
         }
 
@@ -506,18 +506,18 @@ 
     public function setup_cart_details() {
         global $wpdb;
 
-        $table =  $wpdb->prefix . 'getpaid_invoice_items';
+        $table = $wpdb->prefix . 'getpaid_invoice_items';
         $items = $wpdb->get_results(
-            $wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $this->ID )
+            $wpdb->prepare("SELECT * FROM $table WHERE `post_id`=%d", $this->ID)
         );
 
-        if ( empty( $items ) ) {
+        if (empty($items)) {
             return array();
         }
 
         $details = array();
 
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
             $item = (array) $item;
             $details[] = array(
                 'name'          => $item['item_name'],
@@ -536,7 +536,7 @@ 
             );
         }
 
-        return map_deep( $details, 'maybe_unserialize' );
+        return map_deep($details, 'maybe_unserialize');
 
     }
 
@@ -544,16 +544,16 @@ 
      * Convert this to an array.
      */
     public function array_convert() {
-        return get_object_vars( $this );
+        return get_object_vars($this);
     }
     
     private function setup_fees() {
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
         return $payment_fees;
     }
 
     private function setup_gateway_title() {
-        $gateway_title = wpinv_get_gateway_checkout_label( $this->gateway );
+        $gateway_title = wpinv_get_gateway_checkout_label($this->gateway);
         return $gateway_title;
     }
     
@@ -589,16 +589,16 @@ 
             'fees'         => $this->fees,
         );
 
-        $this->payment_meta = array_merge( $this->payment_meta, $payment_data );
+        $this->payment_meta = array_merge($this->payment_meta, $payment_data);
 
     }
 
     private function insert_invoice() {
 
-        if ( empty( $this->post_type ) ) {
-            if ( !empty( $this->ID ) && $post_type = get_post_type( $this->ID ) ) {
+        if (empty($this->post_type)) {
+            if (!empty($this->ID) && $post_type = get_post_type($this->ID)) {
                 $this->post_type = $post_type;
-            } else if ( !empty( $this->parent_invoice ) && $post_type = get_post_type( $this->parent_invoice ) ) {
+            } else if (!empty($this->parent_invoice) && $post_type = get_post_type($this->parent_invoice)) {
                 $this->post_type = $post_type;
             } else {
                 $this->post_type = 'wpi_invoice';
@@ -606,16 +606,16 @@ 
         }
 
         $invoice_number = $this->ID;
-        if ( $number = $this->number ) {
+        if ($number = $this->number) {
             $invoice_number = $number;
         }
 
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
 
-        if ( empty( $this->ip ) ) {
+        if (empty($this->ip)) {
             $this->ip = wpinv_get_ip();
             $this->pending['ip'] = $this->ip;
         }
@@ -652,34 +652,34 @@ 
             'post_status'   => $this->status,
             'post_author'   => $this->user_id,
             'post_type'     => $this->post_type,
-            'post_date'     => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time( 'mysql' ),
-            'post_date_gmt' => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date( $this->date ) : current_time( 'mysql', 1 ),
+            'post_date'     => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time('mysql'),
+            'post_date_gmt' => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date($this->date) : current_time('mysql', 1),
             'post_parent'   => $this->parent_invoice,
         );
-        $args = apply_filters( 'wpinv_insert_invoice_args', $post_data, $this );
+        $args = apply_filters('wpinv_insert_invoice_args', $post_data, $this);
 
         // Create a blank invoice
-        if ( !empty( $this->ID ) ) {
-            $args['ID']         = $this->ID;
-            $invoice_id = wp_update_post( $args, true );
+        if (!empty($this->ID)) {
+            $args['ID'] = $this->ID;
+            $invoice_id = wp_update_post($args, true);
         } else {
-            $invoice_id = wp_insert_post( $args, true );
+            $invoice_id = wp_insert_post($args, true);
         }
 
-        if ( is_wp_error( $invoice_id ) ) {
+        if (is_wp_error($invoice_id)) {
             return false;
         }
 
-        if ( ! empty( $invoice_id ) ) {
+        if (!empty($invoice_id)) {
             $this->ID  = $invoice_id;
             $this->_ID = $invoice_id;
 
-            $this->payment_meta = array_merge( $this->payment_meta, $payment_data );
+            $this->payment_meta = array_merge($this->payment_meta, $payment_data);
 
-            if ( ! empty( $this->payment_meta['fees'] ) ) {
-                $this->fees = array_merge( $this->fees, $this->payment_meta['fees'] );
-                foreach( $this->fees as $fee ) {
-                    $this->increase_fees( $fee['amount'] );
+            if (!empty($this->payment_meta['fees'])) {
+                $this->fees = array_merge($this->fees, $this->payment_meta['fees']);
+                foreach ($this->fees as $fee) {
+                    $this->increase_fees($fee['amount']);
                 }
             }
 
@@ -695,11 +695,11 @@ 
      */
     public function get_special_fields() {
 
-        return array (
+        return array(
             'post_id'        => $this->ID,
             'number'         => $this->get_number(),
             'key'            => $this->get_key(),
-            'type'           => str_replace( 'wpi_', '', $this->post_type ),
+            'type'           => str_replace('wpi_', '', $this->post_type),
             'mode'           => $this->mode,
             'user_ip'        => $this->get_ip(),
             'first_name'     => $this->get_first_name(),
@@ -739,37 +739,37 @@ 
         $this->refresh_payment_data();
 
         $fields = $this->get_special_fields();
-        $fields = array_map( 'maybe_serialize', $fields );
+        $fields = array_map('maybe_serialize', $fields);
 
-        $table =  $wpdb->prefix . 'getpaid_invoices';
+        $table = $wpdb->prefix . 'getpaid_invoices';
 
         $id = (int) $this->ID;
 
-        if ( empty( $id ) ) {
+        if (empty($id)) {
             return;
         }
 
-        if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`=$id" ) ) {
+        if ($wpdb->get_var("SELECT `post_id` FROM $table WHERE `post_id`=$id")) {
 
-            $wpdb->update( $table, $fields, array( 'post_id' => $id ) );
+            $wpdb->update($table, $fields, array('post_id' => $id));
 
         } else {
 
-            $wpdb->insert( $table, $fields );
+            $wpdb->insert($table, $fields);
 
         }
 
-        $table =  $wpdb->prefix . 'getpaid_invoice_items';
-        $wpdb->delete( $table, array( 'post_id' => $this->ID ) );
+        $table = $wpdb->prefix . 'getpaid_invoice_items';
+        $wpdb->delete($table, array('post_id' => $this->ID));
 
-        foreach ( $this->get_cart_details() as $details ) {
+        foreach ($this->get_cart_details() as $details) {
             $fields = array(
                 'post_id'          => $this->ID,
                 'item_id'          => $details['id'],
                 'item_name'        => $details['name'],
-                'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+                'item_description' => empty($details['meta']['description']) ? '' : $details['meta']['description'],
                 'vat_rate'         => $details['vat_rate'],
-                'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                'vat_class'        => empty($details['vat_class']) ? '_standard' : $details['vat_class'],
                 'tax'              => $details['tax'],
                 'item_price'       => $details['item_price'],
                 'custom_price'     => $details['custom_price'],
@@ -781,41 +781,41 @@ 
                 'fees'             => $details['fees'],
             );
 
-            $item_columns = array_keys ( $fields );
+            $item_columns = array_keys($fields);
 
-            foreach ( $fields as $key => $val ) {
-                if ( is_null( $val ) ) {
+            foreach ($fields as $key => $val) {
+                if (is_null($val)) {
                     $val = '';
                 }
-                $val = maybe_serialize( $val );
-                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                $val = maybe_serialize($val);
+                $fields[$key] = $wpdb->prepare('%s', $val);
             }
 
-            $fields = implode( ', ', $fields );
+            $fields = implode(', ', $fields);
             $item_rows[] = "($fields)";
         }
 
-        $item_rows    = implode( ', ', $item_rows );
-        $item_columns = implode( ', ', $item_columns );
-        $wpdb->query( "INSERT INTO $table ($item_columns) VALUES $item_rows" );
+        $item_rows    = implode(', ', $item_rows);
+        $item_columns = implode(', ', $item_columns);
+        $wpdb->query("INSERT INTO $table ($item_columns) VALUES $item_rows");
     }
 
-    public function save( $setup = false ) {
+    public function save($setup = false) {
         global $wpi_session;
         
         $saved = false;
-        if ( empty( $this->items ) ) {
+        if (empty($this->items)) {
             return $saved;
         }
 
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
         }
 
-        if ( empty( $this->ID ) ) {
+        if (empty($this->ID)) {
             $invoice_id = $this->insert_invoice();
 
-            if ( false === $invoice_id ) {
+            if (false === $invoice_id) {
                 $saved = false;
             } else {
                 $this->ID = $invoice_id;
@@ -823,28 +823,28 @@ 
         }
 
         // If we have something pending, let's save it
-        if ( ! empty( $this->pending ) ) {
+        if (!empty($this->pending)) {
             $total_increase = 0;
             $total_decrease = 0;
 
-            foreach ( $this->pending as $key => $value ) {
+            foreach ($this->pending as $key => $value) {
 
-                switch( $key ) {
+                switch ($key) {
                     case 'items':
                         // Update totals for pending items
-                        foreach ( $this->pending[ $key ] as $item ) {
-                            switch( $item['action'] ) {
+                        foreach ($this->pending[$key] as $item) {
+                            switch ($item['action']) {
                                 case 'add':
                                     $price = $item['price'];
                                     $taxes = $item['tax'];
 
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_increase += $price;
                                     }
                                     break;
 
                                 case 'remove':
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_decrease += $item['price'];
                                     }
                                     break;
@@ -852,16 +852,16 @@ 
                         }
                         break;
                     case 'fees':
-                        if ( 'publish' !== $this->status ) {
+                        if ('publish' !== $this->status) {
                             break;
                         }
 
-                        if ( empty( $this->pending[ $key ] ) ) {
+                        if (empty($this->pending[$key])) {
                             break;
                         }
 
-                        foreach ( $this->pending[ $key ] as $fee ) {
-                            switch( $fee['action'] ) {
+                        foreach ($this->pending[$key] as $fee) {
+                            switch ($fee['action']) {
                                 case 'add':
                                     $total_increase += $fee['amount'];
                                     break;
@@ -873,7 +873,7 @@ 
                         }
                         break;
                     case 'status':
-                        $this->update_status( $this->status );
+                        $this->update_status($this->status);
                         break;
                     case 'first_name':
                         $this->user_info['first_name'] = $this->first_name;
@@ -905,12 +905,12 @@ 
                     case 'vat_number':
                         $this->user_info['vat_number'] = $this->vat_number;
                         
-                        $vat_info = $wpi_session->get( 'user_vat_data' );
-                        if ( $this->vat_number && !empty( $vat_info ) && isset( $vat_info['number'] ) && isset( $vat_info['valid'] ) && $vat_info['number'] == $this->vat_number ) {
-                            $adddress_confirmed = isset( $vat_info['adddress_confirmed'] ) ? $vat_info['adddress_confirmed'] : false;
-                            $this->update_meta( '_wpinv_adddress_confirmed', (bool)$adddress_confirmed );
-                            $this->user_info['adddress_confirmed'] = (bool)$adddress_confirmed;
-                            $this->adddress_confirmed = (bool)$adddress_confirmed;
+                        $vat_info = $wpi_session->get('user_vat_data');
+                        if ($this->vat_number && !empty($vat_info) && isset($vat_info['number']) && isset($vat_info['valid']) && $vat_info['number'] == $this->vat_number) {
+                            $adddress_confirmed = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+                            $this->update_meta('_wpinv_adddress_confirmed', (bool) $adddress_confirmed);
+                            $this->user_info['adddress_confirmed'] = (bool) $adddress_confirmed;
+                            $this->adddress_confirmed = (bool) $adddress_confirmed;
                         }
     
                         break;
@@ -927,34 +927,34 @@ 
                             'edit_date' => true,
                         );
 
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     case 'due_date':
-                        if ( empty( $this->due_date ) ) {
+                        if (empty($this->due_date)) {
                             $this->due_date = 'none';
                         }
                         break;
                     case 'discounts':
-                        if ( ! is_array( $this->discounts ) ) {
-                            $this->discounts = explode( ',', $this->discounts );
+                        if (!is_array($this->discounts)) {
+                            $this->discounts = explode(',', $this->discounts);
                         }
 
-                        $this->user_info['discount'] = implode( ',', $this->discounts );
+                        $this->user_info['discount'] = implode(',', $this->discounts);
                         break;
                     case 'parent_invoice':
                         $args = array(
                             'ID'          => $this->ID,
                             'post_parent' => $this->parent_invoice,
                         );
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     default:
-                        do_action( 'wpinv_save', $this, $key );
+                        do_action('wpinv_save', $this, $key);
                         break;
                 }
             }
 
-            $this->items    = array_values( $this->items );
+            $this->items = array_values($this->items);
 
             $this->pending      = array();
             $saved              = true;
@@ -967,14 +967,14 @@ 
             'currency'      => $this->currency,
             'user_info'     => $this->user_info,
         );
-        $this->payment_meta = array_merge( $this->payment_meta, $new_meta );
+        $this->payment_meta = array_merge($this->payment_meta, $new_meta);
         $this->update_items();
 
         $this->save_special();
-        do_action( 'wpinv_invoice_save', $this, $saved );
+        do_action('wpinv_invoice_save', $this, $saved);
 
-        if ( true === $saved || $setup ) {
-            $this->setup_invoice( $this->ID );
+        if (true === $saved || $setup) {
+            $this->setup_invoice($this->ID);
         }
 
         $this->refresh_item_ids();
@@ -982,7 +982,7 @@ 
         return $saved;
     }
     
-    public function add_fee( $args, $global = true ) {
+    public function add_fee($args, $global = true) {
         $default_args = array(
             'label'       => '',
             'amount'      => 0,
@@ -992,75 +992,75 @@ 
             'item_id'     => 0,
         );
 
-        $fee = wp_parse_args( $args, $default_args );
+        $fee = wp_parse_args($args, $default_args);
         
-        if ( empty( $fee['label'] ) ) {
+        if (empty($fee['label'])) {
             return false;
         }
         
-        $fee['id']  = sanitize_title( $fee['label'] );
+        $fee['id'] = sanitize_title($fee['label']);
         
-        $this->fees[]               = $fee;
+        $this->fees[] = $fee;
         
         $added_fee               = $fee;
         $added_fee['action']     = 'add';
         $this->pending['fees'][] = $added_fee;
-        reset( $this->fees );
+        reset($this->fees);
 
-        $this->increase_fees( $fee['amount'] );
+        $this->increase_fees($fee['amount']);
         return true;
     }
 
-    public function remove_fee( $key ) {
+    public function remove_fee($key) {
         $removed = false;
 
-        if ( is_numeric( $key ) ) {
-            $removed = $this->remove_fee_by( 'index', $key );
+        if (is_numeric($key)) {
+            $removed = $this->remove_fee_by('index', $key);
         }
 
         return $removed;
     }
 
-    public function remove_fee_by( $key, $value, $global = false ) {
-        $allowed_fee_keys = apply_filters( 'wpinv_fee_keys', array(
+    public function remove_fee_by($key, $value, $global = false) {
+        $allowed_fee_keys = apply_filters('wpinv_fee_keys', array(
             'index', 'label', 'amount', 'type',
-        ) );
+        ));
 
-        if ( ! in_array( $key, $allowed_fee_keys ) ) {
+        if (!in_array($key, $allowed_fee_keys)) {
             return false;
         }
 
         $removed = false;
-        if ( 'index' === $key && array_key_exists( $value, $this->fees ) ) {
-            $removed_fee             = $this->fees[ $value ];
+        if ('index' === $key && array_key_exists($value, $this->fees)) {
+            $removed_fee             = $this->fees[$value];
             $removed_fee['action']   = 'remove';
             $this->pending['fees'][] = $removed_fee;
 
-            $this->decrease_fees( $removed_fee['amount'] );
+            $this->decrease_fees($removed_fee['amount']);
 
-            unset( $this->fees[ $value ] );
+            unset($this->fees[$value]);
             $removed = true;
-        } else if ( 'index' !== $key ) {
-            foreach ( $this->fees as $index => $fee ) {
-                if ( isset( $fee[ $key ] ) && $fee[ $key ] == $value ) {
+        } else if ('index' !== $key) {
+            foreach ($this->fees as $index => $fee) {
+                if (isset($fee[$key]) && $fee[$key] == $value) {
                     $removed_fee             = $fee;
                     $removed_fee['action']   = 'remove';
                     $this->pending['fees'][] = $removed_fee;
 
-                    $this->decrease_fees( $removed_fee['amount'] );
+                    $this->decrease_fees($removed_fee['amount']);
 
-                    unset( $this->fees[ $index ] );
+                    unset($this->fees[$index]);
                     $removed = true;
 
-                    if ( false === $global ) {
+                    if (false === $global) {
                         break;
                     }
                 }
             }
         }
 
-        if ( true === $removed ) {
-            $this->fees = array_values( $this->fees );
+        if (true === $removed) {
+            $this->fees = array_values($this->fees);
         }
 
         return $removed;
@@ -1068,35 +1068,35 @@ 
 
     
 
-    public function add_note( $note = '', $customer_type = false, $added_by_user = false, $system = false ) {
+    public function add_note($note = '', $customer_type = false, $added_by_user = false, $system = false) {
         // Bail if no note specified
-        if( !$note ) {
+        if (!$note) {
             return false;
         }
 
-        if ( empty( $this->ID ) )
+        if (empty($this->ID))
             return false;
         
-        if ( ( ( is_user_logged_in() && wpinv_current_user_can_manage_invoicing() ) || $added_by_user ) && !$system ) {
-            $user                 = get_user_by( 'id', get_current_user_id() );
+        if (((is_user_logged_in() && wpinv_current_user_can_manage_invoicing()) || $added_by_user) && !$system) {
+            $user                 = get_user_by('id', get_current_user_id());
             $comment_author       = $user->display_name;
             $comment_author_email = $user->user_email;
         } else {
             $comment_author       = 'System';
             $comment_author_email = 'system@';
-            $comment_author_email .= isset( $_SERVER['HTTP_HOST'] ) ? str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) : 'noreply.com';
-            $comment_author_email = sanitize_email( $comment_author_email );
+            $comment_author_email .= isset($_SERVER['HTTP_HOST']) ? str_replace('www.', '', $_SERVER['HTTP_HOST']) : 'noreply.com';
+            $comment_author_email = sanitize_email($comment_author_email);
         }
 
-        do_action( 'wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type );
+        do_action('wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type);
 
-        $note_id = wp_insert_comment( wp_filter_comment( array(
+        $note_id = wp_insert_comment(wp_filter_comment(array(
             'comment_post_ID'      => $this->ID,
             'comment_content'      => $note,
             'comment_agent'        => 'WPInvoicing',
             'user_id'              => is_admin() ? get_current_user_id() : 0,
-            'comment_date'         => current_time( 'mysql' ),
-            'comment_date_gmt'     => current_time( 'mysql', 1 ),
+            'comment_date'         => current_time('mysql'),
+            'comment_date_gmt'     => current_time('mysql', 1),
             'comment_approved'     => 1,
             'comment_parent'       => 0,
             'comment_author'       => $comment_author,
@@ -1104,53 +1104,53 @@ 
             'comment_author_url'   => '',
             'comment_author_email' => $comment_author_email,
             'comment_type'         => 'wpinv_note'
-        ) ) );
+        )));
 
-        do_action( 'wpinv_insert_payment_note', $note_id, $this->ID, $note );
+        do_action('wpinv_insert_payment_note', $note_id, $this->ID, $note);
         
-        if ( $customer_type ) {
-            add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+        if ($customer_type) {
+            add_comment_meta($note_id, '_wpi_customer_note', 1);
 
-            do_action( 'wpinv_new_customer_note', array( 'invoice_id' => $this->ID, 'user_note' => $note ) );
+            do_action('wpinv_new_customer_note', array('invoice_id' => $this->ID, 'user_note' => $note));
         }
 
         return $note_id;
     }
 
-    private function increase_subtotal( $amount = 0.00 ) {
+    private function increase_subtotal($amount = 0.00) {
         $amount          = (float) $amount;
         $this->subtotal += $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
         $this->recalculate_total();
     }
 
-    private function decrease_subtotal( $amount = 0.00 ) {
+    private function decrease_subtotal($amount = 0.00) {
         $amount          = (float) $amount;
         $this->subtotal -= $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
-        if ( $this->subtotal < 0 ) {
+        if ($this->subtotal < 0) {
             $this->subtotal = 0;
         }
 
         $this->recalculate_total();
     }
 
-    private function increase_fees( $amount = 0.00 ) {
-        $amount            = (float)$amount;
+    private function increase_fees($amount = 0.00) {
+        $amount            = (float) $amount;
         $this->fees_total += $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
         $this->recalculate_total();
     }
 
-    private function decrease_fees( $amount = 0.00 ) {
+    private function decrease_fees($amount = 0.00) {
         $amount            = (float) $amount;
         $this->fees_total -= $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
-        if ( $this->fees_total < 0 ) {
+        if ($this->fees_total < 0) {
             $this->fees_total = 0;
         }
 
@@ -1161,54 +1161,54 @@ 
         global $wpi_nosave;
         
         $this->total = $this->subtotal + $this->tax + $this->fees_total;
-        $this->total = wpinv_round_amount( $this->total );
+        $this->total = wpinv_round_amount($this->total);
         
-        do_action( 'wpinv_invoice_recalculate_total', $this, $wpi_nosave );
+        do_action('wpinv_invoice_recalculate_total', $this, $wpi_nosave);
     }
     
-    public function increase_tax( $amount = 0.00 ) {
+    public function increase_tax($amount = 0.00) {
         $amount       = (float) $amount;
         $this->tax   += $amount;
 
         $this->recalculate_total();
     }
 
-    public function decrease_tax( $amount = 0.00 ) {
+    public function decrease_tax($amount = 0.00) {
         $amount     = (float) $amount;
         $this->tax -= $amount;
 
-        if ( $this->tax < 0 ) {
+        if ($this->tax < 0) {
             $this->tax = 0;
         }
 
         $this->recalculate_total();
     }
 
-    public function update_status( $new_status = false, $note = '', $manual = false ) {
-        $old_status = ! empty( $this->old_status ) ? $this->old_status : get_post_status( $this->ID );
+    public function update_status($new_status = false, $note = '', $manual = false) {
+        $old_status = !empty($this->old_status) ? $this->old_status : get_post_status($this->ID);
 
-        if ( $old_status === $new_status && in_array( $new_status, array_keys( wpinv_get_invoice_statuses( true ) ) ) ) {
+        if ($old_status === $new_status && in_array($new_status, array_keys(wpinv_get_invoice_statuses(true)))) {
             return false; // Don't permit status changes that aren't changes
         }
 
-        $do_change = apply_filters( 'wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status );
+        $do_change = apply_filters('wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status);
         $updated = false;
 
-        if ( $do_change ) {
-            do_action( 'wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status );
+        if ($do_change) {
+            do_action('wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status);
 
             $update_post_data                   = array();
             $update_post_data['ID']             = $this->ID;
             $update_post_data['post_status']    = $new_status;
-            $update_post_data['edit_date']      = current_time( 'mysql', 0 );
-            $update_post_data['edit_date_gmt']  = current_time( 'mysql', 1 );
+            $update_post_data['edit_date']      = current_time('mysql', 0);
+            $update_post_data['edit_date_gmt']  = current_time('mysql', 1);
             
-            $update_post_data = apply_filters( 'wpinv_update_invoice_status_fields', $update_post_data, $this->ID );
+            $update_post_data = apply_filters('wpinv_update_invoice_status_fields', $update_post_data, $this->ID);
 
-            $updated = wp_update_post( $update_post_data );     
+            $updated = wp_update_post($update_post_data);     
            
             // Process any specific status functions
-            switch( $new_status ) {
+            switch ($new_status) {
                 case 'wpi-refunded':
                     $this->process_refund();
                     break;
@@ -1221,9 +1221,9 @@ 
             }
             
             // Status was changed.
-            do_action( 'wpinv_status_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_update_status', $this->ID, $new_status, $old_status );
+            do_action('wpinv_status_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_update_status', $this->ID, $new_status, $old_status);
         }
 
         return $updated;
@@ -1237,68 +1237,68 @@ 
         $this->save();
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
 
-        if ( $meta_key == 'key' || $meta_key == 'date' ) {
+        if ($meta_key == 'key' || $meta_key == 'date') {
             $current_meta = $this->get_meta();
-            $current_meta[ $meta_key ] = $meta_value;
+            $current_meta[$meta_key] = $meta_value;
 
             $meta_key     = '_wpinv_payment_meta';
             $meta_value   = $current_meta;
         }
 
-        $key  = str_ireplace( '_wpinv_', '', $meta_key );
+        $key = str_ireplace('_wpinv_', '', $meta_key);
         $this->$key = $meta_value;
 
-        $special = array_keys( $this->get_special_fields() );
-        if ( in_array( $key, $special ) ) {
+        $special = array_keys($this->get_special_fields());
+        if (in_array($key, $special)) {
             $this->save_special();
         } else {
-            $meta_value = apply_filters( 'wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID );
+            $meta_value = apply_filters('wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID);
         }
 
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
 
     private function process_refund() {
         $process_refund = true;
 
         // If the payment was not in publish, don't decrement stats as they were never incremented
-        if ( 'publish' != $this->old_status || 'wpi-refunded' != $this->status ) {
+        if ('publish' != $this->old_status || 'wpi-refunded' != $this->status) {
             $process_refund = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_refund = apply_filters( 'wpinv_should_process_refund', $process_refund, $this );
+        $process_refund = apply_filters('wpinv_should_process_refund', $process_refund, $this);
 
-        if ( false === $process_refund ) {
+        if (false === $process_refund) {
             return;
         }
 
-        do_action( 'wpinv_pre_refund_invoice', $this );
+        do_action('wpinv_pre_refund_invoice', $this);
         
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_refund', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_refund', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_refund', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_refund', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_refund', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_refund', true, $this);
         
-        do_action( 'wpinv_post_refund_invoice', $this );
+        do_action('wpinv_post_refund_invoice', $this);
     }
 
     private function process_failure() {
         $discounts = $this->discounts;
-        if ( empty( $discounts ) ) {
+        if (empty($discounts)) {
             return;
         }
 
-        if ( ! is_array( $discounts ) ) {
-            $discounts = array_map( 'trim', explode( ',', $discounts ) );
+        if (!is_array($discounts)) {
+            $discounts = array_map('trim', explode(',', $discounts));
         }
 
-        foreach ( $discounts as $discount ) {
-            wpinv_decrease_discount_usage( $discount );
+        foreach ($discounts as $discount) {
+            wpinv_decrease_discount_usage($discount);
         }
     }
     
@@ -1306,92 +1306,92 @@ 
         $process_pending = true;
 
         // If the payment was not in publish or revoked status, don't decrement stats as they were never incremented
-        if ( ( 'publish' != $this->old_status && 'revoked' != $this->old_status ) || 'wpi-pending' != $this->status ) {
+        if (('publish' != $this->old_status && 'revoked' != $this->old_status) || 'wpi-pending' != $this->status) {
             $process_pending = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_pending = apply_filters( 'wpinv_should_process_pending', $process_pending, $this );
+        $process_pending = apply_filters('wpinv_should_process_pending', $process_pending, $this);
 
-        if ( false === $process_pending ) {
+        if (false === $process_pending) {
             return;
         }
 
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_pending', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_pending', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_pending', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_pending', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_pending', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_pending', true, $this);
 
         $this->completed_date = '';
-        $this->update_meta( '_wpinv_completed_date', '' );
+        $this->update_meta('_wpinv_completed_date', '');
     }
     
     // get data
-    public function get_meta( $meta_key = '_wpinv_payment_meta', $single = true ) {
-        $meta = get_post_meta( $this->ID, $meta_key, $single );
+    public function get_meta($meta_key = '_wpinv_payment_meta', $single = true) {
+        $meta = get_post_meta($this->ID, $meta_key, $single);
 
-        if ( $meta_key === '_wpinv_payment_meta' ) {
+        if ($meta_key === '_wpinv_payment_meta') {
 
-            if(!is_array($meta)){$meta = array();} // we need this to be an array so make sure it is.
+            if (!is_array($meta)) {$meta = array(); } // we need this to be an array so make sure it is.
 
-            if ( empty( $meta['key'] ) ) {
+            if (empty($meta['key'])) {
                 $meta['key'] = $this->key;
             }
 
-            if ( empty( $meta['date'] ) ) {
-                $meta['date'] = get_post_field( 'post_date', $this->ID );
+            if (empty($meta['date'])) {
+                $meta['date'] = get_post_field('post_date', $this->ID);
             }
         }
 
-        $meta = apply_filters( 'wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID );
+        $meta = apply_filters('wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID);
 
-        return apply_filters( 'wpinv_get_invoice_meta', $meta, $this->ID, $meta_key );
+        return apply_filters('wpinv_get_invoice_meta', $meta, $this->ID, $meta_key);
     }
     
     public function get_description() {
-        $post = get_post( $this->ID );
+        $post = get_post($this->ID);
         
-        $description = !empty( $post ) ? $post->post_content : '';
-        return apply_filters( 'wpinv_get_description', $description, $this->ID, $this );
+        $description = !empty($post) ? $post->post_content : '';
+        return apply_filters('wpinv_get_description', $description, $this->ID, $this);
     }
     
-    public function get_status( $nicename = false ) {
-        if ( !$nicename ) {
+    public function get_status($nicename = false) {
+        if (!$nicename) {
             $status = $this->status;
         } else {
             $status = $this->status_nicename;
         }
         
-        return apply_filters( 'wpinv_get_status', $status, $nicename, $this->ID, $this );
+        return apply_filters('wpinv_get_status', $status, $nicename, $this->ID, $this);
     }
     
     public function get_cart_details() {
-        return apply_filters( 'wpinv_cart_details', $this->cart_details, $this->ID, $this );
+        return apply_filters('wpinv_cart_details', $this->cart_details, $this->ID, $this);
     }
     
-    public function get_subtotal( $currency = false ) {
-        $subtotal = wpinv_round_amount( $this->subtotal );
+    public function get_subtotal($currency = false) {
+        $subtotal = wpinv_round_amount($this->subtotal);
         
-        if ( $currency ) {
-            $subtotal = wpinv_price( wpinv_format_amount( $subtotal, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $subtotal = wpinv_price(wpinv_format_amount($subtotal, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency);
     }
     
-    public function get_total( $currency = false ) {        
-        if ( $this->is_free_trial() ) {
-            $total = wpinv_round_amount( 0 );
+    public function get_total($currency = false) {        
+        if ($this->is_free_trial()) {
+            $total = wpinv_round_amount(0);
         } else {
-            $total = wpinv_round_amount( $this->total );
+            $total = wpinv_round_amount($this->total);
         }
-        if ( $currency ) {
-            $total = wpinv_price( wpinv_format_amount( $total, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $total = wpinv_price(wpinv_format_amount($total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_total', $total, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_total', $total, $this->ID, $this, $currency);
     }
     
-    public function get_recurring_details( $field = '', $currency = false ) {        
+    public function get_recurring_details($field = '', $currency = false) {        
         $data                 = array();
         $data['cart_details'] = $this->cart_details;
         $data['subtotal']     = $this->get_subtotal();
@@ -1399,119 +1399,119 @@ 
         $data['tax']          = $this->get_tax();
         $data['total']        = $this->get_total();
     
-        if ( !empty( $this->cart_details ) && ( $this->is_parent() || $this->is_renewal() ) ) {
+        if (!empty($this->cart_details) && ($this->is_parent() || $this->is_renewal())) {
             $is_free_trial = $this->is_free_trial();
-            $discounts = $this->get_discounts( true );
+            $discounts = $this->get_discounts(true);
             
-            if ( $is_free_trial || !empty( $discounts ) ) {
+            if ($is_free_trial || !empty($discounts)) {
                 $first_use_only = false;
                 
-                if ( !empty( $discounts ) ) {
-                    foreach ( $discounts as $key => $code ) {
-                        if ( wpinv_discount_is_recurring( $code, true ) && !$this->is_renewal() ) {
+                if (!empty($discounts)) {
+                    foreach ($discounts as $key => $code) {
+                        if (wpinv_discount_is_recurring($code, true) && !$this->is_renewal()) {
                             $first_use_only = true;
                             break;
                         }
                     }
                 }
                     
-                if ( !$first_use_only ) {
-                    $data['subtotal'] = wpinv_round_amount( $this->subtotal );
-                    $data['discount'] = wpinv_round_amount( $this->discount );
-                    $data['tax']      = wpinv_round_amount( $this->tax );
-                    $data['total']    = wpinv_round_amount( $this->total );
+                if (!$first_use_only) {
+                    $data['subtotal'] = wpinv_round_amount($this->subtotal);
+                    $data['discount'] = wpinv_round_amount($this->discount);
+                    $data['tax']      = wpinv_round_amount($this->tax);
+                    $data['total']    = wpinv_round_amount($this->total);
                 } else {
                     $cart_subtotal   = 0;
                     $cart_discount   = $this->discount;
                     $cart_tax        = 0;
 
-                    foreach ( $this->cart_details as $key => $item ) {
-                        $item_quantity  = $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                        $item_subtotal  = !empty( $item['subtotal'] ) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
+                    foreach ($this->cart_details as $key => $item) {
+                        $item_quantity  = $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                        $item_subtotal  = !empty($item['subtotal']) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
                         $item_discount  = 0;
-                        $item_tax       = $item_subtotal > 0 && !empty( $item['vat_rate'] ) ? ( $item_subtotal * 0.01 * (float)$item['vat_rate'] ) : 0;
+                        $item_tax       = $item_subtotal > 0 && !empty($item['vat_rate']) ? ($item_subtotal * 0.01 * (float) $item['vat_rate']) : 0;
                         
-                        if ( wpinv_prices_include_tax() ) {
-                            $item_subtotal -= wpinv_round_amount( $item_tax );
+                        if (wpinv_prices_include_tax()) {
+                            $item_subtotal -= wpinv_round_amount($item_tax);
                         }
                         
                         $item_total     = $item_subtotal - $item_discount + $item_tax;
                         // Do not allow totals to go negative
-                        if ( $item_total < 0 ) {
+                        if ($item_total < 0) {
                             $item_total = 0;
                         }
                         
-                        $cart_subtotal  += (float)($item_subtotal);
-                        $cart_discount  += (float)($item_discount);
-                        $cart_tax       += (float)($item_tax);
+                        $cart_subtotal  += (float) ($item_subtotal);
+                        $cart_discount  += (float) ($item_discount);
+                        $cart_tax       += (float) ($item_tax);
                         
-                        $data['cart_details'][$key]['discount']   = wpinv_round_amount( $item_discount );
-                        $data['cart_details'][$key]['tax']        = wpinv_round_amount( $item_tax );
-                        $data['cart_details'][$key]['price']      = wpinv_round_amount( $item_total );
+                        $data['cart_details'][$key]['discount']   = wpinv_round_amount($item_discount);
+                        $data['cart_details'][$key]['tax']        = wpinv_round_amount($item_tax);
+                        $data['cart_details'][$key]['price']      = wpinv_round_amount($item_total);
                     }
 
 	                $total = $data['subtotal'] - $data['discount'] + $data['tax'];
-	                if ( $total < 0 ) {
+	                if ($total < 0) {
 		                $total = 0;
 	                }
 
-                    $data['subtotal'] = wpinv_round_amount( $cart_subtotal );
-                    $data['discount'] = wpinv_round_amount( $cart_discount );
-                    $data['tax']      = wpinv_round_amount( $cart_tax );
-                    $data['total']    = wpinv_round_amount( $total );
+                    $data['subtotal'] = wpinv_round_amount($cart_subtotal);
+                    $data['discount'] = wpinv_round_amount($cart_discount);
+                    $data['tax']      = wpinv_round_amount($cart_tax);
+                    $data['total']    = wpinv_round_amount($total);
                 }
             }
         }
         
-        $data = apply_filters( 'wpinv_get_invoice_recurring_details', $data, $this, $field, $currency );
+        $data = apply_filters('wpinv_get_invoice_recurring_details', $data, $this, $field, $currency);
 
-        if ( isset( $data[$field] ) ) {
-            return ( $currency ? wpinv_price( $data[$field], $this->get_currency() ) : $data[$field] );
+        if (isset($data[$field])) {
+            return ($currency ? wpinv_price($data[$field], $this->get_currency()) : $data[$field]);
         }
         
         return $data;
     }
     
-    public function get_final_tax( $currency = false ) {        
-        $final_total = wpinv_round_amount( $this->tax );
-        if ( $currency ) {
-            $final_total = wpinv_price( wpinv_format_amount( $final_total, NULL, !$currency ), $this->get_currency() );
+    public function get_final_tax($currency = false) {        
+        $final_total = wpinv_round_amount($this->tax);
+        if ($currency) {
+            $final_total = wpinv_price(wpinv_format_amount($final_total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_final_total', $final_total, $this, $currency );
+        return apply_filters('wpinv_get_invoice_final_total', $final_total, $this, $currency);
     }
     
-    public function get_discounts( $array = false ) {
+    public function get_discounts($array = false) {
         $discounts = $this->discounts;
-        if ( $array && $discounts ) {
-            $discounts = explode( ',', $discounts );
+        if ($array && $discounts) {
+            $discounts = explode(',', $discounts);
         }
-        return apply_filters( 'wpinv_payment_discounts', $discounts, $this->ID, $this, $array );
+        return apply_filters('wpinv_payment_discounts', $discounts, $this->ID, $this, $array);
     }
     
-    public function get_discount( $currency = false, $dash = false ) {
-        if ( !empty( $this->discounts ) ) {
+    public function get_discount($currency = false, $dash = false) {
+        if (!empty($this->discounts)) {
             global $ajax_cart_details;
             $ajax_cart_details = $this->get_cart_details();
             
-            if ( !empty( $ajax_cart_details ) && count( $ajax_cart_details ) == count( $this->items ) ) {
+            if (!empty($ajax_cart_details) && count($ajax_cart_details) == count($this->items)) {
                 $cart_items = $ajax_cart_details;
             } else {
                 $cart_items = $this->items;
             }
 
-            $this->discount = wpinv_get_cart_items_discount_amount( $cart_items , $this->discounts );
+            $this->discount = wpinv_get_cart_items_discount_amount($cart_items, $this->discounts);
         }
-        $discount   = wpinv_round_amount( $this->discount );
+        $discount   = wpinv_round_amount($this->discount);
         $dash       = $dash && $discount > 0 ? '&ndash;' : '';
         
-        if ( $currency ) {
-            $discount = wpinv_price( wpinv_format_amount( $discount, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $discount = wpinv_price(wpinv_format_amount($discount, NULL, !$currency), $this->get_currency());
         }
         
-        $discount   = $dash . $discount;
+        $discount = $dash . $discount;
         
-        return apply_filters( 'wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash );
+        return apply_filters('wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash);
     }
     
     public function get_discount_code() {
@@ -1523,163 +1523,163 @@ 
         return (int) $this->disable_taxes === 0;
     }
 
-    public function get_tax( $currency = false ) {
-        $tax = wpinv_round_amount( $this->tax );
+    public function get_tax($currency = false) {
+        $tax = wpinv_round_amount($this->tax);
 
-        if ( $currency ) {
-            $tax = wpinv_price( wpinv_format_amount( $tax, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $tax = wpinv_price(wpinv_format_amount($tax, NULL, !$currency), $this->get_currency());
         }
 
-        if ( ! $this->is_taxable() ) {
-            $tax = wpinv_round_amount( 0.00 );
+        if (!$this->is_taxable()) {
+            $tax = wpinv_round_amount(0.00);
         }
 
-        return apply_filters( 'wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency);
     }
     
-    public function get_fees( $type = 'all' ) {
-        $fees    = array();
+    public function get_fees($type = 'all') {
+        $fees = array();
 
-        if ( ! empty( $this->fees ) && is_array( $this->fees ) ) {
-            foreach ( $this->fees as $fee ) {
-                if( 'all' != $type && ! empty( $fee['type'] ) && $type != $fee['type'] ) {
+        if (!empty($this->fees) && is_array($this->fees)) {
+            foreach ($this->fees as $fee) {
+                if ('all' != $type && !empty($fee['type']) && $type != $fee['type']) {
                     continue;
                 }
 
-                $fee['label'] = stripslashes( $fee['label'] );
-                $fee['amount_display'] = wpinv_price( $fee['amount'], $this->get_currency() );
-                $fees[]    = $fee;
+                $fee['label'] = stripslashes($fee['label']);
+                $fee['amount_display'] = wpinv_price($fee['amount'], $this->get_currency());
+                $fees[] = $fee;
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees', $fees, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees', $fees, $this->ID, $this);
     }
     
-    public function get_fees_total( $type = 'all' ) {
+    public function get_fees_total($type = 'all') {
         $fees_total = (float) 0.00;
 
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
-        if ( ! empty( $payment_fees ) ) {
-            foreach ( $payment_fees as $fee ) {
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
+        if (!empty($payment_fees)) {
+            foreach ($payment_fees as $fee) {
                 $fees_total += (float) $fee['amount'];
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this);
 
     }
 
     public function get_user_id() {
-        return apply_filters( 'wpinv_user_id', $this->user_id, $this->ID, $this );
+        return apply_filters('wpinv_user_id', $this->user_id, $this->ID, $this);
     }
     
     public function get_first_name() {
-        return apply_filters( 'wpinv_first_name', $this->first_name, $this->ID, $this );
+        return apply_filters('wpinv_first_name', $this->first_name, $this->ID, $this);
     }
     
     public function get_last_name() {
-        return apply_filters( 'wpinv_last_name', $this->last_name, $this->ID, $this );
+        return apply_filters('wpinv_last_name', $this->last_name, $this->ID, $this);
     }
     
     public function get_user_full_name() {
-        return apply_filters( 'wpinv_user_full_name', $this->full_name, $this->ID, $this );
+        return apply_filters('wpinv_user_full_name', $this->full_name, $this->ID, $this);
     }
     
     public function get_user_info() {
-        return apply_filters( 'wpinv_user_info', $this->user_info, $this->ID, $this );
+        return apply_filters('wpinv_user_info', $this->user_info, $this->ID, $this);
     }
     
     public function get_email() {
-        return apply_filters( 'wpinv_user_email', $this->email, $this->ID, $this );
+        return apply_filters('wpinv_user_email', $this->email, $this->ID, $this);
     }
     
     public function get_address() {
-        return apply_filters( 'wpinv_address', $this->address, $this->ID, $this );
+        return apply_filters('wpinv_address', $this->address, $this->ID, $this);
     }
     
     public function get_phone() {
-        return apply_filters( 'wpinv_phone', $this->phone, $this->ID, $this );
+        return apply_filters('wpinv_phone', $this->phone, $this->ID, $this);
     }
     
     public function get_number() {
-        return apply_filters( 'wpinv_number', $this->number, $this->ID, $this );
+        return apply_filters('wpinv_number', $this->number, $this->ID, $this);
     }
     
     public function get_items() {
-        return apply_filters( 'wpinv_payment_meta_items', $this->items, $this->ID, $this );
+        return apply_filters('wpinv_payment_meta_items', $this->items, $this->ID, $this);
     }
     
     public function get_key() {
-        return apply_filters( 'wpinv_key', $this->key, $this->ID, $this );
+        return apply_filters('wpinv_key', $this->key, $this->ID, $this);
     }
     
     public function get_transaction_id() {
-        return apply_filters( 'wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this);
     }
     
     public function get_gateway() {
-        return apply_filters( 'wpinv_gateway', $this->gateway, $this->ID, $this );
+        return apply_filters('wpinv_gateway', $this->gateway, $this->ID, $this);
     }
     
     public function get_gateway_title() {
-        $this->gateway_title = !empty( $this->gateway_title ) ? $this->gateway_title : wpinv_get_gateway_checkout_label( $this->gateway );
+        $this->gateway_title = !empty($this->gateway_title) ? $this->gateway_title : wpinv_get_gateway_checkout_label($this->gateway);
         
-        return apply_filters( 'wpinv_gateway_title', $this->gateway_title, $this->ID, $this );
+        return apply_filters('wpinv_gateway_title', $this->gateway_title, $this->ID, $this);
     }
     
     public function get_currency() {
-        return apply_filters( 'wpinv_currency_code', $this->currency, $this->ID, $this );
+        return apply_filters('wpinv_currency_code', $this->currency, $this->ID, $this);
     }
     
     public function get_created_date() {
-        return apply_filters( 'wpinv_created_date', $this->date, $this->ID, $this );
+        return apply_filters('wpinv_created_date', $this->date, $this->ID, $this);
     }
     
-    public function get_due_date( $display = false ) {
-        $due_date = apply_filters( 'wpinv_due_date', $this->due_date, $this->ID, $this );
+    public function get_due_date($display = false) {
+        $due_date = apply_filters('wpinv_due_date', $this->due_date, $this->ID, $this);
         
-        if ( !$display || empty( $due_date ) ) {
+        if (!$display || empty($due_date)) {
             return $due_date;
         }
         
-        return date_i18n( get_option( 'date_format' ), strtotime( $due_date ) );
+        return date_i18n(get_option('date_format'), strtotime($due_date));
     }
     
     public function get_completed_date() {
-        return apply_filters( 'wpinv_completed_date', $this->completed_date, $this->ID, $this );
+        return apply_filters('wpinv_completed_date', $this->completed_date, $this->ID, $this);
     }
     
-    public function get_invoice_date( $formatted = true ) {
+    public function get_invoice_date($formatted = true) {
         $date_completed = $this->completed_date;
         $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? $date_completed : '';
         
-        if ( $invoice_date == '' ) {
+        if ($invoice_date == '') {
             $date_created   = $this->date;
             $invoice_date   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? $date_created : '';
         }
         
-        if ( $formatted && $invoice_date ) {
-            $invoice_date   = date_i18n( get_option( 'date_format' ), strtotime( $invoice_date ) );
+        if ($formatted && $invoice_date) {
+            $invoice_date = date_i18n(get_option('date_format'), strtotime($invoice_date));
         }
 
-        return apply_filters( 'wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this);
     }
     
     public function get_ip() {
-        return apply_filters( 'wpinv_user_ip', $this->ip, $this->ID, $this );
+        return apply_filters('wpinv_user_ip', $this->ip, $this->ID, $this);
     }
         
-    public function has_status( $status ) {
-        return apply_filters( 'wpinv_has_status', ( is_array( $status ) && in_array( $this->get_status(), $status ) ) || $this->get_status() === $status ? true : false, $this, $status );
+    public function has_status($status) {
+        return apply_filters('wpinv_has_status', (is_array($status) && in_array($this->get_status(), $status)) || $this->get_status() === $status ? true : false, $this, $status);
     }
     
-    public function add_item( $item_id = 0, $args = array() ) {
+    public function add_item($item_id = 0, $args = array()) {
         global $wpi_current_id, $wpi_item_id;
     
-        $item = new WPInv_Item( $item_id );
+        $item = new WPInv_Item($item_id);
 
         // Bail if this post isn't a item
-        if( !$item || $item->post_type !== 'wpi_item' ) {
+        if (!$item || $item->post_type !== 'wpi_item') {
             return false;
         }
         
@@ -1698,8 +1698,8 @@ 
             'fees'          => array()
         );
 
-        $args = wp_parse_args( apply_filters( 'wpinv_add_item_args', $args, $item->ID ), $defaults );
-        $args['quantity']   = $has_quantities && $args['quantity'] > 0 ? absint( $args['quantity'] ) : 1;
+        $args = wp_parse_args(apply_filters('wpinv_add_item_args', $args, $item->ID), $defaults);
+        $args['quantity'] = $has_quantities && $args['quantity'] > 0 ? absint($args['quantity']) : 1;
 
         $wpi_current_id         = $this->ID;
         $wpi_item_id            = $item->ID;
@@ -1711,19 +1711,19 @@ 
         $found_cart_key         = false;
         
         if ($has_quantities) {
-            $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+            $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
             
-            foreach ( $this->items as $key => $cart_item ) {
-                if ( (int)$item_id !== (int)$cart_item['id'] ) {
+            foreach ($this->items as $key => $cart_item) {
+                if ((int) $item_id !== (int) $cart_item['id']) {
                     continue;
                 }
 
-                $this->items[ $key ]['quantity'] += $args['quantity'];
+                $this->items[$key]['quantity'] += $args['quantity'];
                 break;
             }
             
-            foreach ( $this->cart_details as $cart_key => $cart_item ) {
-                if ( $item_id != $cart_item['id'] ) {
+            foreach ($this->cart_details as $cart_key => $cart_item) {
+                if ($item_id != $cart_item['id']) {
                     continue;
                 }
 
@@ -1735,29 +1735,29 @@ 
         if ($has_quantities && $found_cart_key !== false) {
             $cart_item          = $this->cart_details[$found_cart_key];
             $item_price         = $cart_item['item_price'];
-            $quantity           = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $quantity           = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
             $new_quantity       = $quantity + $args['quantity'];
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
             
-            $discount_increased = $discount > 0 && $subtotal > 0 && $discount > (float)$cart_item['discount'] ? $discount - (float)$cart_item['discount'] : 0;
-            $tax_increased      = $tax > 0 && $subtotal > 0 && $tax > (float)$cart_item['tax'] ? $tax - (float)$cart_item['tax'] : 0;
+            $discount_increased = $discount > 0 && $subtotal > 0 && $discount > (float) $cart_item['discount'] ? $discount - (float) $cart_item['discount'] : 0;
+            $tax_increased      = $tax > 0 && $subtotal > 0 && $tax > (float) $cart_item['tax'] ? $tax - (float) $cart_item['tax'] : 0;
             // The total increase equals the number removed * the item_price
-            $total_increased    = wpinv_round_amount( $item_price );
+            $total_increased    = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1773,25 +1773,25 @@ 
             $this->cart_details[$found_cart_key] = $cart_item;
         } else {
             // Set custom price.
-            if ( $args['custom_price'] !== '' ) {
+            if ($args['custom_price'] !== '') {
                 $item_price = $args['custom_price'];
             } else {
                 // Allow overriding the price
-                if ( false !== $args['item_price'] ) {
+                if (false !== $args['item_price']) {
                     $item_price = $args['item_price'];
                 } else {
-                    $item_price = wpinv_get_item_price( $item->ID );
+                    $item_price = wpinv_get_item_price($item->ID);
                 }
             }
 
             // Sanitizing the price here so we don't have a dozen calls later
-            $item_price = wpinv_sanitize_amount( $item_price );
-            $subtotal   = wpinv_round_amount( $item_price * $args['quantity'] );
+            $item_price = wpinv_sanitize_amount($item_price);
+            $subtotal   = wpinv_round_amount($item_price * $args['quantity']);
         
-            $discount   = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax_class  = !empty( $args['vat_class'] ) ? $args['vat_class'] : '';
-            $tax_rate   = !empty( $args['vat_rate'] ) ? $args['vat_rate'] : 0;
-            $tax        = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount   = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax_class  = !empty($args['vat_class']) ? $args['vat_class'] : '';
+            $tax_rate   = !empty($args['vat_rate']) ? $args['vat_rate'] : 0;
+            $tax        = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
 
             // Setup the items meta item
             $new_item = array(
@@ -1799,29 +1799,29 @@ 
                 'quantity' => $args['quantity'],
             );
 
-            $this->items[]  = $new_item;
+            $this->items[] = $new_item;
 
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total      = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
         
             $this->cart_details[] = array(
                 'name'          => !empty($args['name']) ? $args['name'] : $item->get_name(),
                 'id'            => $item->ID,
-                'item_price'    => wpinv_round_amount( $item_price ),
-                'custom_price'  => ( $args['custom_price'] !== '' ? wpinv_round_amount( $args['custom_price'] ) : '' ),
+                'item_price'    => wpinv_round_amount($item_price),
+                'custom_price'  => ($args['custom_price'] !== '' ? wpinv_round_amount($args['custom_price']) : ''),
                 'quantity'      => $args['quantity'],
                 'discount'      => $discount,
-                'subtotal'      => wpinv_round_amount( $subtotal ),
-                'tax'           => wpinv_round_amount( $tax ),
-                'price'         => wpinv_round_amount( $total ),
+                'subtotal'      => wpinv_round_amount($subtotal),
+                'tax'           => wpinv_round_amount($tax),
+                'price'         => wpinv_round_amount($total),
                 'vat_rate'      => $tax_rate,
                 'vat_class'     => $tax_class,
                 'meta'          => $args['meta'],
@@ -1831,18 +1831,18 @@ 
             $subtotal = $subtotal - $discount;
         }
         
-        $added_item = end( $this->cart_details );
-        $added_item['action']  = 'add';
+        $added_item = end($this->cart_details);
+        $added_item['action'] = 'add';
         
         $this->pending['items'][] = $added_item;
         
-        $this->increase_subtotal( $subtotal );
-        $this->increase_tax( $tax );
+        $this->increase_subtotal($subtotal);
+        $this->increase_tax($tax);
 
         return true;
     }
 
-    public function remove_item( $item_id, $args = array() ) {
+    public function remove_item($item_id, $args = array()) {
 
         // Set some defaults
         $defaults = array(
@@ -1851,51 +1851,51 @@ 
             'custom_price'  => '',
             'cart_index'    => false,
         );
-        $args = wp_parse_args( $args, $defaults );
+        $args = wp_parse_args($args, $defaults);
 
         // Bail if this post isn't a item
-        if ( get_post_type( $item_id ) !== 'wpi_item' ) {
+        if (get_post_type($item_id) !== 'wpi_item') {
             return false;
         }
         
-        $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+        $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
 
-        foreach ( $this->items as $key => $item ) {
-            if ( !empty($item['id']) && (int)$item_id !== (int)$item['id'] ) {
+        foreach ($this->items as $key => $item) {
+            if (!empty($item['id']) && (int) $item_id !== (int) $item['id']) {
                 continue;
             }
 
-            if ( false !== $args['cart_index'] ) {
-                $cart_index = absint( $args['cart_index'] );
-                $cart_item  = ! empty( $this->cart_details[ $cart_index ] ) ? $this->cart_details[ $cart_index ] : false;
+            if (false !== $args['cart_index']) {
+                $cart_index = absint($args['cart_index']);
+                $cart_item  = !empty($this->cart_details[$cart_index]) ? $this->cart_details[$cart_index] : false;
 
-                if ( ! empty( $cart_item ) ) {
+                if (!empty($cart_item)) {
                     // If the cart index item isn't the same item ID, don't remove it
-                    if ( !empty($cart_item['id']) && $cart_item['id'] != $item['id'] ) {
+                    if (!empty($cart_item['id']) && $cart_item['id'] != $item['id']) {
                         continue;
                     }
                 }
             }
 
-            $item_quantity = $this->items[ $key ]['quantity'];
-            if ( $item_quantity > $args['quantity'] ) {
-                $this->items[ $key ]['quantity'] -= $args['quantity'];
+            $item_quantity = $this->items[$key]['quantity'];
+            if ($item_quantity > $args['quantity']) {
+                $this->items[$key]['quantity'] -= $args['quantity'];
                 break;
             } else {
-                unset( $this->items[ $key ] );
+                unset($this->items[$key]);
                 break;
             }
         }
 
         $found_cart_key = false;
-        if ( false === $args['cart_index'] ) {
-            foreach ( $this->cart_details as $cart_key => $item ) {
-                if ( $item_id != $item['id'] ) {
+        if (false === $args['cart_index']) {
+            foreach ($this->cart_details as $cart_key => $item) {
+                if ($item_id != $item['id']) {
                     continue;
                 }
 
-                if ( false !== $args['item_price'] ) {
-                    if ( isset( $item['item_price'] ) && (float) $args['item_price'] != (float) $item['item_price'] ) {
+                if (false !== $args['item_price']) {
+                    if (isset($item['item_price']) && (float) $args['item_price'] != (float) $item['item_price']) {
                         continue;
                     }
                 }
@@ -1904,13 +1904,13 @@ 
                 break;
             }
         } else {
-            $cart_index = absint( $args['cart_index'] );
+            $cart_index = absint($args['cart_index']);
 
-            if ( ! array_key_exists( $cart_index, $this->cart_details ) ) {
+            if (!array_key_exists($cart_index, $this->cart_details)) {
                 return false; // Invalid cart index passed.
             }
 
-            if ( (int) $this->cart_details[ $cart_index ]['id'] > 0 && (int) $this->cart_details[ $cart_index ]['id'] !== (int) $item_id ) {
+            if ((int) $this->cart_details[$cart_index]['id'] > 0 && (int) $this->cart_details[$cart_index]['id'] !== (int) $item_id) {
                 return false; // We still need the proper Item ID to be sure.
             }
 
@@ -1918,41 +1918,41 @@ 
         }
         
         $cart_item  = $this->cart_details[$found_cart_key];
-        $quantity   = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
+        $quantity   = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
         
-        if ( count( $this->cart_details ) == 1 && ( $quantity - $args['quantity'] ) < 1 ) {
+        if (count($this->cart_details) == 1 && ($quantity - $args['quantity']) < 1) {
             //return false; // Invoice must contain at least one item.
         }
         
-        $discounts  = $this->get_discounts();
+        $discounts = $this->get_discounts();
         
-        if ( $quantity > $args['quantity'] ) {
+        if ($quantity > $args['quantity']) {
             $item_price         = $cart_item['item_price'];
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
-            $new_quantity       = max( $quantity - $args['quantity'], 1);
+            $new_quantity       = max($quantity - $args['quantity'], 1);
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
             
-            $discount_decrease  = (float)$cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['discount'] / $quantity ) ) : 0;
-            $discount_decrease  = $discount > 0 && $subtotal > 0 && (float)$cart_item['discount'] > $discount ? (float)$cart_item['discount'] - $discount : $discount_decrease; 
-            $tax_decrease       = (float)$cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['tax'] / $quantity ) ) : 0;
-            $tax_decrease       = $tax > 0 && $subtotal > 0 && (float)$cart_item['tax'] > $tax ? (float)$cart_item['tax'] - $tax : $tax_decrease;
+            $discount_decrease  = (float) $cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount(((float) $cart_item['discount'] / $quantity)) : 0;
+            $discount_decrease  = $discount > 0 && $subtotal > 0 && (float) $cart_item['discount'] > $discount ? (float) $cart_item['discount'] - $discount : $discount_decrease; 
+            $tax_decrease       = (float) $cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount(((float) $cart_item['tax'] / $quantity)) : 0;
+            $tax_decrease       = $tax > 0 && $subtotal > 0 && (float) $cart_item['tax'] > $tax ? (float) $cart_item['tax'] - $tax : $tax_decrease;
             
             // The total increase equals the number removed * the item_price
-            $total_decrease     = wpinv_round_amount( $item_price );
+            $total_decrease     = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1971,16 +1971,16 @@ 
             
             $this->cart_details[$found_cart_key] = $cart_item;
             
-            $remove_item = end( $this->cart_details );
+            $remove_item = end($this->cart_details);
         } else {
             $item_price     = $cart_item['item_price'];
-            $discount       = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax            = !empty( $cart_item['tax'] ) ? $cart_item['tax'] : 0;
+            $discount       = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax            = !empty($cart_item['tax']) ? $cart_item['tax'] : 0;
         
-            $subtotal_decrease  = ( $item_price * $quantity ) - $discount;
+            $subtotal_decrease  = ($item_price * $quantity) - $discount;
             $tax_decrease       = $tax;
 
-            unset( $this->cart_details[$found_cart_key] );
+            unset($this->cart_details[$found_cart_key]);
             
             $remove_item             = $args;
             $remove_item['id']       = $item_id;
@@ -1991,8 +1991,8 @@ 
         $remove_item['action']      = 'remove';
         $this->pending['items'][]   = $remove_item;
                
-        $this->decrease_subtotal( $subtotal_decrease );
-        $this->decrease_tax( $tax_decrease );
+        $this->decrease_subtotal($subtotal_decrease);
+        $this->decrease_tax($tax_decrease);
         
         return true;
     }
@@ -2000,7 +2000,7 @@ 
     public function update_items($temp = false) {
         global $wpinv_euvat, $wpi_current_id, $wpi_item_id, $wpi_nosave;
 
-        if ( ! empty( $this->cart_details ) ) {
+        if (!empty($this->cart_details)) {
             $wpi_nosave             = $temp;
             $cart_subtotal          = 0;
             $cart_discount          = 0;
@@ -2010,65 +2010,65 @@ 
             $_POST['wpinv_country'] = $this->country;
             $_POST['wpinv_state']   = $this->state;
 
-            foreach ( $this->cart_details as $key => $item ) {
+            foreach ($this->cart_details as $key => $item) {
                 $item_price = $item['item_price'];
-                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                $amount     = wpinv_round_amount( $item_price * $quantity );
+                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                $amount     = wpinv_round_amount($item_price * $quantity);
                 $subtotal   = $item_price * $quantity;
 
                 $wpi_current_id         = $this->ID;
                 $wpi_item_id            = $item['id'];
 
-                $discount   = wpinv_get_cart_item_discount_amount( $item, $this->get_discounts() );
+                $discount   = wpinv_get_cart_item_discount_amount($item, $this->get_discounts());
 
-                $tax_rate   = wpinv_get_tax_rate( $this->country, $this->state, $wpi_item_id );
-                $tax_class  = $wpinv_euvat->get_item_class( $wpi_item_id );
-                $tax        = $item_price > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+                $tax_rate   = wpinv_get_tax_rate($this->country, $this->state, $wpi_item_id);
+                $tax_class  = $wpinv_euvat->get_item_class($wpi_item_id);
+                $tax        = $item_price > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
 
-                if ( ! $this->is_taxable() ) {
+                if (!$this->is_taxable()) {
                     $tax = 0;
                 }
 
-                if ( wpinv_prices_include_tax() ) {
-                    $subtotal -= wpinv_round_amount( $tax );
+                if (wpinv_prices_include_tax()) {
+                    $subtotal -= wpinv_round_amount($tax);
                 }
 
-                $total      = $subtotal - $discount + $tax;
+                $total = $subtotal - $discount + $tax;
 
                 // Do not allow totals to go negative
-                if( $total < 0 ) {
+                if ($total < 0) {
                     $total = 0;
                 }
 
                 $cart_details[] = array(
                     'id'          => $item['id'],
                     'name'        => $item['name'],
-                    'item_price'  => wpinv_round_amount( $item_price ),
-                    'custom_price'=> ( isset( $item['custom_price'] ) ? $item['custom_price'] : '' ),
+                    'item_price'  => wpinv_round_amount($item_price),
+                    'custom_price'=> (isset($item['custom_price']) ? $item['custom_price'] : ''),
                     'quantity'    => $quantity,
                     'discount'    => $discount,
-                    'subtotal'    => wpinv_round_amount( $subtotal ),
-                    'tax'         => wpinv_round_amount( $tax ),
-                    'price'       => wpinv_round_amount( $total ),
+                    'subtotal'    => wpinv_round_amount($subtotal),
+                    'tax'         => wpinv_round_amount($tax),
+                    'price'       => wpinv_round_amount($total),
                     'vat_rate'    => $tax_rate,
                     'vat_class'   => $tax_class,
                     'meta'        => isset($item['meta']) ? $item['meta'] : array(),
                     'fees'        => isset($item['fees']) ? $item['fees'] : array(),
                 );
 
-                $cart_subtotal  += (float)($subtotal - $discount); // TODO
-                $cart_discount  += (float)($discount);
-                $cart_tax       += (float)($tax);
+                $cart_subtotal  += (float) ($subtotal - $discount); // TODO
+                $cart_discount  += (float) ($discount);
+                $cart_tax       += (float) ($tax);
             }
-            if ( $cart_subtotal < 0 ) {
+            if ($cart_subtotal < 0) {
                 $cart_subtotal = 0;
             }
-            if ( $cart_tax < 0 ) {
+            if ($cart_tax < 0) {
                 $cart_tax = 0;
             }
-            $this->subtotal = wpinv_round_amount( $cart_subtotal );
-            $this->tax      = wpinv_round_amount( $cart_tax );
-            $this->discount = wpinv_round_amount( $cart_discount );
+            $this->subtotal = wpinv_round_amount($cart_subtotal);
+            $this->tax      = wpinv_round_amount($cart_tax);
+            $this->discount = wpinv_round_amount($cart_discount);
             
             $this->recalculate_total();
             
@@ -2080,177 +2080,177 @@ 
     
     public function recalculate_totals($temp = false) {        
         $this->update_items($temp);
-        $this->save( true );
+        $this->save(true);
         
         return $this;
     }
     
     public function needs_payment() {
-        $valid_invoice_statuses = apply_filters( 'wpinv_valid_invoice_statuses_for_payment', array( 'wpi-pending' ), $this );
+        $valid_invoice_statuses = apply_filters('wpinv_valid_invoice_statuses_for_payment', array('wpi-pending'), $this);
 
-        if ( $this->has_status( $valid_invoice_statuses ) && ( $this->get_total() > 0 || $this->is_free_trial() || $this->is_free() || $this->is_initial_free() ) ) {
+        if ($this->has_status($valid_invoice_statuses) && ($this->get_total() > 0 || $this->is_free_trial() || $this->is_free() || $this->is_initial_free())) {
             $needs_payment = true;
         } else {
             $needs_payment = false;
         }
 
-        return apply_filters( 'wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses );
+        return apply_filters('wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses);
     }
     
-    public function get_checkout_payment_url( $with_key = false, $secret = false ) {
+    public function get_checkout_payment_url($with_key = false, $secret = false) {
         $pay_url = wpinv_get_checkout_uri();
 
-        if ( is_ssl() ) {
-            $pay_url = str_replace( 'http:', 'https:', $pay_url );
+        if (is_ssl()) {
+            $pay_url = str_replace('http:', 'https:', $pay_url);
         }
         
         $key = $this->get_key();
 
-        if ( $with_key ) {
-            $pay_url = add_query_arg( 'invoice_key', $key, $pay_url );
+        if ($with_key) {
+            $pay_url = add_query_arg('invoice_key', $key, $pay_url);
         } else {
-            $pay_url = add_query_arg( array( 'wpi_action' => 'pay_for_invoice', 'invoice_key' => $key ), $pay_url );
+            $pay_url = add_query_arg(array('wpi_action' => 'pay_for_invoice', 'invoice_key' => $key), $pay_url);
         }
         
-        if ( $secret ) {
-            $pay_url = add_query_arg( array( '_wpipay' => md5( $this->get_user_id() . '::' . $this->get_email() . '::' . $key ) ), $pay_url );
+        if ($secret) {
+            $pay_url = add_query_arg(array('_wpipay' => md5($this->get_user_id() . '::' . $this->get_email() . '::' . $key)), $pay_url);
         }
 
-        return apply_filters( 'wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret );
+        return apply_filters('wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret);
     }
     
-    public function get_view_url( $with_key = false ) {
-        $invoice_url = get_permalink( $this->ID );
+    public function get_view_url($with_key = false) {
+        $invoice_url = get_permalink($this->ID);
 
-        if ( $with_key ) {
-            $invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
+        if ($with_key) {
+            $invoice_url = add_query_arg('invoice_key', $this->get_key(), $invoice_url);
         }
 
-        return apply_filters( 'wpinv_get_view_url', $invoice_url, $this, $with_key );
+        return apply_filters('wpinv_get_view_url', $invoice_url, $this, $with_key);
     }
     
-    public function generate_key( $string = '' ) {
-        $auth_key  = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-        return strtolower( md5( $string . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'wpinv', true ) ) );  // Unique key
+    public function generate_key($string = '') {
+        $auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+        return strtolower(md5($string . date('Y-m-d H:i:s') . $auth_key . uniqid('wpinv', true))); // Unique key
     }
     
     public function is_recurring() {
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return false;
         }
         
         $has_subscription = false;
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $has_subscription = true;
                 break;
             }
         }
         
-        if ( count( $this->cart_details ) > 1 ) {
+        if (count($this->cart_details) > 1) {
             $has_subscription = false;
         }
 
-        return apply_filters( 'wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details );
+        return apply_filters('wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details);
     }
 
     public function is_free_trial() {
         $is_free_trial = false;
         
-        if ( $this->is_parent() && $item = $this->get_recurring( true ) ) {
-            if ( !empty( $item ) && $item->has_free_trial() ) {
+        if ($this->is_parent() && $item = $this->get_recurring(true)) {
+            if (!empty($item) && $item->has_free_trial()) {
                 $is_free_trial = true;
             }
         }
 
-        return apply_filters( 'wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details, $this );
+        return apply_filters('wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details, $this);
     }
 
     public function is_initial_free() {
         $is_initial_free = false;
         
-        if ( ! ( (float)wpinv_round_amount( $this->get_total() ) > 0 ) && $this->is_parent() && $this->is_recurring() && ! $this->is_free_trial() && ! $this->is_free() ) {
+        if (!((float) wpinv_round_amount($this->get_total()) > 0) && $this->is_parent() && $this->is_recurring() && !$this->is_free_trial() && !$this->is_free()) {
             $is_initial_free = true;
         }
 
-        return apply_filters( 'wpinv_invoice_is_initial_free', $is_initial_free, $this->cart_details );
+        return apply_filters('wpinv_invoice_is_initial_free', $is_initial_free, $this->cart_details);
     }
     
-    public function get_recurring( $object = false ) {
+    public function get_recurring($object = false) {
         $item = NULL;
         
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return $item;
         }
 
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $item = $cart_item['id'];
                 break;
             }
         }
 
-        if ( $object ) {
-            $item = $item ? new WPInv_Item( $item ) : NULL;
+        if ($object) {
+            $item = $item ? new WPInv_Item($item) : NULL;
             
-            apply_filters( 'wpinv_invoice_get_recurring_item', $item, $this );
+            apply_filters('wpinv_invoice_get_recurring_item', $item, $this);
         }
 
-        return apply_filters( 'wpinv_invoice_get_recurring_item_id', $item, $this );
+        return apply_filters('wpinv_invoice_get_recurring_item_id', $item, $this);
     }
 
     public function get_subscription_name() {
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return NULL;
         }
 
-        if ( !($name = $item->get_name()) ) {
+        if (!($name = $item->get_name())) {
             $name = $item->post_name;
         }
 
-        return apply_filters( 'wpinv_invoice_get_subscription_name', $name, $this );
+        return apply_filters('wpinv_invoice_get_subscription_name', $name, $this);
     }
 
     public function get_subscription_id() {
-        $subscription_id = $this->get_meta( '_wpinv_subscr_profile_id', true );
+        $subscription_id = $this->get_meta('_wpinv_subscr_profile_id', true);
 
-        if ( empty( $subscription_id ) && !empty( $this->parent_invoice ) ) {
-            $parent_invoice = wpinv_get_invoice( $this->parent_invoice );
+        if (empty($subscription_id) && !empty($this->parent_invoice)) {
+            $parent_invoice = wpinv_get_invoice($this->parent_invoice);
 
-            $subscription_id = $parent_invoice->get_meta( '_wpinv_subscr_profile_id', true );
+            $subscription_id = $parent_invoice->get_meta('_wpinv_subscr_profile_id', true);
         }
         
         return $subscription_id;
     }
     
     public function is_parent() {
-        $is_parent = empty( $this->parent_invoice ) ? true : false;
+        $is_parent = empty($this->parent_invoice) ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_parent', $is_parent, $this );
+        return apply_filters('wpinv_invoice_is_parent', $is_parent, $this);
     }
     
     public function is_renewal() {
         $is_renewal = $this->parent_invoice && $this->parent_invoice != $this->ID ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_renewal', $is_renewal, $this );
+        return apply_filters('wpinv_invoice_is_renewal', $is_renewal, $this);
     }
     
     public function get_parent_payment() {
         $parent_payment = NULL;
         
-        if ( $this->is_renewal() ) {
-            $parent_payment = wpinv_get_invoice( $this->parent_invoice );
+        if ($this->is_renewal()) {
+            $parent_payment = wpinv_get_invoice($this->parent_invoice);
         }
         
         return $parent_payment;
     }
     
     public function is_paid() {
-        $is_paid = $this->has_status( array( 'publish', 'wpi-processing', 'wpi-renewal' ) );
+        $is_paid = $this->has_status(array('publish', 'wpi-processing', 'wpi-renewal'));
 
-        return apply_filters( 'wpinv_invoice_is_paid', $is_paid, $this );
+        return apply_filters('wpinv_invoice_is_paid', $is_paid, $this);
     }
 
     /**
@@ -2263,23 +2263,23 @@ 
     }
     
     public function is_refunded() {
-        $is_refunded = $this->has_status( array( 'wpi-refunded' ) );
+        $is_refunded = $this->has_status(array('wpi-refunded'));
 
-        return apply_filters( 'wpinv_invoice_is_refunded', $is_refunded, $this );
+        return apply_filters('wpinv_invoice_is_refunded', $is_refunded, $this);
     }
     
     public function is_free() {
         $is_free = false;
         
-        if ( !( (float)wpinv_round_amount( $this->get_total() ) > 0 ) ) {
-            if ( $this->is_parent() && $this->is_recurring() ) {
-                $is_free = (float)wpinv_round_amount( $this->get_recurring_details( 'total' ) ) > 0 ? false : true;
+        if (!((float) wpinv_round_amount($this->get_total()) > 0)) {
+            if ($this->is_parent() && $this->is_recurring()) {
+                $is_free = (float) wpinv_round_amount($this->get_recurring_details('total')) > 0 ? false : true;
             } else {
                 $is_free = true;
             }
         }
         
-        return apply_filters( 'wpinv_invoice_is_free', $is_free, $this );
+        return apply_filters('wpinv_invoice_is_free', $is_free, $this);
     }
     
     public function has_vat() {
@@ -2287,41 +2287,41 @@ 
         
         $requires_vat = false;
         
-        if ( $this->country ) {
+        if ($this->country) {
             $wpi_country        = $this->country;
             
-            $requires_vat       = $wpinv_euvat->requires_vat( $requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule( $this ) );
+            $requires_vat       = $wpinv_euvat->requires_vat($requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule($this));
         }
         
-        return apply_filters( 'wpinv_invoice_has_vat', $requires_vat, $this );
+        return apply_filters('wpinv_invoice_has_vat', $requires_vat, $this);
     }
 
     public function refresh_item_ids() {
         $item_ids = array();
         
-        if ( ! empty( $this->cart_details ) ) {
-            foreach ( array_keys( $this->cart_details ) as $item ) {
-                if ( ! empty( $item['id'] ) ) {
+        if (!empty($this->cart_details)) {
+            foreach (array_keys($this->cart_details) as $item) {
+                if (!empty($item['id'])) {
                     $item_ids[] = $item['id'];
                 }
             }
         }
         
-        $item_ids = !empty( $item_ids ) ? implode( ',', array_unique( $item_ids ) ) : '';
+        $item_ids = !empty($item_ids) ? implode(',', array_unique($item_ids)) : '';
         
-        update_post_meta( $this->ID, '_wpinv_item_ids', $item_ids );
+        update_post_meta($this->ID, '_wpinv_item_ids', $item_ids);
     }
     
-    public function get_invoice_quote_type( $post_id ) {
-        if ( empty( $post_id ) ) {
+    public function get_invoice_quote_type($post_id) {
+        if (empty($post_id)) {
             return '';
         }
 
-        $type = get_post_type( $post_id );
+        $type = get_post_type($post_id);
 
-        if ( 'wpi_invoice' === $type ) {
+        if ('wpi_invoice' === $type) {
             $post_type = __('Invoice', 'invoicing');
-        } else{
+        } else {
             $post_type = __('Quote', 'invoicing');
         }
 

includes/class-wpinv-session-handler.php

Indentation +267 added lines, -267 removed lines

@@ -12,124 +12,124 @@ 
  */
 class WPInv_Session_Handler extends WPInv_Session {
 
-	/**
-	 * Cookie name used for the session.
-	 *
-	 * @var string cookie name
-	 */
-	protected $_cookie;
-
-	/**
-	 * Stores session expiry.
-	 *
-	 * @var int session due to expire timestamp
-	 */
-	protected $_session_expiring;
-
-	/**
-	 * Stores session due to expire timestamp.
-	 *
-	 * @var string session expiration timestamp
-	 */
-	protected $_session_expiration;
-
-	/**
-	 * True when the cookie exists.
-	 *
-	 * @var bool Based on whether a cookie exists.
-	 */
-	protected $_has_cookie = false;
-
-	/**
-	 * Table name for session data.
-	 *
-	 * @var string Custom session table name
-	 */
-	protected $_table;
-
-	/**
-	 * Constructor for the session class.
-	 */
-	public function __construct() {
-
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
+    /**
+     * Cookie name used for the session.
+     *
+     * @var string cookie name
+     */
+    protected $_cookie;
+
+    /**
+     * Stores session expiry.
+     *
+     * @var int session due to expire timestamp
+     */
+    protected $_session_expiring;
+
+    /**
+     * Stores session due to expire timestamp.
+     *
+     * @var string session expiration timestamp
+     */
+    protected $_session_expiration;
+
+    /**
+     * True when the cookie exists.
+     *
+     * @var bool Based on whether a cookie exists.
+     */
+    protected $_has_cookie = false;
+
+    /**
+     * Table name for session data.
+     *
+     * @var string Custom session table name
+     */
+    protected $_table;
+
+    /**
+     * Constructor for the session class.
+     */
+    public function __construct() {
+
+        $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
         add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
-	}
-
-	/**
-	 * Init hooks and session data.
-	 *
-	 * @since 3.3.0
-	 */
-	public function init() {
-		$this->init_session_cookie();
-
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
-		}
-	}
-
-	/**
-	 * Setup cookie and customer ID.
-	 *
-	 * @since 3.6.0
-	 */
-	public function init_session_cookie() {
-		$cookie = $this->get_session_cookie();
-
-		if ( $cookie ) {
-			$this->_customer_id        = $cookie[0];
-			$this->_session_expiration = $cookie[1];
-			$this->_session_expiring   = $cookie[2];
-			$this->_has_cookie         = true;
-			$this->_data               = $this->get_session_data();
-
-			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
-				$this->_customer_id = get_current_user_id();
-				$this->_dirty       = true;
-				$this->save_data();
-				$this->set_customer_session_cookie( true );
-			}
-
-			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
-				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
-			}
-		} else {
-			$this->set_session_expiration();
-			$this->_customer_id = $this->generate_customer_id();
-			$this->_data        = $this->get_session_data();
-		}
-	}
-
-	/**
-	 * Sets the session cookie on-demand (usually after adding an item to the cart).
-	 *
-	 * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
-	 *
-	 * Warning: Cookies will only be set if this is called before the headers are sent.
-	 *
-	 * @param bool $set Should the session cookie be set.
-	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
-			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
-			$this->_has_cookie = true;
-
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
-			}
-		}
-	}
-
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
+        add_action( 'wp_logout', array( $this, 'destroy_session' ) );
+        add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
+        add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+    }
+
+    /**
+     * Init hooks and session data.
+     *
+     * @since 3.3.0
+     */
+    public function init() {
+        $this->init_session_cookie();
+
+        if ( ! is_user_logged_in() ) {
+            add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
+        }
+    }
+
+    /**
+     * Setup cookie and customer ID.
+     *
+     * @since 3.6.0
+     */
+    public function init_session_cookie() {
+        $cookie = $this->get_session_cookie();
+
+        if ( $cookie ) {
+            $this->_customer_id        = $cookie[0];
+            $this->_session_expiration = $cookie[1];
+            $this->_session_expiring   = $cookie[2];
+            $this->_has_cookie         = true;
+            $this->_data               = $this->get_session_data();
+
+            // If the user logs in, update session.
+            if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+                $this->_customer_id = get_current_user_id();
+                $this->_dirty       = true;
+                $this->save_data();
+                $this->set_customer_session_cookie( true );
+            }
+
+            // Update session if its close to expiring.
+            if ( time() > $this->_session_expiring ) {
+                $this->set_session_expiration();
+                $this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+            }
+        } else {
+            $this->set_session_expiration();
+            $this->_customer_id = $this->generate_customer_id();
+            $this->_data        = $this->get_session_data();
+        }
+    }
+
+    /**
+     * Sets the session cookie on-demand (usually after adding an item to the cart).
+     *
+     * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
+     *
+     * Warning: Cookies will only be set if this is called before the headers are sent.
+     *
+     * @param bool $set Should the session cookie be set.
+     */
+    public function set_customer_session_cookie( $set ) {
+        if ( $set ) {
+            $to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
+            $cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+            $cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
+            $this->_has_cookie = true;
+
+            if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
+                $this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+            }
+        }
+    }
+
+    public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
         if ( ! headers_sent() ) {
             setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
         } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
@@ -138,86 +138,86 @@ 
         }
     }
 
-	/**
-	 * Should the session cookie be secure?
-	 *
-	 * @since 3.6.0
-	 * @return bool
-	 */
-	protected function use_secure_cookie() {
+    /**
+     * Should the session cookie be secure?
+     *
+     * @since 3.6.0
+     * @return bool
+     */
+    protected function use_secure_cookie() {
         $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
-	}
-
-	/**
-	 * Return true if the current user has an active session, i.e. a cookie to retrieve values.
-	 *
-	 * @return bool
-	 */
-	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
-	}
-
-	/**
-	 * Set session expiration.
-	 */
-	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
-	}
-
-	/**
-	 * Generates session ids.
-	 *
-	 * @return string
-	 */
-	public function generate_customer_id() {
-		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
-	}
-
-	/**
-	 * Get the session cookie, if set. Otherwise return false.
-	 *
-	 * Session cookies without a customer ID are invalid.
-	 *
-	 * @return bool|array
-	 */
-	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
-
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
-			return false;
-		}
-
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
-
-		if ( empty( $customer_id ) ) {
-			return false;
-		}
-
-		// Validate hash.
-		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
-			return false;
-		}
-
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
-	}
-
-	/**
-	 * Get session data.
-	 *
-	 * @return array
-	 */
-	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
-	}
-
-	public function generate_key($customer_id){
+        return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+    }
+
+    /**
+     * Return true if the current user has an active session, i.e. a cookie to retrieve values.
+     *
+     * @return bool
+     */
+    public function has_session() {
+        return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+    }
+
+    /**
+     * Set session expiration.
+     */
+    public function set_session_expiration() {
+        $this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
+        $this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+    }
+
+    /**
+     * Generates session ids.
+     *
+     * @return string
+     */
+    public function generate_customer_id() {
+        require_once ABSPATH . 'wp-includes/class-phpass.php';
+        $hasher      = new PasswordHash( 8, false );
+        return md5( $hasher->get_random_bytes( 32 ) );
+    }
+
+    /**
+     * Get the session cookie, if set. Otherwise return false.
+     *
+     * Session cookies without a customer ID are invalid.
+     *
+     * @return bool|array
+     */
+    public function get_session_cookie() {
+        $cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+
+        if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+            return false;
+        }
+
+        list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+
+        if ( empty( $customer_id ) ) {
+            return false;
+        }
+
+        // Validate hash.
+        $to_hash = $customer_id . '|' . $session_expiration;
+        $hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+
+        if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+            return false;
+        }
+
+        return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+    }
+
+    /**
+     * Get session data.
+     *
+     * @return array
+     */
+    public function get_session_data() {
+        return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+    }
+
+    public function generate_key($customer_id){
         if(!$customer_id){
             return;
         }
@@ -225,62 +225,62 @@ 
         return 'wpi_trans_'.$customer_id;
     }
 
-	/**
-	 * Save data.
-	 */
-	public function save_data() {
-		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+    /**
+     * Save data.
+     */
+    public function save_data() {
+        // Dirty if something changed - prevents saving nothing new.
+        if ( $this->_dirty && $this->has_session() ) {
 
             set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
-			$this->_dirty = false;
-		}
-	}
-
-	/**
-	 * Destroy all session data.
-	 */
-	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
-		$this->forget_session();
-	}
-
-	/**
-	 * Forget all session data without destroying it.
-	 */
-	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
-
-		wpinv_empty_cart();
-
-		$this->_data        = array();
-		$this->_dirty       = false;
-		$this->_customer_id = $this->generate_customer_id();
-	}
-
-	/**
-	 * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
-	 *
-	 * @param int $uid User ID.
-	 * @return string
-	 */
-	public function nonce_user_logged_out( $uid ) {
-		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
-	}
-
-	/**
-	 * Returns the session.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param mixed  $default Default session value.
-	 * @return string|array
-	 */
-	public function get_session( $customer_id, $default = false ) {
-
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
-			return array();
-		}
+            $this->_dirty = false;
+        }
+    }
+
+    /**
+     * Destroy all session data.
+     */
+    public function destroy_session() {
+        $this->delete_session( $this->_customer_id );
+        $this->forget_session();
+    }
+
+    /**
+     * Forget all session data without destroying it.
+     */
+    public function forget_session() {
+        $this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+
+        wpinv_empty_cart();
+
+        $this->_data        = array();
+        $this->_dirty       = false;
+        $this->_customer_id = $this->generate_customer_id();
+    }
+
+    /**
+     * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
+     *
+     * @param int $uid User ID.
+     * @return string
+     */
+    public function nonce_user_logged_out( $uid ) {
+        return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
+    }
+
+    /**
+     * Returns the session.
+     *
+     * @param string $customer_id Customer ID.
+     * @param mixed  $default Default session value.
+     * @return string|array
+     */
+    public function get_session( $customer_id, $default = false ) {
+
+        if ( defined( 'WP_SETUP_CONFIG' ) ) {
+            return array();
+        }
 
         if ( !is_user_logged_in() ) {
             if(!wp_verify_nonce( $customer_id, 'wpinv-session-customer-id' )){
@@ -295,32 +295,32 @@ 
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
-	}
+        return maybe_unserialize( $value );
+    }
 
-	/**
-	 * Delete the session from the cache and database.
-	 *
-	 * @param int $customer_id Customer ID.
-	 */
-	public function delete_session( $customer_id ) {
+    /**
+     * Delete the session from the cache and database.
+     *
+     * @param int $customer_id Customer ID.
+     */
+    public function delete_session( $customer_id ) {
 
         $key = $this->generate_key($customer_id);
 
-		delete_transient($key);
-	}
+        delete_transient($key);
+    }
 
-	/**
-	 * Update the session expiry timestamp.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param int    $timestamp Timestamp to expire the cookie.
-	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+    /**
+     * Update the session expiry timestamp.
+     *
+     * @param string $customer_id Customer ID.
+     * @param int    $timestamp Timestamp to expire the cookie.
+     */
+    public function update_session_timestamp( $customer_id, $timestamp ) {
 
         set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
 
-	}
+    }
 }
 
 global $wpi_session;

Spacing +56 added lines, -56 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Session handler class.
@@ -52,11 +52,11 @@ 
 	 */
 	public function __construct() {
 
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
-        add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+	    $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
+        add_action('init', array($this, 'init'), -1);
+		add_action('wp_logout', array($this, 'destroy_session'));
+		add_action('wp', array($this, 'set_customer_session_cookie'), 10);
+		add_action('shutdown', array($this, 'save_data'), 20);
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	public function init() {
 		$this->init_session_cookie();
 
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
+		if (!is_user_logged_in()) {
+			add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'));
 		}
 	}
 
@@ -80,7 +80,7 @@ 
 	public function init_session_cookie() {
 		$cookie = $this->get_session_cookie();
 
-		if ( $cookie ) {
+		if ($cookie) {
 			$this->_customer_id        = $cookie[0];
 			$this->_session_expiration = $cookie[1];
 			$this->_session_expiring   = $cookie[2];
@@ -88,17 +88,17 @@ 
 			$this->_data               = $this->get_session_data();
 
 			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+			if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
 				$this->_customer_id = get_current_user_id();
 				$this->_dirty       = true;
 				$this->save_data();
-				$this->set_customer_session_cookie( true );
+				$this->set_customer_session_cookie(true);
 			}
 
 			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
+			if (time() > $this->_session_expiring) {
 				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+				$this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
 			}
 		} else {
 			$this->set_session_expiration();
@@ -116,25 +116,25 @@ 
 	 *
 	 * @param bool $set Should the session cookie be set.
 	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
+	public function set_customer_session_cookie($set) {
+		if ($set) {
 			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+			$cookie_hash       = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
 			$this->_has_cookie = true;
 
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+			if (!isset($_COOKIE[$this->_cookie]) || $_COOKIE[$this->_cookie] !== $cookie_value) {
+				$this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
 			}
 		}
 	}
 
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
-        if ( ! headers_sent() ) {
-            setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
-        } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-            headers_sent( $file, $line );
-            trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
+	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
+        if (!headers_sent()) {
+            setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
+        } elseif (defined('WP_DEBUG') && WP_DEBUG) {
+            headers_sent($file, $line);
+            trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
         }
     }
 
@@ -145,8 +145,8 @@ 
 	 * @return bool
 	 */
 	protected function use_secure_cookie() {
-        $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+        $is_https = false !== strstr(get_option('home'), 'https:');
+		return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
 	}
 
 	/**
@@ -155,15 +155,15 @@ 
 	 * @return bool
 	 */
 	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+		return isset($_COOKIE[$this->_cookie]) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
 	}
 
 	/**
 	 * Set session expiration.
 	 */
 	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+		$this->_session_expiring   = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
+		$this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
 	}
 
 	/**
@@ -173,8 +173,8 @@ 
 	 */
 	public function generate_customer_id() {
 		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
+		$hasher = new PasswordHash(8, false);
+		return md5($hasher->get_random_bytes(32));
 	}
 
 	/**
@@ -185,27 +185,27 @@ 
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+		$cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
 
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+		if (empty($cookie_value) || !is_string($cookie_value)) {
 			return false;
 		}
 
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+		list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('||', $cookie_value);
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		// Validate hash.
 		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+		$hash    = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+		if (empty($cookie_hash) || !hash_equals($hash, $cookie_hash)) {
 			return false;
 		}
 
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+		return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
 	}
 
 	/**
@@ -214,15 +214,15 @@ 
 	 * @return array
 	 */
 	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+		return $this->has_session() ? (array) $this->get_session($this->_customer_id) : array();
 	}
 
-	public function generate_key($customer_id){
-        if(!$customer_id){
+	public function generate_key($customer_id) {
+        if (!$customer_id) {
             return;
         }
 
-        return 'wpi_trans_'.$customer_id;
+        return 'wpi_trans_' . $customer_id;
     }
 
 	/**
@@ -230,9 +230,9 @@ 
 	 */
 	public function save_data() {
 		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+		if ($this->_dirty && $this->has_session()) {
 
-            set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
+            set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
 			$this->_dirty = false;
 		}
@@ -242,7 +242,7 @@ 
 	 * Destroy all session data.
 	 */
 	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
+		$this->delete_session($this->_customer_id);
 		$this->forget_session();
 	}
 
@@ -250,7 +250,7 @@ 
 	 * Forget all session data without destroying it.
 	 */
 	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+		$this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
 
 		wpinv_empty_cart();
 
@@ -265,7 +265,7 @@ 
 	 * @param int $uid User ID.
 	 * @return string
 	 */
-	public function nonce_user_logged_out( $uid ) {
+	public function nonce_user_logged_out($uid) {
 		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
 	}
 
@@ -276,14 +276,14 @@ 
 	 * @param mixed  $default Default session value.
 	 * @return string|array
 	 */
-	public function get_session( $customer_id, $default = false ) {
+	public function get_session($customer_id, $default = false) {
 
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return array();
 		}
 
-        if ( !is_user_logged_in() ) {
-            if(!wp_verify_nonce( $customer_id, 'wpinv-session-customer-id' )){
+        if (!is_user_logged_in()) {
+            if (!wp_verify_nonce($customer_id, 'wpinv-session-customer-id')) {
                 return array();
             }
         }
@@ -291,11 +291,11 @@ 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
 
-        if ( !$value ) {
+        if (!$value) {
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
+		return maybe_unserialize($value);
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 *
 	 * @param int $customer_id Customer ID.
 	 */
-	public function delete_session( $customer_id ) {
+	public function delete_session($customer_id) {
 
         $key = $this->generate_key($customer_id);
 
@@ -316,9 +316,9 @@ 
 	 * @param string $customer_id Customer ID.
 	 * @param int    $timestamp Timestamp to expire the cookie.
 	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+	public function update_session_timestamp($customer_id, $timestamp) {
 
-        set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
+        set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
 
 	}
 }