AyeCode / invoicing

includes/gateways/manual.php

Spacing +13 added lines, -13 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_manual_cc_form', '__return_false' );
+add_action('wpinv_manual_cc_form', '__return_false');
 
-function wpinv_process_manual_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_manual_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     /*
@@ -41,20 +41,20 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {        
-        wpinv_set_payment_transaction_id( $invoice->ID, $invoice->generate_key() );
-        wpinv_update_payment_status( $invoice, 'publish' );
+    if (!empty($invoice)) {        
+        wpinv_set_payment_transaction_id($invoice->ID, $invoice->generate_key());
+        wpinv_update_payment_status($invoice, 'publish');
         
         // Empty the shopping cart
         wpinv_empty_cart();
         
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_manual', 'wpinv_process_manual_payment' );
\ No newline at end of file
+add_action('wpinv_gateway_manual', 'wpinv_process_manual_payment');
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 add_action( 'wpinv_manual_cc_form', '__return_false' );
 

includes/gateways/bank_transfer.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 add_action( 'wpinv_bank_transfer_cc_form', '__return_false' );
 

Spacing +27 added lines, -27 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_bank_transfer_cc_form', '__return_false' );
+add_action('wpinv_bank_transfer_cc_form', '__return_false');
 
-function wpinv_process_bank_transfer_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_bank_transfer_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     // Collect payment data
@@ -24,37 +24,37 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {
-        wpinv_set_payment_transaction_id( $invoice->ID, $invoice->generate_key() );
-        wpinv_update_payment_status( $invoice, 'wpi-pending' );
+    if (!empty($invoice)) {
+        wpinv_set_payment_transaction_id($invoice->ID, $invoice->generate_key());
+        wpinv_update_payment_status($invoice, 'wpi-pending');
         
         // Empty the shopping cart
         wpinv_empty_cart();
         
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a bank transfer payment. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a bank transfer payment. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_bank_transfer', 'wpinv_process_bank_transfer_payment' );
+add_action('wpinv_gateway_bank_transfer', 'wpinv_process_bank_transfer_payment');
 
-function wpinv_show_bank_info( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending' ) {
-        $bank_info = wpinv_get_bank_info( true );
+function wpinv_show_bank_info($invoice) {
+    if (!empty($invoice) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending') {
+        $bank_info = wpinv_get_bank_info(true);
         ?>
         <div class="wpinv-bank-details">
-            <?php if ( $instructions = wpinv_get_bank_instructions() ) { ?>
-            <div class="alert bg-info"><?php echo wpautop( wp_kses_post( $instructions ) ); ?></div>
+            <?php if ($instructions = wpinv_get_bank_instructions()) { ?>
+            <div class="alert bg-info"><?php echo wpautop(wp_kses_post($instructions)); ?></div>
             <?php } ?>
-            <?php if ( !empty( $bank_info ) ) { ?>
-            <h3 class="wpinv-bank-t"><?php echo apply_filters( 'wpinv_receipt_bank_details_title', __( 'Our Bank Details', 'invoicing' ) ); ?></h3>
+            <?php if (!empty($bank_info)) { ?>
+            <h3 class="wpinv-bank-t"><?php echo apply_filters('wpinv_receipt_bank_details_title', __('Our Bank Details', 'invoicing')); ?></h3>
             <table class="table table-bordered table-sm wpi-bank-details">
-                <?php foreach ( $bank_info as $key => $info ) { ?>
-                <tr class="wpi-<?php echo sanitize_html_class( $key );?>"><th class="text-left"><?php echo $info['label'] ;?></th><td><?php echo $info['value'] ;?></td></tr>
+                <?php foreach ($bank_info as $key => $info) { ?>
+                <tr class="wpi-<?php echo sanitize_html_class($key); ?>"><th class="text-left"><?php echo $info['label']; ?></th><td><?php echo $info['value']; ?></td></tr>
                 <?php } ?>
             </table>
             <?php } ?>
@@ -62,15 +62,15 @@ 
         <?php
     }
 }
-add_action( 'wpinv_before_receipt_details', 'wpinv_show_bank_info', 10, 1 );
+add_action('wpinv_before_receipt_details', 'wpinv_show_bank_info', 10, 1);
 
-function wpinv_invoice_print_bank_info( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending' ) {
+function wpinv_invoice_print_bank_info($invoice) {
+    if (!empty($invoice) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending') {
         ?>
         <div class="row wpinv-bank-info">
-            <?php echo wpinv_show_bank_info( $invoice ); ?>
+            <?php echo wpinv_show_bank_info($invoice); ?>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_invoice_print_after_top_content', 'wpinv_invoice_print_bank_info', 10, 1 );
\ No newline at end of file
+add_action('wpinv_invoice_print_after_top_content', 'wpinv_invoice_print_bank_info', 10, 1);
\ No newline at end of file

includes/gateways/paypal.php

Braces +6 added lines, -3 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 add_action( 'wpinv_paypal_cc_form', '__return_false' );
 add_filter( 'wpinv_paypal_support_subscription', '__return_true' );
@@ -307,8 +309,9 @@ 
 	}
 
 	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
+	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) ) {
+			return;
+	}
 
 	$defaults = array(
 		'txn_type'       => '',

Indentation +252 added lines, -252 removed lines

@@ -65,7 +65,7 @@ 
             'notify_url'    => $listener_url,
             'cbt'           => get_bloginfo( 'name' ),
             'bn'            => 'WPInvoicing_SP',
-	        'lc'            => 'US' // this will force paypal site to english
+            'lc'            => 'US' // this will force paypal site to english
         );
 
         $paypal_args['address1'] = $invoice->get_address();
@@ -217,261 +217,261 @@ 
 add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
 
 function wpinv_process_paypal_ipn() {
-	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
-		return;
-	}
-
-	// Set initial post data to empty string
-	$post_data = '';
-
-	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
-	} else {
-		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
-	}
-	// Start the encoded data collection with notification command
-	$encoded_data = 'cmd=_notify-validate';
-
-	// Get current arg separator
-	$arg_separator = wpinv_get_php_arg_separator_output();
-
-	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
-		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
-	} else {
-		// Check if POST is empty
-		if ( empty( $_POST ) ) {
-			// Nothing to do
-			return;
-		} else {
-			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
-				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
-			}
-		}
-	}
-
-	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
-
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
-
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
-		}
-	}
-
-	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
-
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
-		// Validate the IPN
-
-		$remote_post_vars      = array(
-			'method'           => 'POST',
-			'timeout'          => 45,
-			'redirection'      => 5,
-			'httpversion'      => '1.1',
-			'blocking'         => true,
-			'headers'          => array(
-				'host'         => 'www.paypal.com',
-				'connection'   => 'close',
-				'content-type' => 'application/x-www-form-urlencoded',
-				'post'         => '/cgi-bin/webscr HTTP/1.1',
-
-			),
-			'sslverify'        => false,
-			'body'             => $encoded_data_array
-		);
-
-		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
-
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Something went wrong
-		}
-
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Response not okay
-		}
-	}
-
-	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
-
-	$defaults = array(
-		'txn_type'       => '',
-		'payment_status' => ''
-	);
-
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
-
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+    // Check the request method is POST
+    if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+        return;
+    }
+
+    // Set initial post data to empty string
+    $post_data = '';
+
+    // Fallback just in case post_max_size is lower than needed
+    if ( ini_get( 'allow_url_fopen' ) ) {
+        $post_data = file_get_contents( 'php://input' );
+    } else {
+        // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
+        ini_set( 'post_max_size', '12M' );
+    }
+    // Start the encoded data collection with notification command
+    $encoded_data = 'cmd=_notify-validate';
+
+    // Get current arg separator
+    $arg_separator = wpinv_get_php_arg_separator_output();
+
+    // Verify there is a post_data
+    if ( $post_data || strlen( $post_data ) > 0 ) {
+        // Append the data
+        $encoded_data .= $arg_separator.$post_data;
+    } else {
+        // Check if POST is empty
+        if ( empty( $_POST ) ) {
+            // Nothing to do
+            return;
+        } else {
+            // Loop through each POST
+            foreach ( $_POST as $key => $value ) {
+                // Encode the value and append the data
+                $encoded_data .= $arg_separator."$key=" . urlencode( $value );
+            }
+        }
+    }
+
+    // Convert collected post data to an array
+    parse_str( $encoded_data, $encoded_data_array );
+
+    foreach ( $encoded_data_array as $key => $value ) {
+        if ( false !== strpos( $key, 'amp;' ) ) {
+            $new_key = str_replace( '&', '&', $key );
+            $new_key = str_replace( 'amp;', '&' , $new_key );
+
+            unset( $encoded_data_array[ $key ] );
+            $encoded_data_array[ $new_key ] = $value;
+        }
+    }
+
+    // Get the PayPal redirect uri
+    $paypal_redirect = wpinv_get_paypal_redirect( true );
+
+    if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+        // Validate the IPN
+
+        $remote_post_vars      = array(
+            'method'           => 'POST',
+            'timeout'          => 45,
+            'redirection'      => 5,
+            'httpversion'      => '1.1',
+            'blocking'         => true,
+            'headers'          => array(
+                'host'         => 'www.paypal.com',
+                'connection'   => 'close',
+                'content-type' => 'application/x-www-form-urlencoded',
+                'post'         => '/cgi-bin/webscr HTTP/1.1',
+
+            ),
+            'sslverify'        => false,
+            'body'             => $encoded_data_array
+        );
+
+        // Get response
+        $api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+
+        if ( is_wp_error( $api_response ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Something went wrong
+        }
+
+        if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Response not okay
+        }
+    }
+
+    // Check if $post_data_array has been populated
+    if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+        return;
+
+    $defaults = array(
+        'txn_type'       => '',
+        'payment_status' => ''
+    );
+
+    $encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+
+    $invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
-		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
-	} else {
-		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
-	}
-	exit;
+    wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+
+    if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+        // Allow PayPal IPN types to be processed separately
+        do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+    } else {
+        // Fallback to web accept just in case the txn_type isn't present
+        do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+    }
+    exit;
 }
 add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
 
 function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
-		return;
-	}
-
-	if( empty( $invoice_id ) ) {
-		return;
-	}
-
-	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
-	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
-
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
-		return; // this isn't a PayPal standard IPN
-	}
-
-	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ) );
-		return;
-	}
-
-	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ) );
-		return;
-	}
-
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
-		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
-		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
-
-		// Setup and store the customer's details
-		$user_info = array(
-			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
-			'discount'   => '',
-		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
-
-		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
-	}
-
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
-		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
-	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
-			return; // Only paid payments once
-		}
-
-		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
-
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ) );
-			return;
-		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
-			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ) );
-			return;
-		}
-
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ) );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'wpi-pending' == $payment_status && isset( $data['pending_reason'] ) ) {
-			// Look for possible pending reasons, such as an echeck
-			$note = '';
-
-			switch( strtolower( $data['pending_reason'] ) ) {
-				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
-					break;
+    if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+        return;
+    }
+
+    if( empty( $invoice_id ) ) {
+        return;
+    }
+
+    // Collect payment details
+    $purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+    $paypal_amount  = $data['mc_gross'];
+    $payment_status = strtolower( $data['payment_status'] );
+    $currency_code  = strtolower( $data['mc_currency'] );
+    $business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
+    $payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+
+    if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+        return; // this isn't a PayPal standard IPN
+    }
+
+    // Verify payment recipient
+    if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ) );
+        return;
+    }
+
+    // Verify payment currency
+    if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ) );
+        return;
+    }
+
+    if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+        // This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
+        // No email associated with purchase, so store from PayPal
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+
+        // Setup and store the customer's details
+        $user_info = array(
+            'user_id'    => '-1',
+            'email'      => sanitize_text_field( $data['payer_email'] ),
+            'first_name' => sanitize_text_field( $data['first_name'] ),
+            'last_name'  => sanitize_text_field( $data['last_name'] ),
+            'discount'   => '',
+        );
+        $user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
+        $user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
+        $user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
+        $user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
+        $user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+
+        $payment_meta['user_info'] = $user_info;
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+    }
+
+    if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+        // Process a refund
+        wpinv_process_paypal_refund( $data, $invoice_id );
+    } else {
+        if ( get_post_status( $invoice_id ) == 'publish' ) {
+            return; // Only paid payments once
+        }
+
+        // Retrieve the total purchase amount (before PayPal)
+        $payment_amount = wpinv_payment_total( $invoice_id );
+
+        if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+            // The prices don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ) );
+            return;
+        }
+        if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+            // Purchase keys don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ) );
+            return;
+        }
+
+        if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
+            wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ) );
+            wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
+            wpinv_update_payment_status( $invoice_id, 'publish' );
+        } else if ( 'wpi-pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+            // Look for possible pending reasons, such as an echeck
+            $note = '';
+
+            switch( strtolower( $data['pending_reason'] ) ) {
+                case 'echeck' :
+                    $note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+                    break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+                    break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+                    break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
-					break;
+                    $note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+                    break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
-					break;
+                    $note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+                    break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
-					break;
-
-				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
-					break;
-			}
-
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note );
-			}
-		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ) );
-		}
-	}
+                    $note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+                    break;
+
+                case 'other' :
+                    $note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+                    break;
+            }
+
+            if ( ! empty( $note ) ) {
+                wpinv_insert_payment_note( $invoice_id, $note );
+            }
+        } else {
+            wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ) );
+        }
+    }
 }
 add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
 
@@ -686,27 +686,27 @@ 
 }
 
 function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
-	// Collect payment details
+    // Collect payment details
 
-	if( empty( $invoice_id ) ) {
-		return;
-	}
+    if( empty( $invoice_id ) ) {
+        return;
+    }
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
-		return; // Only refund payments once
-	}
+    if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+        return; // Only refund payments once
+    }
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
-	$refund_amount  = $data['mc_gross'] * -1;
+    $payment_amount = wpinv_payment_total( $invoice_id );
+    $refund_amount  = $data['mc_gross'] * -1;
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Partial PayPal refund processed: %s', 'invoicing' ), $data['parent_txn_id'] ) );
-		return; // This is a partial refund
-	}
+    if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+        wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Partial PayPal refund processed: %s', 'invoicing' ), $data['parent_txn_id'] ) );
+        return; // This is a partial refund
+    }
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ) );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ) );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ) );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ) );
+    wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
 }
 
 function wpinv_get_paypal_redirect( $ssl_check = false ) {

Spacing +258 added lines, -258 removed lines

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

includes/wpinv-address-functions.php

Indentation +278 added lines, -278 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 function wpinv_is_base_country( $country ) {
@@ -40,9 +40,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+    $state = wpinv_get_option( 'default_state', false );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -115,260 +115,260 @@ 
 }
 
 function wpinv_get_country_list( $first_empty = false ) {
-	$countries = array(
-		'US' => __('United States', 'invoicing'),
-		'CA' => __('Canada', 'invoicing'),
-		'GB' => __('United Kingdom', 'invoicing'),
-		'AF' => __('Afghanistan', 'invoicing'),
-		'AX' => __('Aland Islands', 'invoicing'),
-		'AL' => __('Albania', 'invoicing'),
-		'DZ' => __('Algeria', 'invoicing'),
-		'AS' => __('American Samoa', 'invoicing'),
-		'AD' => __('Andorra', 'invoicing'),
-		'AO' => __('Angola', 'invoicing'),
-		'AI' => __('Anguilla', 'invoicing'),
-		'AQ' => __('Antarctica', 'invoicing'),
-		'AG' => __('Antigua and Barbuda', 'invoicing'),
-		'AR' => __('Argentina', 'invoicing'),
-		'AM' => __('Armenia', 'invoicing'),
-		'AW' => __('Aruba', 'invoicing'),
-		'AU' => __('Australia', 'invoicing'),
-		'AT' => __('Austria', 'invoicing'),
-		'AZ' => __('Azerbaijan', 'invoicing'),
-		'BS' => __('Bahamas', 'invoicing'),
-		'BH' => __('Bahrain', 'invoicing'),
-		'BD' => __('Bangladesh', 'invoicing'),
-		'BB' => __('Barbados', 'invoicing'),
-		'BY' => __('Belarus', 'invoicing'),
-		'BE' => __('Belgium', 'invoicing'),
-		'BZ' => __('Belize', 'invoicing'),
-		'BJ' => __('Benin', 'invoicing'),
-		'BM' => __('Bermuda', 'invoicing'),
-		'BT' => __('Bhutan', 'invoicing'),
-		'BO' => __('Bolivia', 'invoicing'),
-		'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
-		'BA' => __('Bosnia and Herzegovina', 'invoicing'),
-		'BW' => __('Botswana', 'invoicing'),
-		'BV' => __('Bouvet Island', 'invoicing'),
-		'BR' => __('Brazil', 'invoicing'),
-		'IO' => __('British Indian Ocean Territory', 'invoicing'),
-		'BN' => __('Brunei Darrussalam', 'invoicing'),
-		'BG' => __('Bulgaria', 'invoicing'),
-		'BF' => __('Burkina Faso', 'invoicing'),
-		'BI' => __('Burundi', 'invoicing'),
-		'KH' => __('Cambodia', 'invoicing'),
-		'CM' => __('Cameroon', 'invoicing'),
-		'CV' => __('Cape Verde', 'invoicing'),
-		'KY' => __('Cayman Islands', 'invoicing'),
-		'CF' => __('Central African Republic', 'invoicing'),
-		'TD' => __('Chad', 'invoicing'),
-		'CL' => __('Chile', 'invoicing'),
-		'CN' => __('China', 'invoicing'),
-		'CX' => __('Christmas Island', 'invoicing'),
-		'CC' => __('Cocos Islands', 'invoicing'),
-		'CO' => __('Colombia', 'invoicing'),
-		'KM' => __('Comoros', 'invoicing'),
-		'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
-		'CG' => __('Congo, Republic of', 'invoicing'),
-		'CK' => __('Cook Islands', 'invoicing'),
-		'CR' => __('Costa Rica', 'invoicing'),
-		'CI' => __('Cote d\'Ivoire', 'invoicing'),
-		'HR' => __('Croatia/Hrvatska', 'invoicing'),
-		'CU' => __('Cuba', 'invoicing'),
-		'CW' => __('CuraÇao', 'invoicing'),
-		'CY' => __('Cyprus', 'invoicing'),
-		'CZ' => __('Czech Republic', 'invoicing'),
-		'DK' => __('Denmark', 'invoicing'),
-		'DJ' => __('Djibouti', 'invoicing'),
-		'DM' => __('Dominica', 'invoicing'),
-		'DO' => __('Dominican Republic', 'invoicing'),
-		'TP' => __('East Timor', 'invoicing'),
-		'EC' => __('Ecuador', 'invoicing'),
-		'EG' => __('Egypt', 'invoicing'),
-		'GQ' => __('Equatorial Guinea', 'invoicing'),
-		'SV' => __('El Salvador', 'invoicing'),
-		'ER' => __('Eritrea', 'invoicing'),
-		'EE' => __('Estonia', 'invoicing'),
-		'ET' => __('Ethiopia', 'invoicing'),
-		'FK' => __('Falkland Islands', 'invoicing'),
-		'FO' => __('Faroe Islands', 'invoicing'),
-		'FJ' => __('Fiji', 'invoicing'),
-		'FI' => __('Finland', 'invoicing'),
-		'FR' => __('France', 'invoicing'),
-		'GF' => __('French Guiana', 'invoicing'),
-		'PF' => __('French Polynesia', 'invoicing'),
-		'TF' => __('French Southern Territories', 'invoicing'),
-		'GA' => __('Gabon', 'invoicing'),
-		'GM' => __('Gambia', 'invoicing'),
-		'GE' => __('Georgia', 'invoicing'),
-		'DE' => __('Germany', 'invoicing'),
-		'GR' => __('Greece', 'invoicing'),
-		'GH' => __('Ghana', 'invoicing'),
-		'GI' => __('Gibraltar', 'invoicing'),
-		'GL' => __('Greenland', 'invoicing'),
-		'GD' => __('Grenada', 'invoicing'),
-		'GP' => __('Guadeloupe', 'invoicing'),
-		'GU' => __('Guam', 'invoicing'),
-		'GT' => __('Guatemala', 'invoicing'),
-		'GG' => __('Guernsey', 'invoicing'),
-		'GN' => __('Guinea', 'invoicing'),
-		'GW' => __('Guinea-Bissau', 'invoicing'),
-		'GY' => __('Guyana', 'invoicing'),
-		'HT' => __('Haiti', 'invoicing'),
-		'HM' => __('Heard and McDonald Islands', 'invoicing'),
-		'VA' => __('Holy See (City Vatican State)', 'invoicing'),
-		'HN' => __('Honduras', 'invoicing'),
-		'HK' => __('Hong Kong', 'invoicing'),
-		'HU' => __('Hungary', 'invoicing'),
-		'IS' => __('Iceland', 'invoicing'),
-		'IN' => __('India', 'invoicing'),
-		'ID' => __('Indonesia', 'invoicing'),
-		'IR' => __('Iran', 'invoicing'),
-		'IQ' => __('Iraq', 'invoicing'),
-		'IE' => __('Ireland', 'invoicing'),
-		'IM' => __('Isle of Man', 'invoicing'),
-		'IL' => __('Israel', 'invoicing'),
-		'IT' => __('Italy', 'invoicing'),
-		'JM' => __('Jamaica', 'invoicing'),
-		'JP' => __('Japan', 'invoicing'),
-		'JE' => __('Jersey', 'invoicing'),
-		'JO' => __('Jordan', 'invoicing'),
-		'KZ' => __('Kazakhstan', 'invoicing'),
-		'KE' => __('Kenya', 'invoicing'),
-		'KI' => __('Kiribati', 'invoicing'),
-		'KW' => __('Kuwait', 'invoicing'),
-		'KG' => __('Kyrgyzstan', 'invoicing'),
-		'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
-		'LV' => __('Latvia', 'invoicing'),
-		'LB' => __('Lebanon', 'invoicing'),
-		'LS' => __('Lesotho', 'invoicing'),
-		'LR' => __('Liberia', 'invoicing'),
-		'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
-		'LI' => __('Liechtenstein', 'invoicing'),
-		'LT' => __('Lithuania', 'invoicing'),
-		'LU' => __('Luxembourg', 'invoicing'),
-		'MO' => __('Macau', 'invoicing'),
-		'MK' => __('Macedonia', 'invoicing'),
-		'MG' => __('Madagascar', 'invoicing'),
-		'MW' => __('Malawi', 'invoicing'),
-		'MY' => __('Malaysia', 'invoicing'),
-		'MV' => __('Maldives', 'invoicing'),
-		'ML' => __('Mali', 'invoicing'),
-		'MT' => __('Malta', 'invoicing'),
-		'MH' => __('Marshall Islands', 'invoicing'),
-		'MQ' => __('Martinique', 'invoicing'),
-		'MR' => __('Mauritania', 'invoicing'),
-		'MU' => __('Mauritius', 'invoicing'),
-		'YT' => __('Mayotte', 'invoicing'),
-		'MX' => __('Mexico', 'invoicing'),
-		'FM' => __('Micronesia', 'invoicing'),
-		'MD' => __('Moldova, Republic of', 'invoicing'),
-		'MC' => __('Monaco', 'invoicing'),
-		'MN' => __('Mongolia', 'invoicing'),
-		'ME' => __('Montenegro', 'invoicing'),
-		'MS' => __('Montserrat', 'invoicing'),
-		'MA' => __('Morocco', 'invoicing'),
-		'MZ' => __('Mozambique', 'invoicing'),
-		'MM' => __('Myanmar', 'invoicing'),
-		'NA' => __('Namibia', 'invoicing'),
-		'NR' => __('Nauru', 'invoicing'),
-		'NP' => __('Nepal', 'invoicing'),
-		'NL' => __('Netherlands', 'invoicing'),
-		'AN' => __('Netherlands Antilles', 'invoicing'),
-		'NC' => __('New Caledonia', 'invoicing'),
-		'NZ' => __('New Zealand', 'invoicing'),
-		'NI' => __('Nicaragua', 'invoicing'),
-		'NE' => __('Niger', 'invoicing'),
-		'NG' => __('Nigeria', 'invoicing'),
-		'NU' => __('Niue', 'invoicing'),
-		'NF' => __('Norfolk Island', 'invoicing'),
-		'KP' => __('North Korea', 'invoicing'),
-		'MP' => __('Northern Mariana Islands', 'invoicing'),
-		'NO' => __('Norway', 'invoicing'),
-		'OM' => __('Oman', 'invoicing'),
-		'PK' => __('Pakistan', 'invoicing'),
-		'PW' => __('Palau', 'invoicing'),
-		'PS' => __('Palestinian Territories', 'invoicing'),
-		'PA' => __('Panama', 'invoicing'),
-		'PG' => __('Papua New Guinea', 'invoicing'),
-		'PY' => __('Paraguay', 'invoicing'),
-		'PE' => __('Peru', 'invoicing'),
-		'PH' => __('Phillipines', 'invoicing'),
-		'PN' => __('Pitcairn Island', 'invoicing'),
-		'PL' => __('Poland', 'invoicing'),
-		'PT' => __('Portugal', 'invoicing'),
-		'PR' => __('Puerto Rico', 'invoicing'),
-		'QA' => __('Qatar', 'invoicing'),
-		'XK' => __('Republic of Kosovo', 'invoicing'),
-		'RE' => __('Reunion Island', 'invoicing'),
-		'RO' => __('Romania', 'invoicing'),
-		'RU' => __('Russian Federation', 'invoicing'),
-		'RW' => __('Rwanda', 'invoicing'),
-		'BL' => __('Saint Barthélemy', 'invoicing'),
-		'SH' => __('Saint Helena', 'invoicing'),
-		'KN' => __('Saint Kitts and Nevis', 'invoicing'),
-		'LC' => __('Saint Lucia', 'invoicing'),
-		'MF' => __('Saint Martin (French)', 'invoicing'),
-		'SX' => __('Saint Martin (Dutch)', 'invoicing'),
-		'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
-		'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
-		'SM' => __('San Marino', 'invoicing'),
-		'ST' => __('São Tomé and Príncipe', 'invoicing'),
-		'SA' => __('Saudi Arabia', 'invoicing'),
-		'SN' => __('Senegal', 'invoicing'),
-		'RS' => __('Serbia', 'invoicing'),
-		'SC' => __('Seychelles', 'invoicing'),
-		'SL' => __('Sierra Leone', 'invoicing'),
-		'SG' => __('Singapore', 'invoicing'),
-		'SK' => __('Slovak Republic', 'invoicing'),
-		'SI' => __('Slovenia', 'invoicing'),
-		'SB' => __('Solomon Islands', 'invoicing'),
-		'SO' => __('Somalia', 'invoicing'),
-		'ZA' => __('South Africa', 'invoicing'),
-		'GS' => __('South Georgia', 'invoicing'),
-		'KR' => __('South Korea', 'invoicing'),
-		'SS' => __('South Sudan', 'invoicing'),
-		'ES' => __('Spain', 'invoicing'),
-		'LK' => __('Sri Lanka', 'invoicing'),
-		'SD' => __('Sudan', 'invoicing'),
-		'SR' => __('Suriname', 'invoicing'),
-		'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
-		'SZ' => __('Swaziland', 'invoicing'),
-		'SE' => __('Sweden', 'invoicing'),
-		'CH' => __('Switzerland', 'invoicing'),
-		'SY' => __('Syrian Arab Republic', 'invoicing'),
-		'TW' => __('Taiwan', 'invoicing'),
-		'TJ' => __('Tajikistan', 'invoicing'),
-		'TZ' => __('Tanzania', 'invoicing'),
-		'TH' => __('Thailand', 'invoicing'),
-		'TL' => __('Timor-Leste', 'invoicing'),
-		'TG' => __('Togo', 'invoicing'),
-		'TK' => __('Tokelau', 'invoicing'),
-		'TO' => __('Tonga', 'invoicing'),
-		'TT' => __('Trinidad and Tobago', 'invoicing'),
-		'TN' => __('Tunisia', 'invoicing'),
-		'TR' => __('Turkey', 'invoicing'),
-		'TM' => __('Turkmenistan', 'invoicing'),
-		'TC' => __('Turks and Caicos Islands', 'invoicing'),
-		'TV' => __('Tuvalu', 'invoicing'),
-		'UG' => __('Uganda', 'invoicing'),
-		'UA' => __('Ukraine', 'invoicing'),
-		'AE' => __('United Arab Emirates', 'invoicing'),
-		'UY' => __('Uruguay', 'invoicing'),
-		'UM' => __('US Minor Outlying Islands', 'invoicing'),
-		'UZ' => __('Uzbekistan', 'invoicing'),
-		'VU' => __('Vanuatu', 'invoicing'),
-		'VE' => __('Venezuela', 'invoicing'),
-		'VN' => __('Vietnam', 'invoicing'),
-		'VG' => __('Virgin Islands (British)', 'invoicing'),
-		'VI' => __('Virgin Islands (USA)', 'invoicing'),
-		'WF' => __('Wallis and Futuna Islands', 'invoicing'),
-		'EH' => __('Western Sahara', 'invoicing'),
-		'WS' => __('Western Samoa', 'invoicing'),
-		'YE' => __('Yemen', 'invoicing'),
-		'ZM' => __('Zambia', 'invoicing'),
-		'ZW' => __('Zimbabwe', 'invoicing'),
-	);
+    $countries = array(
+        'US' => __('United States', 'invoicing'),
+        'CA' => __('Canada', 'invoicing'),
+        'GB' => __('United Kingdom', 'invoicing'),
+        'AF' => __('Afghanistan', 'invoicing'),
+        'AX' => __('Aland Islands', 'invoicing'),
+        'AL' => __('Albania', 'invoicing'),
+        'DZ' => __('Algeria', 'invoicing'),
+        'AS' => __('American Samoa', 'invoicing'),
+        'AD' => __('Andorra', 'invoicing'),
+        'AO' => __('Angola', 'invoicing'),
+        'AI' => __('Anguilla', 'invoicing'),
+        'AQ' => __('Antarctica', 'invoicing'),
+        'AG' => __('Antigua and Barbuda', 'invoicing'),
+        'AR' => __('Argentina', 'invoicing'),
+        'AM' => __('Armenia', 'invoicing'),
+        'AW' => __('Aruba', 'invoicing'),
+        'AU' => __('Australia', 'invoicing'),
+        'AT' => __('Austria', 'invoicing'),
+        'AZ' => __('Azerbaijan', 'invoicing'),
+        'BS' => __('Bahamas', 'invoicing'),
+        'BH' => __('Bahrain', 'invoicing'),
+        'BD' => __('Bangladesh', 'invoicing'),
+        'BB' => __('Barbados', 'invoicing'),
+        'BY' => __('Belarus', 'invoicing'),
+        'BE' => __('Belgium', 'invoicing'),
+        'BZ' => __('Belize', 'invoicing'),
+        'BJ' => __('Benin', 'invoicing'),
+        'BM' => __('Bermuda', 'invoicing'),
+        'BT' => __('Bhutan', 'invoicing'),
+        'BO' => __('Bolivia', 'invoicing'),
+        'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
+        'BA' => __('Bosnia and Herzegovina', 'invoicing'),
+        'BW' => __('Botswana', 'invoicing'),
+        'BV' => __('Bouvet Island', 'invoicing'),
+        'BR' => __('Brazil', 'invoicing'),
+        'IO' => __('British Indian Ocean Territory', 'invoicing'),
+        'BN' => __('Brunei Darrussalam', 'invoicing'),
+        'BG' => __('Bulgaria', 'invoicing'),
+        'BF' => __('Burkina Faso', 'invoicing'),
+        'BI' => __('Burundi', 'invoicing'),
+        'KH' => __('Cambodia', 'invoicing'),
+        'CM' => __('Cameroon', 'invoicing'),
+        'CV' => __('Cape Verde', 'invoicing'),
+        'KY' => __('Cayman Islands', 'invoicing'),
+        'CF' => __('Central African Republic', 'invoicing'),
+        'TD' => __('Chad', 'invoicing'),
+        'CL' => __('Chile', 'invoicing'),
+        'CN' => __('China', 'invoicing'),
+        'CX' => __('Christmas Island', 'invoicing'),
+        'CC' => __('Cocos Islands', 'invoicing'),
+        'CO' => __('Colombia', 'invoicing'),
+        'KM' => __('Comoros', 'invoicing'),
+        'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
+        'CG' => __('Congo, Republic of', 'invoicing'),
+        'CK' => __('Cook Islands', 'invoicing'),
+        'CR' => __('Costa Rica', 'invoicing'),
+        'CI' => __('Cote d\'Ivoire', 'invoicing'),
+        'HR' => __('Croatia/Hrvatska', 'invoicing'),
+        'CU' => __('Cuba', 'invoicing'),
+        'CW' => __('CuraÇao', 'invoicing'),
+        'CY' => __('Cyprus', 'invoicing'),
+        'CZ' => __('Czech Republic', 'invoicing'),
+        'DK' => __('Denmark', 'invoicing'),
+        'DJ' => __('Djibouti', 'invoicing'),
+        'DM' => __('Dominica', 'invoicing'),
+        'DO' => __('Dominican Republic', 'invoicing'),
+        'TP' => __('East Timor', 'invoicing'),
+        'EC' => __('Ecuador', 'invoicing'),
+        'EG' => __('Egypt', 'invoicing'),
+        'GQ' => __('Equatorial Guinea', 'invoicing'),
+        'SV' => __('El Salvador', 'invoicing'),
+        'ER' => __('Eritrea', 'invoicing'),
+        'EE' => __('Estonia', 'invoicing'),
+        'ET' => __('Ethiopia', 'invoicing'),
+        'FK' => __('Falkland Islands', 'invoicing'),
+        'FO' => __('Faroe Islands', 'invoicing'),
+        'FJ' => __('Fiji', 'invoicing'),
+        'FI' => __('Finland', 'invoicing'),
+        'FR' => __('France', 'invoicing'),
+        'GF' => __('French Guiana', 'invoicing'),
+        'PF' => __('French Polynesia', 'invoicing'),
+        'TF' => __('French Southern Territories', 'invoicing'),
+        'GA' => __('Gabon', 'invoicing'),
+        'GM' => __('Gambia', 'invoicing'),
+        'GE' => __('Georgia', 'invoicing'),
+        'DE' => __('Germany', 'invoicing'),
+        'GR' => __('Greece', 'invoicing'),
+        'GH' => __('Ghana', 'invoicing'),
+        'GI' => __('Gibraltar', 'invoicing'),
+        'GL' => __('Greenland', 'invoicing'),
+        'GD' => __('Grenada', 'invoicing'),
+        'GP' => __('Guadeloupe', 'invoicing'),
+        'GU' => __('Guam', 'invoicing'),
+        'GT' => __('Guatemala', 'invoicing'),
+        'GG' => __('Guernsey', 'invoicing'),
+        'GN' => __('Guinea', 'invoicing'),
+        'GW' => __('Guinea-Bissau', 'invoicing'),
+        'GY' => __('Guyana', 'invoicing'),
+        'HT' => __('Haiti', 'invoicing'),
+        'HM' => __('Heard and McDonald Islands', 'invoicing'),
+        'VA' => __('Holy See (City Vatican State)', 'invoicing'),
+        'HN' => __('Honduras', 'invoicing'),
+        'HK' => __('Hong Kong', 'invoicing'),
+        'HU' => __('Hungary', 'invoicing'),
+        'IS' => __('Iceland', 'invoicing'),
+        'IN' => __('India', 'invoicing'),
+        'ID' => __('Indonesia', 'invoicing'),
+        'IR' => __('Iran', 'invoicing'),
+        'IQ' => __('Iraq', 'invoicing'),
+        'IE' => __('Ireland', 'invoicing'),
+        'IM' => __('Isle of Man', 'invoicing'),
+        'IL' => __('Israel', 'invoicing'),
+        'IT' => __('Italy', 'invoicing'),
+        'JM' => __('Jamaica', 'invoicing'),
+        'JP' => __('Japan', 'invoicing'),
+        'JE' => __('Jersey', 'invoicing'),
+        'JO' => __('Jordan', 'invoicing'),
+        'KZ' => __('Kazakhstan', 'invoicing'),
+        'KE' => __('Kenya', 'invoicing'),
+        'KI' => __('Kiribati', 'invoicing'),
+        'KW' => __('Kuwait', 'invoicing'),
+        'KG' => __('Kyrgyzstan', 'invoicing'),
+        'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
+        'LV' => __('Latvia', 'invoicing'),
+        'LB' => __('Lebanon', 'invoicing'),
+        'LS' => __('Lesotho', 'invoicing'),
+        'LR' => __('Liberia', 'invoicing'),
+        'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
+        'LI' => __('Liechtenstein', 'invoicing'),
+        'LT' => __('Lithuania', 'invoicing'),
+        'LU' => __('Luxembourg', 'invoicing'),
+        'MO' => __('Macau', 'invoicing'),
+        'MK' => __('Macedonia', 'invoicing'),
+        'MG' => __('Madagascar', 'invoicing'),
+        'MW' => __('Malawi', 'invoicing'),
+        'MY' => __('Malaysia', 'invoicing'),
+        'MV' => __('Maldives', 'invoicing'),
+        'ML' => __('Mali', 'invoicing'),
+        'MT' => __('Malta', 'invoicing'),
+        'MH' => __('Marshall Islands', 'invoicing'),
+        'MQ' => __('Martinique', 'invoicing'),
+        'MR' => __('Mauritania', 'invoicing'),
+        'MU' => __('Mauritius', 'invoicing'),
+        'YT' => __('Mayotte', 'invoicing'),
+        'MX' => __('Mexico', 'invoicing'),
+        'FM' => __('Micronesia', 'invoicing'),
+        'MD' => __('Moldova, Republic of', 'invoicing'),
+        'MC' => __('Monaco', 'invoicing'),
+        'MN' => __('Mongolia', 'invoicing'),
+        'ME' => __('Montenegro', 'invoicing'),
+        'MS' => __('Montserrat', 'invoicing'),
+        'MA' => __('Morocco', 'invoicing'),
+        'MZ' => __('Mozambique', 'invoicing'),
+        'MM' => __('Myanmar', 'invoicing'),
+        'NA' => __('Namibia', 'invoicing'),
+        'NR' => __('Nauru', 'invoicing'),
+        'NP' => __('Nepal', 'invoicing'),
+        'NL' => __('Netherlands', 'invoicing'),
+        'AN' => __('Netherlands Antilles', 'invoicing'),
+        'NC' => __('New Caledonia', 'invoicing'),
+        'NZ' => __('New Zealand', 'invoicing'),
+        'NI' => __('Nicaragua', 'invoicing'),
+        'NE' => __('Niger', 'invoicing'),
+        'NG' => __('Nigeria', 'invoicing'),
+        'NU' => __('Niue', 'invoicing'),
+        'NF' => __('Norfolk Island', 'invoicing'),
+        'KP' => __('North Korea', 'invoicing'),
+        'MP' => __('Northern Mariana Islands', 'invoicing'),
+        'NO' => __('Norway', 'invoicing'),
+        'OM' => __('Oman', 'invoicing'),
+        'PK' => __('Pakistan', 'invoicing'),
+        'PW' => __('Palau', 'invoicing'),
+        'PS' => __('Palestinian Territories', 'invoicing'),
+        'PA' => __('Panama', 'invoicing'),
+        'PG' => __('Papua New Guinea', 'invoicing'),
+        'PY' => __('Paraguay', 'invoicing'),
+        'PE' => __('Peru', 'invoicing'),
+        'PH' => __('Phillipines', 'invoicing'),
+        'PN' => __('Pitcairn Island', 'invoicing'),
+        'PL' => __('Poland', 'invoicing'),
+        'PT' => __('Portugal', 'invoicing'),
+        'PR' => __('Puerto Rico', 'invoicing'),
+        'QA' => __('Qatar', 'invoicing'),
+        'XK' => __('Republic of Kosovo', 'invoicing'),
+        'RE' => __('Reunion Island', 'invoicing'),
+        'RO' => __('Romania', 'invoicing'),
+        'RU' => __('Russian Federation', 'invoicing'),
+        'RW' => __('Rwanda', 'invoicing'),
+        'BL' => __('Saint Barthélemy', 'invoicing'),
+        'SH' => __('Saint Helena', 'invoicing'),
+        'KN' => __('Saint Kitts and Nevis', 'invoicing'),
+        'LC' => __('Saint Lucia', 'invoicing'),
+        'MF' => __('Saint Martin (French)', 'invoicing'),
+        'SX' => __('Saint Martin (Dutch)', 'invoicing'),
+        'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
+        'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
+        'SM' => __('San Marino', 'invoicing'),
+        'ST' => __('São Tomé and Príncipe', 'invoicing'),
+        'SA' => __('Saudi Arabia', 'invoicing'),
+        'SN' => __('Senegal', 'invoicing'),
+        'RS' => __('Serbia', 'invoicing'),
+        'SC' => __('Seychelles', 'invoicing'),
+        'SL' => __('Sierra Leone', 'invoicing'),
+        'SG' => __('Singapore', 'invoicing'),
+        'SK' => __('Slovak Republic', 'invoicing'),
+        'SI' => __('Slovenia', 'invoicing'),
+        'SB' => __('Solomon Islands', 'invoicing'),
+        'SO' => __('Somalia', 'invoicing'),
+        'ZA' => __('South Africa', 'invoicing'),
+        'GS' => __('South Georgia', 'invoicing'),
+        'KR' => __('South Korea', 'invoicing'),
+        'SS' => __('South Sudan', 'invoicing'),
+        'ES' => __('Spain', 'invoicing'),
+        'LK' => __('Sri Lanka', 'invoicing'),
+        'SD' => __('Sudan', 'invoicing'),
+        'SR' => __('Suriname', 'invoicing'),
+        'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
+        'SZ' => __('Swaziland', 'invoicing'),
+        'SE' => __('Sweden', 'invoicing'),
+        'CH' => __('Switzerland', 'invoicing'),
+        'SY' => __('Syrian Arab Republic', 'invoicing'),
+        'TW' => __('Taiwan', 'invoicing'),
+        'TJ' => __('Tajikistan', 'invoicing'),
+        'TZ' => __('Tanzania', 'invoicing'),
+        'TH' => __('Thailand', 'invoicing'),
+        'TL' => __('Timor-Leste', 'invoicing'),
+        'TG' => __('Togo', 'invoicing'),
+        'TK' => __('Tokelau', 'invoicing'),
+        'TO' => __('Tonga', 'invoicing'),
+        'TT' => __('Trinidad and Tobago', 'invoicing'),
+        'TN' => __('Tunisia', 'invoicing'),
+        'TR' => __('Turkey', 'invoicing'),
+        'TM' => __('Turkmenistan', 'invoicing'),
+        'TC' => __('Turks and Caicos Islands', 'invoicing'),
+        'TV' => __('Tuvalu', 'invoicing'),
+        'UG' => __('Uganda', 'invoicing'),
+        'UA' => __('Ukraine', 'invoicing'),
+        'AE' => __('United Arab Emirates', 'invoicing'),
+        'UY' => __('Uruguay', 'invoicing'),
+        'UM' => __('US Minor Outlying Islands', 'invoicing'),
+        'UZ' => __('Uzbekistan', 'invoicing'),
+        'VU' => __('Vanuatu', 'invoicing'),
+        'VE' => __('Venezuela', 'invoicing'),
+        'VN' => __('Vietnam', 'invoicing'),
+        'VG' => __('Virgin Islands (British)', 'invoicing'),
+        'VI' => __('Virgin Islands (USA)', 'invoicing'),
+        'WF' => __('Wallis and Futuna Islands', 'invoicing'),
+        'EH' => __('Western Sahara', 'invoicing'),
+        'WS' => __('Western Samoa', 'invoicing'),
+        'YE' => __('Yemen', 'invoicing'),
+        'ZM' => __('Zambia', 'invoicing'),
+        'ZW' => __('Zimbabwe', 'invoicing'),
+    );
     
     if ( $first_empty ) {
         $countries = array_merge( array( '' => '' ), $countries );
@@ -1537,30 +1537,30 @@ 
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
         
         $args = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => $sanitized_field_name . ' wpinv-select',
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => $sanitized_field_name . ' wpinv-select',
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {

Spacing +979 added lines, -979 removed lines

@@ -7,67 +7,67 @@ 
  */
  
 // 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_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
     
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) { 
+function wpinv_country_name($country_code = '') { 
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[$country_code] ) ? $countries[$country_code] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+	$state = wpinv_get_option('default_state', false);
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
     
-    if ( !empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
         
-        $state = !empty( $states ) && isset( $states[$state_code] ) ? $states[$state_code] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
-function wpinv_get_user_address( $user_id = 0, $with_default = true ) {
+function wpinv_get_user_address($user_id = 0, $with_default = true) {
     global $wpi_userID;
     
-    if( empty( $user_id ) ) {
-        $user_id = !empty( $wpi_userID ) ? $wpi_userID : get_current_user_id();
+    if (empty($user_id)) {
+        $user_id = !empty($wpi_userID) ? $wpi_userID : get_current_user_id();
     }
     
     $address_fields = array(
@@ -85,36 +85,36 @@ 
         'zip',
     );
     
-    $user_info = get_userdata( $user_id );
+    $user_info = get_userdata($user_id);
     
     $address = array();
     $address['user_id'] = $user_id;
-    $address['email'] = !empty( $user_info ) ? $user_info->user_email : '';
-    foreach ( $address_fields as $field ) {
-        $address[$field] = get_user_meta( $user_id, '_wpinv_' . $field, true );
+    $address['email'] = !empty($user_info) ? $user_info->user_email : '';
+    foreach ($address_fields as $field) {
+        $address[$field] = get_user_meta($user_id, '_wpinv_' . $field, true);
     }
 
-    if ( !empty( $user_info ) ) {
-        if( empty( $address['first_name'] ) )
+    if (!empty($user_info)) {
+        if (empty($address['first_name']))
             $address['first_name'] = $user_info->first_name;
         
-        if( empty( $address['last_name'] ) )
+        if (empty($address['last_name']))
             $address['last_name'] = $user_info->last_name;
     }
     
-    $address['name'] = trim( trim( $address['first_name'] . ' ' . $address['last_name'] ), "," );
+    $address['name'] = trim(trim($address['first_name'] . ' ' . $address['last_name']), ",");
     
-    if( empty( $address['state'] ) && $with_default )
+    if (empty($address['state']) && $with_default)
         $address['state'] = wpinv_get_default_state();
 
-    if( empty( $address['country'] ) && $with_default )
+    if (empty($address['country']) && $with_default)
         $address['country'] = wpinv_get_default_country();
 
 
     return $address;
 }
 
-function wpinv_get_country_list( $first_empty = false ) {
+function wpinv_get_country_list($first_empty = false) {
 	$countries = array(
 		'US' => __('United States', 'invoicing'),
 		'CA' => __('Canada', 'invoicing'),
@@ -370,23 +370,23 @@ 
 		'ZW' => __('Zimbabwe', 'invoicing'),
 	);
     
-    if ( $first_empty ) {
-        $countries = array_merge( array( '' => '' ), $countries );
+    if ($first_empty) {
+        $countries = array_merge(array('' => ''), $countries);
     }
     
-    $countries = apply_filters( 'wpinv_countries', $countries );
+    $countries = apply_filters('wpinv_countries', $countries);
     
     asort($countries);
 
     return $countries;
 }
 
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
-    if ( empty( $country ) ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
-    switch( $country ) {
+    switch ($country) {
         case 'US' :
             $states = wpinv_get_us_states_list();
             break;
@@ -461,11 +461,11 @@ 
             break;
     }
     
-    if ( !empty( $states ) && $first_empty ) {
-        $states = array_merge( array( '' => '' ), $states );
+    if (!empty($states) && $first_empty) {
+        $states = array_merge(array('' => ''), $states);
     }
     
-    $states = apply_filters( 'wpinv_country_states', $states, $country );
+    $states = apply_filters('wpinv_country_states', $states, $country);
     
     asort($states);
 
@@ -474,1087 +474,1087 @@ 
 
 function wpinv_get_us_states_list() {
     $states = array(
-        'AL' => __( 'Alabama', 'invoicing' ),
-        'AK' => __( 'Alaska', 'invoicing' ),
-        'AZ' => __( 'Arizona', 'invoicing' ),
-        'AR' => __( 'Arkansas', 'invoicing' ),
-        'CA' => __( 'California', 'invoicing' ),
-        'CO' => __( 'Colorado', 'invoicing' ),
-        'CT' => __( 'Connecticut', 'invoicing' ),
-        'DE' => __( 'Delaware', 'invoicing' ),
-        'DC' => __( 'District of Columbia', 'invoicing' ),
-        'FL' => __( 'Florida', 'invoicing' ),
-        'GA' => __( 'Georgia', 'invoicing' ),
-        'HI' => __( 'Hawaii', 'invoicing' ),
-        'ID' => __( 'Idaho', 'invoicing' ),
-        'IL' => __( 'Illinois', 'invoicing' ),
-        'IN' => __( 'Indiana', 'invoicing' ),
-        'IA' => __( 'Iowa', 'invoicing' ),
-        'KS' => __( 'Kansas', 'invoicing' ),
-        'KY' => __( 'Kentucky', 'invoicing' ),
-        'LA' => __( 'Louisiana', 'invoicing' ),
-        'ME' => __( 'Maine', 'invoicing' ),
-        'MD' => __( 'Maryland', 'invoicing' ),
-        'MA' => __( 'Massachusetts', 'invoicing' ),
-        'MI' => __( 'Michigan', 'invoicing' ),
-        'MN' => __( 'Minnesota', 'invoicing' ),
-        'MS' => __( 'Mississippi', 'invoicing' ),
-        'MO' => __( 'Missouri', 'invoicing' ),
-        'MT' => __( 'Montana', 'invoicing' ),
-        'NE' => __( 'Nebraska', 'invoicing' ),
-        'NV' => __( 'Nevada', 'invoicing' ),
-        'NH' => __( 'New Hampshire', 'invoicing' ),
-        'NJ' => __( 'New Jersey', 'invoicing' ),
-        'NM' => __( 'New Mexico', 'invoicing' ),
-        'NY' => __( 'New York', 'invoicing' ),
-        'NC' => __( 'North Carolina', 'invoicing' ),
-        'ND' => __( 'North Dakota', 'invoicing' ),
-        'OH' => __( 'Ohio', 'invoicing' ),
-        'OK' => __( 'Oklahoma', 'invoicing' ),
-        'OR' => __( 'Oregon', 'invoicing' ),
-        'PA' => __( 'Pennsylvania', 'invoicing' ),
-        'RI' => __( 'Rhode Island', 'invoicing' ),
-        'SC' => __( 'South Carolina', 'invoicing' ),
-        'SD' => __( 'South Dakota', 'invoicing' ),
-        'TN' => __( 'Tennessee', 'invoicing' ),
-        'TX' => __( 'Texas', 'invoicing' ),
-        'UT' => __( 'Utah', 'invoicing' ),
-        'VT' => __( 'Vermont', 'invoicing' ),
-        'VA' => __( 'Virginia', 'invoicing' ),
-        'WA' => __( 'Washington', 'invoicing' ),
-        'WV' => __( 'West Virginia', 'invoicing' ),
-        'WI' => __( 'Wisconsin', 'invoicing' ),
-        'WY' => __( 'Wyoming', 'invoicing' ),
-        'AS' => __( 'American Samoa', 'invoicing' ),
-        'CZ' => __( 'Canal Zone', 'invoicing' ),
-        'CM' => __( 'Commonwealth of the Northern Mariana Islands', 'invoicing' ),
-        'FM' => __( 'Federated States of Micronesia', 'invoicing' ),
-        'GU' => __( 'Guam', 'invoicing' ),
-        'MH' => __( 'Marshall Islands', 'invoicing' ),
-        'MP' => __( 'Northern Mariana Islands', 'invoicing' ),
-        'PW' => __( 'Palau', 'invoicing' ),
-        'PI' => __( 'Philippine Islands', 'invoicing' ),
-        'PR' => __( 'Puerto Rico', 'invoicing' ),
-        'TT' => __( 'Trust Territory of the Pacific Islands', 'invoicing' ),
-        'VI' => __( 'Virgin Islands', 'invoicing' ),
-        'AA' => __( 'Armed Forces - Americas', 'invoicing' ),
-        'AE' => __( 'Armed Forces - Europe, Canada, Middle East, Africa', 'invoicing' ),
-        'AP' => __( 'Armed Forces - Pacific', 'invoicing' )
+        'AL' => __('Alabama', 'invoicing'),
+        'AK' => __('Alaska', 'invoicing'),
+        'AZ' => __('Arizona', 'invoicing'),
+        'AR' => __('Arkansas', 'invoicing'),
+        'CA' => __('California', 'invoicing'),
+        'CO' => __('Colorado', 'invoicing'),
+        'CT' => __('Connecticut', 'invoicing'),
+        'DE' => __('Delaware', 'invoicing'),
+        'DC' => __('District of Columbia', 'invoicing'),
+        'FL' => __('Florida', 'invoicing'),
+        'GA' => __('Georgia', 'invoicing'),
+        'HI' => __('Hawaii', 'invoicing'),
+        'ID' => __('Idaho', 'invoicing'),
+        'IL' => __('Illinois', 'invoicing'),
+        'IN' => __('Indiana', 'invoicing'),
+        'IA' => __('Iowa', 'invoicing'),
+        'KS' => __('Kansas', 'invoicing'),
+        'KY' => __('Kentucky', 'invoicing'),
+        'LA' => __('Louisiana', 'invoicing'),
+        'ME' => __('Maine', 'invoicing'),
+        'MD' => __('Maryland', 'invoicing'),
+        'MA' => __('Massachusetts', 'invoicing'),
+        'MI' => __('Michigan', 'invoicing'),
+        'MN' => __('Minnesota', 'invoicing'),
+        'MS' => __('Mississippi', 'invoicing'),
+        'MO' => __('Missouri', 'invoicing'),
+        'MT' => __('Montana', 'invoicing'),
+        'NE' => __('Nebraska', 'invoicing'),
+        'NV' => __('Nevada', 'invoicing'),
+        'NH' => __('New Hampshire', 'invoicing'),
+        'NJ' => __('New Jersey', 'invoicing'),
+        'NM' => __('New Mexico', 'invoicing'),
+        'NY' => __('New York', 'invoicing'),
+        'NC' => __('North Carolina', 'invoicing'),
+        'ND' => __('North Dakota', 'invoicing'),
+        'OH' => __('Ohio', 'invoicing'),
+        'OK' => __('Oklahoma', 'invoicing'),
+        'OR' => __('Oregon', 'invoicing'),
+        'PA' => __('Pennsylvania', 'invoicing'),
+        'RI' => __('Rhode Island', 'invoicing'),
+        'SC' => __('South Carolina', 'invoicing'),
+        'SD' => __('South Dakota', 'invoicing'),
+        'TN' => __('Tennessee', 'invoicing'),
+        'TX' => __('Texas', 'invoicing'),
+        'UT' => __('Utah', 'invoicing'),
+        'VT' => __('Vermont', 'invoicing'),
+        'VA' => __('Virginia', 'invoicing'),
+        'WA' => __('Washington', 'invoicing'),
+        'WV' => __('West Virginia', 'invoicing'),
+        'WI' => __('Wisconsin', 'invoicing'),
+        'WY' => __('Wyoming', 'invoicing'),
+        'AS' => __('American Samoa', 'invoicing'),
+        'CZ' => __('Canal Zone', 'invoicing'),
+        'CM' => __('Commonwealth of the Northern Mariana Islands', 'invoicing'),
+        'FM' => __('Federated States of Micronesia', 'invoicing'),
+        'GU' => __('Guam', 'invoicing'),
+        'MH' => __('Marshall Islands', 'invoicing'),
+        'MP' => __('Northern Mariana Islands', 'invoicing'),
+        'PW' => __('Palau', 'invoicing'),
+        'PI' => __('Philippine Islands', 'invoicing'),
+        'PR' => __('Puerto Rico', 'invoicing'),
+        'TT' => __('Trust Territory of the Pacific Islands', 'invoicing'),
+        'VI' => __('Virgin Islands', 'invoicing'),
+        'AA' => __('Armed Forces - Americas', 'invoicing'),
+        'AE' => __('Armed Forces - Europe, Canada, Middle East, Africa', 'invoicing'),
+        'AP' => __('Armed Forces - Pacific', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_us_states', $states );
+    return apply_filters('wpinv_us_states', $states);
 }
 
 function wpinv_get_canada_states_list() {
     $states = array(
-        'AB' => __( 'Alberta', 'invoicing' ),
-        'BC' => __( 'British Columbia', 'invoicing' ),
-        'MB' => __( 'Manitoba', 'invoicing' ),
-        'NB' => __( 'New Brunswick', 'invoicing' ),
-        'NL' => __( 'Newfoundland and Labrador', 'invoicing' ),
-        'NS' => __( 'Nova Scotia', 'invoicing' ),
-        'NT' => __( 'Northwest Territories', 'invoicing' ),
-        'NU' => __( 'Nunavut', 'invoicing' ),
-        'ON' => __( 'Ontario', 'invoicing' ),
-        'PE' => __( 'Prince Edward Island', 'invoicing' ),
-        'QC' => __( 'Quebec', 'invoicing' ),
-        'SK' => __( 'Saskatchewan', 'invoicing' ),
-        'YT' => __( 'Yukon', 'invoicing' )
+        'AB' => __('Alberta', 'invoicing'),
+        'BC' => __('British Columbia', 'invoicing'),
+        'MB' => __('Manitoba', 'invoicing'),
+        'NB' => __('New Brunswick', 'invoicing'),
+        'NL' => __('Newfoundland and Labrador', 'invoicing'),
+        'NS' => __('Nova Scotia', 'invoicing'),
+        'NT' => __('Northwest Territories', 'invoicing'),
+        'NU' => __('Nunavut', 'invoicing'),
+        'ON' => __('Ontario', 'invoicing'),
+        'PE' => __('Prince Edward Island', 'invoicing'),
+        'QC' => __('Quebec', 'invoicing'),
+        'SK' => __('Saskatchewan', 'invoicing'),
+        'YT' => __('Yukon', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_canada_provinces', $states );
+    return apply_filters('wpinv_canada_provinces', $states);
 }
 
 function wpinv_get_australia_states_list() {
     $states = array(
-        'ACT' => __( 'Australian Capital Territory', 'invoicing' ),
-        'NSW' => __( 'New South Wales', 'invoicing' ),
-        'NT'  => __( 'Northern Territory', 'invoicing' ),
-        'QLD' => __( 'Queensland', 'invoicing' ),
-        'SA'  => __( 'South Australia', 'invoicing' ),
-        'TAS' => __( 'Tasmania', 'invoicing' ),
-        'VIC' => __( 'Victoria', 'invoicing' ),
-        'WA'  => __( 'Western Australia', 'invoicing' )
+        'ACT' => __('Australian Capital Territory', 'invoicing'),
+        'NSW' => __('New South Wales', 'invoicing'),
+        'NT'  => __('Northern Territory', 'invoicing'),
+        'QLD' => __('Queensland', 'invoicing'),
+        'SA'  => __('South Australia', 'invoicing'),
+        'TAS' => __('Tasmania', 'invoicing'),
+        'VIC' => __('Victoria', 'invoicing'),
+        'WA'  => __('Western Australia', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_australia_states', $states );
+    return apply_filters('wpinv_australia_states', $states);
 }
 
 function wpinv_get_bangladesh_states_list() {
     $states = array(
-        'BAG' => __( 'Bagerhat', 'invoicing' ),
-        'BAN' => __( 'Bandarban', 'invoicing' ),
-        'BAR' => __( 'Barguna', 'invoicing' ),
-        'BARI'=> __( 'Barisal', 'invoicing' ),
-        'BHO' => __( 'Bhola', 'invoicing' ),
-        'BOG' => __( 'Bogra', 'invoicing' ),
-        'BRA' => __( 'Brahmanbaria', 'invoicing' ),
-        'CHA' => __( 'Chandpur', 'invoicing' ),
-        'CHI' => __( 'Chittagong', 'invoicing' ),
-        'CHU' => __( 'Chuadanga', 'invoicing' ),
-        'COM' => __( 'Comilla', 'invoicing' ),
-        'COX' => __( 'Cox\'s Bazar', 'invoicing' ),
-        'DHA' => __( 'Dhaka', 'invoicing' ),
-        'DIN' => __( 'Dinajpur', 'invoicing' ),
-        'FAR' => __( 'Faridpur', 'invoicing' ),
-        'FEN' => __( 'Feni', 'invoicing' ),
-        'GAI' => __( 'Gaibandha', 'invoicing' ),
-        'GAZI'=> __( 'Gazipur', 'invoicing' ),
-        'GOP' => __( 'Gopalganj', 'invoicing' ),
-        'HAB' => __( 'Habiganj', 'invoicing' ),
-        'JAM' => __( 'Jamalpur', 'invoicing' ),
-        'JES' => __( 'Jessore', 'invoicing' ),
-        'JHA' => __( 'Jhalokati', 'invoicing' ),
-        'JHE' => __( 'Jhenaidah', 'invoicing' ),
-        'JOY' => __( 'Joypurhat', 'invoicing' ),
-        'KHA' => __( 'Khagrachhari', 'invoicing' ),
-        'KHU' => __( 'Khulna', 'invoicing' ),
-        'KIS' => __( 'Kishoreganj', 'invoicing' ),
-        'KUR' => __( 'Kurigram', 'invoicing' ),
-        'KUS' => __( 'Kushtia', 'invoicing' ),
-        'LAK' => __( 'Lakshmipur', 'invoicing' ),
-        'LAL' => __( 'Lalmonirhat', 'invoicing' ),
-        'MAD' => __( 'Madaripur', 'invoicing' ),
-        'MAG' => __( 'Magura', 'invoicing' ),
-        'MAN' => __( 'Manikganj', 'invoicing' ),
-        'MEH' => __( 'Meherpur', 'invoicing' ),
-        'MOU' => __( 'Moulvibazar', 'invoicing' ),
-        'MUN' => __( 'Munshiganj', 'invoicing' ),
-        'MYM' => __( 'Mymensingh', 'invoicing' ),
-        'NAO' => __( 'Naogaon', 'invoicing' ),
-        'NAR' => __( 'Narail', 'invoicing' ),
-        'NARG'=> __( 'Narayanganj', 'invoicing' ),
-        'NARD'=> __( 'Narsingdi', 'invoicing' ),
-        'NAT' => __( 'Natore', 'invoicing' ),
-        'NAW' => __( 'Nawabganj', 'invoicing' ),
-        'NET' => __( 'Netrakona', 'invoicing' ),
-        'NIL' => __( 'Nilphamari', 'invoicing' ),
-        'NOA' => __( 'Noakhali', 'invoicing' ),
-        'PAB' => __( 'Pabna', 'invoicing' ),
-        'PAN' => __( 'Panchagarh', 'invoicing' ),
-        'PAT' => __( 'Patuakhali', 'invoicing' ),
-        'PIR' => __( 'Pirojpur', 'invoicing' ),
-        'RAJB'=> __( 'Rajbari', 'invoicing' ),
-        'RAJ' => __( 'Rajshahi', 'invoicing' ),
-        'RAN' => __( 'Rangamati', 'invoicing' ),
-        'RANP'=> __( 'Rangpur', 'invoicing' ),
-        'SAT' => __( 'Satkhira', 'invoicing' ),
-        'SHA' => __( 'Shariatpur', 'invoicing' ),
-        'SHE' => __( 'Sherpur', 'invoicing' ),
-        'SIR' => __( 'Sirajganj', 'invoicing' ),
-        'SUN' => __( 'Sunamganj', 'invoicing' ),
-        'SYL' => __( 'Sylhet', 'invoicing' ),
-        'TAN' => __( 'Tangail', 'invoicing' ),
-        'THA' => __( 'Thakurgaon', 'invoicing' )
+        'BAG' => __('Bagerhat', 'invoicing'),
+        'BAN' => __('Bandarban', 'invoicing'),
+        'BAR' => __('Barguna', 'invoicing'),
+        'BARI'=> __('Barisal', 'invoicing'),
+        'BHO' => __('Bhola', 'invoicing'),
+        'BOG' => __('Bogra', 'invoicing'),
+        'BRA' => __('Brahmanbaria', 'invoicing'),
+        'CHA' => __('Chandpur', 'invoicing'),
+        'CHI' => __('Chittagong', 'invoicing'),
+        'CHU' => __('Chuadanga', 'invoicing'),
+        'COM' => __('Comilla', 'invoicing'),
+        'COX' => __('Cox\'s Bazar', 'invoicing'),
+        'DHA' => __('Dhaka', 'invoicing'),
+        'DIN' => __('Dinajpur', 'invoicing'),
+        'FAR' => __('Faridpur', 'invoicing'),
+        'FEN' => __('Feni', 'invoicing'),
+        'GAI' => __('Gaibandha', 'invoicing'),
+        'GAZI'=> __('Gazipur', 'invoicing'),
+        'GOP' => __('Gopalganj', 'invoicing'),
+        'HAB' => __('Habiganj', 'invoicing'),
+        'JAM' => __('Jamalpur', 'invoicing'),
+        'JES' => __('Jessore', 'invoicing'),
+        'JHA' => __('Jhalokati', 'invoicing'),
+        'JHE' => __('Jhenaidah', 'invoicing'),
+        'JOY' => __('Joypurhat', 'invoicing'),
+        'KHA' => __('Khagrachhari', 'invoicing'),
+        'KHU' => __('Khulna', 'invoicing'),
+        'KIS' => __('Kishoreganj', 'invoicing'),
+        'KUR' => __('Kurigram', 'invoicing'),
+        'KUS' => __('Kushtia', 'invoicing'),
+        'LAK' => __('Lakshmipur', 'invoicing'),
+        'LAL' => __('Lalmonirhat', 'invoicing'),
+        'MAD' => __('Madaripur', 'invoicing'),
+        'MAG' => __('Magura', 'invoicing'),
+        'MAN' => __('Manikganj', 'invoicing'),
+        'MEH' => __('Meherpur', 'invoicing'),
+        'MOU' => __('Moulvibazar', 'invoicing'),
+        'MUN' => __('Munshiganj', 'invoicing'),
+        'MYM' => __('Mymensingh', 'invoicing'),
+        'NAO' => __('Naogaon', 'invoicing'),
+        'NAR' => __('Narail', 'invoicing'),
+        'NARG'=> __('Narayanganj', 'invoicing'),
+        'NARD'=> __('Narsingdi', 'invoicing'),
+        'NAT' => __('Natore', 'invoicing'),
+        'NAW' => __('Nawabganj', 'invoicing'),
+        'NET' => __('Netrakona', 'invoicing'),
+        'NIL' => __('Nilphamari', 'invoicing'),
+        'NOA' => __('Noakhali', 'invoicing'),
+        'PAB' => __('Pabna', 'invoicing'),
+        'PAN' => __('Panchagarh', 'invoicing'),
+        'PAT' => __('Patuakhali', 'invoicing'),
+        'PIR' => __('Pirojpur', 'invoicing'),
+        'RAJB'=> __('Rajbari', 'invoicing'),
+        'RAJ' => __('Rajshahi', 'invoicing'),
+        'RAN' => __('Rangamati', 'invoicing'),
+        'RANP'=> __('Rangpur', 'invoicing'),
+        'SAT' => __('Satkhira', 'invoicing'),
+        'SHA' => __('Shariatpur', 'invoicing'),
+        'SHE' => __('Sherpur', 'invoicing'),
+        'SIR' => __('Sirajganj', 'invoicing'),
+        'SUN' => __('Sunamganj', 'invoicing'),
+        'SYL' => __('Sylhet', 'invoicing'),
+        'TAN' => __('Tangail', 'invoicing'),
+        'THA' => __('Thakurgaon', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_bangladesh_states', $states );
+    return apply_filters('wpinv_bangladesh_states', $states);
 }
 
 function wpinv_get_brazil_states_list() {
     $states = array(
-        'AC' => __( 'Acre', 'invoicing' ),
-        'AL' => __( 'Alagoas', 'invoicing' ),
-        'AP' => __( 'Amapá', 'invoicing' ),
-        'AM' => __( 'Amazonas', 'invoicing' ),
-        'BA' => __( 'Bahia', 'invoicing' ),
-        'CE' => __( 'Ceará', 'invoicing' ),
-        'DF' => __( 'Distrito Federal', 'invoicing' ),
-        'ES' => __( 'Espírito Santo', 'invoicing' ),
-        'GO' => __( 'Goiás', 'invoicing' ),
-        'MA' => __( 'Maranhão', 'invoicing' ),
-        'MT' => __( 'Mato Grosso', 'invoicing' ),
-        'MS' => __( 'Mato Grosso do Sul', 'invoicing' ),
-        'MG' => __( 'Minas Gerais', 'invoicing' ),
-        'PA' => __( 'Pará', 'invoicing' ),
-        'PB' => __( 'Paraíba', 'invoicing' ),
-        'PR' => __( 'Paraná', 'invoicing' ),
-        'PE' => __( 'Pernambuco', 'invoicing' ),
-        'PI' => __( 'Piauí', 'invoicing' ),
-        'RJ' => __( 'Rio de Janeiro', 'invoicing' ),
-        'RN' => __( 'Rio Grande do Norte', 'invoicing' ),
-        'RS' => __( 'Rio Grande do Sul', 'invoicing' ),
-        'RO' => __( 'Rondônia', 'invoicing' ),
-        'RR' => __( 'Roraima', 'invoicing' ),
-        'SC' => __( 'Santa Catarina', 'invoicing' ),
-        'SP' => __( 'São Paulo', 'invoicing' ),
-        'SE' => __( 'Sergipe', 'invoicing' ),
-        'TO' => __( 'Tocantins', 'invoicing' )
+        'AC' => __('Acre', 'invoicing'),
+        'AL' => __('Alagoas', 'invoicing'),
+        'AP' => __('Amapá', 'invoicing'),
+        'AM' => __('Amazonas', 'invoicing'),
+        'BA' => __('Bahia', 'invoicing'),
+        'CE' => __('Ceará', 'invoicing'),
+        'DF' => __('Distrito Federal', 'invoicing'),
+        'ES' => __('Espírito Santo', 'invoicing'),
+        'GO' => __('Goiás', 'invoicing'),
+        'MA' => __('Maranhão', 'invoicing'),
+        'MT' => __('Mato Grosso', 'invoicing'),
+        'MS' => __('Mato Grosso do Sul', 'invoicing'),
+        'MG' => __('Minas Gerais', 'invoicing'),
+        'PA' => __('Pará', 'invoicing'),
+        'PB' => __('Paraíba', 'invoicing'),
+        'PR' => __('Paraná', 'invoicing'),
+        'PE' => __('Pernambuco', 'invoicing'),
+        'PI' => __('Piauí', 'invoicing'),
+        'RJ' => __('Rio de Janeiro', 'invoicing'),
+        'RN' => __('Rio Grande do Norte', 'invoicing'),
+        'RS' => __('Rio Grande do Sul', 'invoicing'),
+        'RO' => __('Rondônia', 'invoicing'),
+        'RR' => __('Roraima', 'invoicing'),
+        'SC' => __('Santa Catarina', 'invoicing'),
+        'SP' => __('São Paulo', 'invoicing'),
+        'SE' => __('Sergipe', 'invoicing'),
+        'TO' => __('Tocantins', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_brazil_states', $states );
+    return apply_filters('wpinv_brazil_states', $states);
 }
 
 function wpinv_get_bulgaria_states_list() {
     $states = array(
-        'BG-01' => __( 'Blagoevgrad', 'invoicing' ),
-        'BG-02' => __( 'Burgas', 'invoicing' ),
-        'BG-08' => __( 'Dobrich', 'invoicing' ),
-        'BG-07' => __( 'Gabrovo', 'invoicing' ),
-        'BG-26' => __( 'Haskovo', 'invoicing' ),
-        'BG-09' => __( 'Kardzhali', 'invoicing' ),
-        'BG-10' => __( 'Kyustendil', 'invoicing' ),
-        'BG-11' => __( 'Lovech', 'invoicing' ),
-        'BG-12' => __( 'Montana', 'invoicing' ),
-        'BG-13' => __( 'Pazardzhik', 'invoicing' ),
-        'BG-14' => __( 'Pernik', 'invoicing' ),
-        'BG-15' => __( 'Pleven', 'invoicing' ),
-        'BG-16' => __( 'Plovdiv', 'invoicing' ),
-        'BG-17' => __( 'Razgrad', 'invoicing' ),
-        'BG-18' => __( 'Ruse', 'invoicing' ),
-        'BG-27' => __( 'Shumen', 'invoicing' ),
-        'BG-19' => __( 'Silistra', 'invoicing' ),
-        'BG-20' => __( 'Sliven', 'invoicing' ),
-        'BG-21' => __( 'Smolyan', 'invoicing' ),
-        'BG-23' => __( 'Sofia', 'invoicing' ),
-        'BG-22' => __( 'Sofia-Grad', 'invoicing' ),
-        'BG-24' => __( 'Stara Zagora', 'invoicing' ),
-        'BG-25' => __( 'Targovishte', 'invoicing' ),
-        'BG-03' => __( 'Varna', 'invoicing' ),
-        'BG-04' => __( 'Veliko Tarnovo', 'invoicing' ),
-        'BG-05' => __( 'Vidin', 'invoicing' ),
-        'BG-06' => __( 'Vratsa', 'invoicing' ),
-        'BG-28' => __( 'Yambol', 'invoicing' )
+        'BG-01' => __('Blagoevgrad', 'invoicing'),
+        'BG-02' => __('Burgas', 'invoicing'),
+        'BG-08' => __('Dobrich', 'invoicing'),
+        'BG-07' => __('Gabrovo', 'invoicing'),
+        'BG-26' => __('Haskovo', 'invoicing'),
+        'BG-09' => __('Kardzhali', 'invoicing'),
+        'BG-10' => __('Kyustendil', 'invoicing'),
+        'BG-11' => __('Lovech', 'invoicing'),
+        'BG-12' => __('Montana', 'invoicing'),
+        'BG-13' => __('Pazardzhik', 'invoicing'),
+        'BG-14' => __('Pernik', 'invoicing'),
+        'BG-15' => __('Pleven', 'invoicing'),
+        'BG-16' => __('Plovdiv', 'invoicing'),
+        'BG-17' => __('Razgrad', 'invoicing'),
+        'BG-18' => __('Ruse', 'invoicing'),
+        'BG-27' => __('Shumen', 'invoicing'),
+        'BG-19' => __('Silistra', 'invoicing'),
+        'BG-20' => __('Sliven', 'invoicing'),
+        'BG-21' => __('Smolyan', 'invoicing'),
+        'BG-23' => __('Sofia', 'invoicing'),
+        'BG-22' => __('Sofia-Grad', 'invoicing'),
+        'BG-24' => __('Stara Zagora', 'invoicing'),
+        'BG-25' => __('Targovishte', 'invoicing'),
+        'BG-03' => __('Varna', 'invoicing'),
+        'BG-04' => __('Veliko Tarnovo', 'invoicing'),
+        'BG-05' => __('Vidin', 'invoicing'),
+        'BG-06' => __('Vratsa', 'invoicing'),
+        'BG-28' => __('Yambol', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_bulgaria_states', $states );
+    return apply_filters('wpinv_bulgaria_states', $states);
 }
 
 function wpinv_get_hong_kong_states_list() {
     $states = array(
-        'HONG KONG'       => __( 'Hong Kong Island', 'invoicing' ),
-        'KOWLOON'         => __( 'Kowloon', 'invoicing' ),
-        'NEW TERRITORIES' => __( 'New Territories', 'invoicing' )
+        'HONG KONG'       => __('Hong Kong Island', 'invoicing'),
+        'KOWLOON'         => __('Kowloon', 'invoicing'),
+        'NEW TERRITORIES' => __('New Territories', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_hong_kong_states', $states );
+    return apply_filters('wpinv_hong_kong_states', $states);
 }
 
 function wpinv_get_hungary_states_list() {
     $states = array(
-        'BK' => __( 'Bács-Kiskun', 'invoicing' ),
-        'BE' => __( 'Békés', 'invoicing' ),
-        'BA' => __( 'Baranya', 'invoicing' ),
-        'BZ' => __( 'Borsod-Abaúj-Zemplén', 'invoicing' ),
-        'BU' => __( 'Budapest', 'invoicing' ),
-        'CS' => __( 'Csongrád', 'invoicing' ),
-        'FE' => __( 'Fejér', 'invoicing' ),
-        'GS' => __( 'Győr-Moson-Sopron', 'invoicing' ),
-        'HB' => __( 'Hajdú-Bihar', 'invoicing' ),
-        'HE' => __( 'Heves', 'invoicing' ),
-        'JN' => __( 'Jász-Nagykun-Szolnok', 'invoicing' ),
-        'KE' => __( 'Komárom-Esztergom', 'invoicing' ),
-        'NO' => __( 'Nógrád', 'invoicing' ),
-        'PE' => __( 'Pest', 'invoicing' ),
-        'SO' => __( 'Somogy', 'invoicing' ),
-        'SZ' => __( 'Szabolcs-Szatmár-Bereg', 'invoicing' ),
-        'TO' => __( 'Tolna', 'invoicing' ),
-        'VA' => __( 'Vas', 'invoicing' ),
-        'VE' => __( 'Veszprém', 'invoicing' ),
-        'ZA' => __( 'Zala', 'invoicing' )
+        'BK' => __('Bács-Kiskun', 'invoicing'),
+        'BE' => __('Békés', 'invoicing'),
+        'BA' => __('Baranya', 'invoicing'),
+        'BZ' => __('Borsod-Abaúj-Zemplén', 'invoicing'),
+        'BU' => __('Budapest', 'invoicing'),
+        'CS' => __('Csongrád', 'invoicing'),
+        'FE' => __('Fejér', 'invoicing'),
+        'GS' => __('Győr-Moson-Sopron', 'invoicing'),
+        'HB' => __('Hajdú-Bihar', 'invoicing'),
+        'HE' => __('Heves', 'invoicing'),
+        'JN' => __('Jász-Nagykun-Szolnok', 'invoicing'),
+        'KE' => __('Komárom-Esztergom', 'invoicing'),
+        'NO' => __('Nógrád', 'invoicing'),
+        'PE' => __('Pest', 'invoicing'),
+        'SO' => __('Somogy', 'invoicing'),
+        'SZ' => __('Szabolcs-Szatmár-Bereg', 'invoicing'),
+        'TO' => __('Tolna', 'invoicing'),
+        'VA' => __('Vas', 'invoicing'),
+        'VE' => __('Veszprém', 'invoicing'),
+        'ZA' => __('Zala', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_hungary_states', $states );
+    return apply_filters('wpinv_hungary_states', $states);
 }
 
 function wpinv_get_japan_states_list() {
     $states = array(
-        'JP01' => __( 'Hokkaido', 'invoicing' ),
-        'JP02' => __( 'Aomori', 'invoicing' ),
-        'JP03' => __( 'Iwate', 'invoicing' ),
-        'JP04' => __( 'Miyagi', 'invoicing' ),
-        'JP05' => __( 'Akita', 'invoicing' ),
-        'JP06' => __( 'Yamagata', 'invoicing' ),
-        'JP07' => __( 'Fukushima', 'invoicing' ),
-        'JP08' => __( 'Ibaraki', 'invoicing' ),
-        'JP09' => __( 'Tochigi', 'invoicing' ),
-        'JP10' => __( 'Gunma', 'invoicing' ),
-        'JP11' => __( 'Saitama', 'invoicing' ),
-        'JP12' => __( 'Chiba', 'invoicing' ),
-        'JP13' => __( 'Tokyo', 'invoicing' ),
-        'JP14' => __( 'Kanagawa', 'invoicing' ),
-        'JP15' => __( 'Niigata', 'invoicing' ),
-        'JP16' => __( 'Toyama', 'invoicing' ),
-        'JP17' => __( 'Ishikawa', 'invoicing' ),
-        'JP18' => __( 'Fukui', 'invoicing' ),
-        'JP19' => __( 'Yamanashi', 'invoicing' ),
-        'JP20' => __( 'Nagano', 'invoicing' ),
-        'JP21' => __( 'Gifu', 'invoicing' ),
-        'JP22' => __( 'Shizuoka', 'invoicing' ),
-        'JP23' => __( 'Aichi', 'invoicing' ),
-        'JP24' => __( 'Mie', 'invoicing' ),
-        'JP25' => __( 'Shiga', 'invoicing' ),
-        'JP26' => __( 'Kyouto', 'invoicing' ),
-        'JP27' => __( 'Osaka', 'invoicing' ),
-        'JP28' => __( 'Hyougo', 'invoicing' ),
-        'JP29' => __( 'Nara', 'invoicing' ),
-        'JP30' => __( 'Wakayama', 'invoicing' ),
-        'JP31' => __( 'Tottori', 'invoicing' ),
-        'JP32' => __( 'Shimane', 'invoicing' ),
-        'JP33' => __( 'Okayama', 'invoicing' ),
-        'JP34' => __( 'Hiroshima', 'invoicing' ),
-        'JP35' => __( 'Yamaguchi', 'invoicing' ),
-        'JP36' => __( 'Tokushima', 'invoicing' ),
-        'JP37' => __( 'Kagawa', 'invoicing' ),
-        'JP38' => __( 'Ehime', 'invoicing' ),
-        'JP39' => __( 'Kochi', 'invoicing' ),
-        'JP40' => __( 'Fukuoka', 'invoicing' ),
-        'JP41' => __( 'Saga', 'invoicing' ),
-        'JP42' => __( 'Nagasaki', 'invoicing' ),
-        'JP43' => __( 'Kumamoto', 'invoicing' ),
-        'JP44' => __( 'Oita', 'invoicing' ),
-        'JP45' => __( 'Miyazaki', 'invoicing' ),
-        'JP46' => __( 'Kagoshima', 'invoicing' ),
-        'JP47' => __( 'Okinawa', 'invoicing' )
+        'JP01' => __('Hokkaido', 'invoicing'),
+        'JP02' => __('Aomori', 'invoicing'),
+        'JP03' => __('Iwate', 'invoicing'),
+        'JP04' => __('Miyagi', 'invoicing'),
+        'JP05' => __('Akita', 'invoicing'),
+        'JP06' => __('Yamagata', 'invoicing'),
+        'JP07' => __('Fukushima', 'invoicing'),
+        'JP08' => __('Ibaraki', 'invoicing'),
+        'JP09' => __('Tochigi', 'invoicing'),
+        'JP10' => __('Gunma', 'invoicing'),
+        'JP11' => __('Saitama', 'invoicing'),
+        'JP12' => __('Chiba', 'invoicing'),
+        'JP13' => __('Tokyo', 'invoicing'),
+        'JP14' => __('Kanagawa', 'invoicing'),
+        'JP15' => __('Niigata', 'invoicing'),
+        'JP16' => __('Toyama', 'invoicing'),
+        'JP17' => __('Ishikawa', 'invoicing'),
+        'JP18' => __('Fukui', 'invoicing'),
+        'JP19' => __('Yamanashi', 'invoicing'),
+        'JP20' => __('Nagano', 'invoicing'),
+        'JP21' => __('Gifu', 'invoicing'),
+        'JP22' => __('Shizuoka', 'invoicing'),
+        'JP23' => __('Aichi', 'invoicing'),
+        'JP24' => __('Mie', 'invoicing'),
+        'JP25' => __('Shiga', 'invoicing'),
+        'JP26' => __('Kyouto', 'invoicing'),
+        'JP27' => __('Osaka', 'invoicing'),
+        'JP28' => __('Hyougo', 'invoicing'),
+        'JP29' => __('Nara', 'invoicing'),
+        'JP30' => __('Wakayama', 'invoicing'),
+        'JP31' => __('Tottori', 'invoicing'),
+        'JP32' => __('Shimane', 'invoicing'),
+        'JP33' => __('Okayama', 'invoicing'),
+        'JP34' => __('Hiroshima', 'invoicing'),
+        'JP35' => __('Yamaguchi', 'invoicing'),
+        'JP36' => __('Tokushima', 'invoicing'),
+        'JP37' => __('Kagawa', 'invoicing'),
+        'JP38' => __('Ehime', 'invoicing'),
+        'JP39' => __('Kochi', 'invoicing'),
+        'JP40' => __('Fukuoka', 'invoicing'),
+        'JP41' => __('Saga', 'invoicing'),
+        'JP42' => __('Nagasaki', 'invoicing'),
+        'JP43' => __('Kumamoto', 'invoicing'),
+        'JP44' => __('Oita', 'invoicing'),
+        'JP45' => __('Miyazaki', 'invoicing'),
+        'JP46' => __('Kagoshima', 'invoicing'),
+        'JP47' => __('Okinawa', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_japan_states', $states );
+    return apply_filters('wpinv_japan_states', $states);
 }
 
 function wpinv_get_china_states_list() {
     $states = array(
-        'CN1'  => __( 'Yunnan / 云南', 'invoicing' ),
-        'CN2'  => __( 'Beijing / 北京', 'invoicing' ),
-        'CN3'  => __( 'Tianjin / 天津', 'invoicing' ),
-        'CN4'  => __( 'Hebei / 河北', 'invoicing' ),
-        'CN5'  => __( 'Shanxi / 山西', 'invoicing' ),
-        'CN6'  => __( 'Inner Mongolia / 內蒙古', 'invoicing' ),
-        'CN7'  => __( 'Liaoning / 辽宁', 'invoicing' ),
-        'CN8'  => __( 'Jilin / 吉林', 'invoicing' ),
-        'CN9'  => __( 'Heilongjiang / 黑龙江', 'invoicing' ),
-        'CN10' => __( 'Shanghai / 上海', 'invoicing' ),
-        'CN11' => __( 'Jiangsu / 江苏', 'invoicing' ),
-        'CN12' => __( 'Zhejiang / 浙江', 'invoicing' ),
-        'CN13' => __( 'Anhui / 安徽', 'invoicing' ),
-        'CN14' => __( 'Fujian / 福建', 'invoicing' ),
-        'CN15' => __( 'Jiangxi / 江西', 'invoicing' ),
-        'CN16' => __( 'Shandong / 山东', 'invoicing' ),
-        'CN17' => __( 'Henan / 河南', 'invoicing' ),
-        'CN18' => __( 'Hubei / 湖北', 'invoicing' ),
-        'CN19' => __( 'Hunan / 湖南', 'invoicing' ),
-        'CN20' => __( 'Guangdong / 广东', 'invoicing' ),
-        'CN21' => __( 'Guangxi Zhuang / 广西壮族', 'invoicing' ),
-        'CN22' => __( 'Hainan / 海南', 'invoicing' ),
-        'CN23' => __( 'Chongqing / 重庆', 'invoicing' ),
-        'CN24' => __( 'Sichuan / 四川', 'invoicing' ),
-        'CN25' => __( 'Guizhou / 贵州', 'invoicing' ),
-        'CN26' => __( 'Shaanxi / 陕西', 'invoicing' ),
-        'CN27' => __( 'Gansu / 甘肃', 'invoicing' ),
-        'CN28' => __( 'Qinghai / 青海', 'invoicing' ),
-        'CN29' => __( 'Ningxia Hui / 宁夏', 'invoicing' ),
-        'CN30' => __( 'Macau / 澳门', 'invoicing' ),
-        'CN31' => __( 'Tibet / 西藏', 'invoicing' ),
-        'CN32' => __( 'Xinjiang / 新疆', 'invoicing' )
+        'CN1'  => __('Yunnan / 云南', 'invoicing'),
+        'CN2'  => __('Beijing / 北京', 'invoicing'),
+        'CN3'  => __('Tianjin / 天津', 'invoicing'),
+        'CN4'  => __('Hebei / 河北', 'invoicing'),
+        'CN5'  => __('Shanxi / 山西', 'invoicing'),
+        'CN6'  => __('Inner Mongolia / 內蒙古', 'invoicing'),
+        'CN7'  => __('Liaoning / 辽宁', 'invoicing'),
+        'CN8'  => __('Jilin / 吉林', 'invoicing'),
+        'CN9'  => __('Heilongjiang / 黑龙江', 'invoicing'),
+        'CN10' => __('Shanghai / 上海', 'invoicing'),
+        'CN11' => __('Jiangsu / 江苏', 'invoicing'),
+        'CN12' => __('Zhejiang / 浙江', 'invoicing'),
+        'CN13' => __('Anhui / 安徽', 'invoicing'),
+        'CN14' => __('Fujian / 福建', 'invoicing'),
+        'CN15' => __('Jiangxi / 江西', 'invoicing'),
+        'CN16' => __('Shandong / 山东', 'invoicing'),
+        'CN17' => __('Henan / 河南', 'invoicing'),
+        'CN18' => __('Hubei / 湖北', 'invoicing'),
+        'CN19' => __('Hunan / 湖南', 'invoicing'),
+        'CN20' => __('Guangdong / 广东', 'invoicing'),
+        'CN21' => __('Guangxi Zhuang / 广西壮族', 'invoicing'),
+        'CN22' => __('Hainan / 海南', 'invoicing'),
+        'CN23' => __('Chongqing / 重庆', 'invoicing'),
+        'CN24' => __('Sichuan / 四川', 'invoicing'),
+        'CN25' => __('Guizhou / 贵州', 'invoicing'),
+        'CN26' => __('Shaanxi / 陕西', 'invoicing'),
+        'CN27' => __('Gansu / 甘肃', 'invoicing'),
+        'CN28' => __('Qinghai / 青海', 'invoicing'),
+        'CN29' => __('Ningxia Hui / 宁夏', 'invoicing'),
+        'CN30' => __('Macau / 澳门', 'invoicing'),
+        'CN31' => __('Tibet / 西藏', 'invoicing'),
+        'CN32' => __('Xinjiang / 新疆', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_china_states', $states );
+    return apply_filters('wpinv_china_states', $states);
 }
 
 function wpinv_get_new_zealand_states_list() {
     $states = array(
-        'AK' => __( 'Auckland', 'invoicing' ),
-        'BP' => __( 'Bay of Plenty', 'invoicing' ),
-        'CT' => __( 'Canterbury', 'invoicing' ),
-        'HB' => __( 'Hawke’s Bay', 'invoicing' ),
-        'MW' => __( 'Manawatu-Wanganui', 'invoicing' ),
-        'MB' => __( 'Marlborough', 'invoicing' ),
-        'NS' => __( 'Nelson', 'invoicing' ),
-        'NL' => __( 'Northland', 'invoicing' ),
-        'OT' => __( 'Otago', 'invoicing' ),
-        'SL' => __( 'Southland', 'invoicing' ),
-        'TK' => __( 'Taranaki', 'invoicing' ),
-        'TM' => __( 'Tasman', 'invoicing' ),
-        'WA' => __( 'Waikato', 'invoicing' ),
-        'WR' => __( 'Wairarapa', 'invoicing' ),
-        'WE' => __( 'Wellington', 'invoicing' ),
-        'WC' => __( 'West Coast', 'invoicing' )
+        'AK' => __('Auckland', 'invoicing'),
+        'BP' => __('Bay of Plenty', 'invoicing'),
+        'CT' => __('Canterbury', 'invoicing'),
+        'HB' => __('Hawke’s Bay', 'invoicing'),
+        'MW' => __('Manawatu-Wanganui', 'invoicing'),
+        'MB' => __('Marlborough', 'invoicing'),
+        'NS' => __('Nelson', 'invoicing'),
+        'NL' => __('Northland', 'invoicing'),
+        'OT' => __('Otago', 'invoicing'),
+        'SL' => __('Southland', 'invoicing'),
+        'TK' => __('Taranaki', 'invoicing'),
+        'TM' => __('Tasman', 'invoicing'),
+        'WA' => __('Waikato', 'invoicing'),
+        'WR' => __('Wairarapa', 'invoicing'),
+        'WE' => __('Wellington', 'invoicing'),
+        'WC' => __('West Coast', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_new_zealand_states', $states );
+    return apply_filters('wpinv_new_zealand_states', $states);
 }
 
 function wpinv_get_peru_states_list() {
     $states = array(
-        'CAL' => __( 'El Callao', 'invoicing' ),
-        'LMA' => __( 'Municipalidad Metropolitana de Lima', 'invoicing' ),
-        'AMA' => __( 'Amazonas', 'invoicing' ),
-        'ANC' => __( 'Ancash', 'invoicing' ),
-        'APU' => __( 'Apurímac', 'invoicing' ),
-        'ARE' => __( 'Arequipa', 'invoicing' ),
-        'AYA' => __( 'Ayacucho', 'invoicing' ),
-        'CAJ' => __( 'Cajamarca', 'invoicing' ),
-        'CUS' => __( 'Cusco', 'invoicing' ),
-        'HUV' => __( 'Huancavelica', 'invoicing' ),
-        'HUC' => __( 'Huánuco', 'invoicing' ),
-        'ICA' => __( 'Ica', 'invoicing' ),
-        'JUN' => __( 'Junín', 'invoicing' ),
-        'LAL' => __( 'La Libertad', 'invoicing' ),
-        'LAM' => __( 'Lambayeque', 'invoicing' ),
-        'LIM' => __( 'Lima', 'invoicing' ),
-        'LOR' => __( 'Loreto', 'invoicing' ),
-        'MDD' => __( 'Madre de Dios', 'invoicing' ),
-        'MOQ' => __( 'Moquegua', 'invoicing' ),
-        'PAS' => __( 'Pasco', 'invoicing' ),
-        'PIU' => __( 'Piura', 'invoicing' ),
-        'PUN' => __( 'Puno', 'invoicing' ),
-        'SAM' => __( 'San Martín', 'invoicing' ),
-        'TAC' => __( 'Tacna', 'invoicing' ),
-        'TUM' => __( 'Tumbes', 'invoicing' ),
-        'UCA' => __( 'Ucayali', 'invoicing' )
+        'CAL' => __('El Callao', 'invoicing'),
+        'LMA' => __('Municipalidad Metropolitana de Lima', 'invoicing'),
+        'AMA' => __('Amazonas', 'invoicing'),
+        'ANC' => __('Ancash', 'invoicing'),
+        'APU' => __('Apurímac', 'invoicing'),
+        'ARE' => __('Arequipa', 'invoicing'),
+        'AYA' => __('Ayacucho', 'invoicing'),
+        'CAJ' => __('Cajamarca', 'invoicing'),
+        'CUS' => __('Cusco', 'invoicing'),
+        'HUV' => __('Huancavelica', 'invoicing'),
+        'HUC' => __('Huánuco', 'invoicing'),
+        'ICA' => __('Ica', 'invoicing'),
+        'JUN' => __('Junín', 'invoicing'),
+        'LAL' => __('La Libertad', 'invoicing'),
+        'LAM' => __('Lambayeque', 'invoicing'),
+        'LIM' => __('Lima', 'invoicing'),
+        'LOR' => __('Loreto', 'invoicing'),
+        'MDD' => __('Madre de Dios', 'invoicing'),
+        'MOQ' => __('Moquegua', 'invoicing'),
+        'PAS' => __('Pasco', 'invoicing'),
+        'PIU' => __('Piura', 'invoicing'),
+        'PUN' => __('Puno', 'invoicing'),
+        'SAM' => __('San Martín', 'invoicing'),
+        'TAC' => __('Tacna', 'invoicing'),
+        'TUM' => __('Tumbes', 'invoicing'),
+        'UCA' => __('Ucayali', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_peru_states', $states );
+    return apply_filters('wpinv_peru_states', $states);
 }
 
 function wpinv_get_indonesia_states_list() {
-    $states  = array(
-        'AC' => __( 'Daerah Istimewa Aceh', 'invoicing' ),
-        'SU' => __( 'Sumatera Utara', 'invoicing' ),
-        'SB' => __( 'Sumatera Barat', 'invoicing' ),
-        'RI' => __( 'Riau', 'invoicing' ),
-        'KR' => __( 'Kepulauan Riau', 'invoicing' ),
-        'JA' => __( 'Jambi', 'invoicing' ),
-        'SS' => __( 'Sumatera Selatan', 'invoicing' ),
-        'BB' => __( 'Bangka Belitung', 'invoicing' ),
-        'BE' => __( 'Bengkulu', 'invoicing' ),
-        'LA' => __( 'Lampung', 'invoicing' ),
-        'JK' => __( 'DKI Jakarta', 'invoicing' ),
-        'JB' => __( 'Jawa Barat', 'invoicing' ),
-        'BT' => __( 'Banten', 'invoicing' ),
-        'JT' => __( 'Jawa Tengah', 'invoicing' ),
-        'JI' => __( 'Jawa Timur', 'invoicing' ),
-        'YO' => __( 'Daerah Istimewa Yogyakarta', 'invoicing' ),
-        'BA' => __( 'Bali', 'invoicing' ),
-        'NB' => __( 'Nusa Tenggara Barat', 'invoicing' ),
-        'NT' => __( 'Nusa Tenggara Timur', 'invoicing' ),
-        'KB' => __( 'Kalimantan Barat', 'invoicing' ),
-        'KT' => __( 'Kalimantan Tengah', 'invoicing' ),
-        'KI' => __( 'Kalimantan Timur', 'invoicing' ),
-        'KS' => __( 'Kalimantan Selatan', 'invoicing' ),
-        'KU' => __( 'Kalimantan Utara', 'invoicing' ),
-        'SA' => __( 'Sulawesi Utara', 'invoicing' ),
-        'ST' => __( 'Sulawesi Tengah', 'invoicing' ),
-        'SG' => __( 'Sulawesi Tenggara', 'invoicing' ),
-        'SR' => __( 'Sulawesi Barat', 'invoicing' ),
-        'SN' => __( 'Sulawesi Selatan', 'invoicing' ),
-        'GO' => __( 'Gorontalo', 'invoicing' ),
-        'MA' => __( 'Maluku', 'invoicing' ),
-        'MU' => __( 'Maluku Utara', 'invoicing' ),
-        'PA' => __( 'Papua', 'invoicing' ),
-        'PB' => __( 'Papua Barat', 'invoicing' )
+    $states = array(
+        'AC' => __('Daerah Istimewa Aceh', 'invoicing'),
+        'SU' => __('Sumatera Utara', 'invoicing'),
+        'SB' => __('Sumatera Barat', 'invoicing'),
+        'RI' => __('Riau', 'invoicing'),
+        'KR' => __('Kepulauan Riau', 'invoicing'),
+        'JA' => __('Jambi', 'invoicing'),
+        'SS' => __('Sumatera Selatan', 'invoicing'),
+        'BB' => __('Bangka Belitung', 'invoicing'),
+        'BE' => __('Bengkulu', 'invoicing'),
+        'LA' => __('Lampung', 'invoicing'),
+        'JK' => __('DKI Jakarta', 'invoicing'),
+        'JB' => __('Jawa Barat', 'invoicing'),
+        'BT' => __('Banten', 'invoicing'),
+        'JT' => __('Jawa Tengah', 'invoicing'),
+        'JI' => __('Jawa Timur', 'invoicing'),
+        'YO' => __('Daerah Istimewa Yogyakarta', 'invoicing'),
+        'BA' => __('Bali', 'invoicing'),
+        'NB' => __('Nusa Tenggara Barat', 'invoicing'),
+        'NT' => __('Nusa Tenggara Timur', 'invoicing'),
+        'KB' => __('Kalimantan Barat', 'invoicing'),
+        'KT' => __('Kalimantan Tengah', 'invoicing'),
+        'KI' => __('Kalimantan Timur', 'invoicing'),
+        'KS' => __('Kalimantan Selatan', 'invoicing'),
+        'KU' => __('Kalimantan Utara', 'invoicing'),
+        'SA' => __('Sulawesi Utara', 'invoicing'),
+        'ST' => __('Sulawesi Tengah', 'invoicing'),
+        'SG' => __('Sulawesi Tenggara', 'invoicing'),
+        'SR' => __('Sulawesi Barat', 'invoicing'),
+        'SN' => __('Sulawesi Selatan', 'invoicing'),
+        'GO' => __('Gorontalo', 'invoicing'),
+        'MA' => __('Maluku', 'invoicing'),
+        'MU' => __('Maluku Utara', 'invoicing'),
+        'PA' => __('Papua', 'invoicing'),
+        'PB' => __('Papua Barat', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_indonesia_states', $states );
+    return apply_filters('wpinv_indonesia_states', $states);
 }
 
 function wpinv_get_india_states_list() {
     $states = array(
-        'AP' => __( 'Andhra Pradesh', 'invoicing' ),
-        'AR' => __( 'Arunachal Pradesh', 'invoicing' ),
-        'AS' => __( 'Assam', 'invoicing' ),
-        'BR' => __( 'Bihar', 'invoicing' ),
-        'CT' => __( 'Chhattisgarh', 'invoicing' ),
-        'GA' => __( 'Goa', 'invoicing' ),
-        'GJ' => __( 'Gujarat', 'invoicing' ),
-        'HR' => __( 'Haryana', 'invoicing' ),
-        'HP' => __( 'Himachal Pradesh', 'invoicing' ),
-        'JK' => __( 'Jammu and Kashmir', 'invoicing' ),
-        'JH' => __( 'Jharkhand', 'invoicing' ),
-        'KA' => __( 'Karnataka', 'invoicing' ),
-        'KL' => __( 'Kerala', 'invoicing' ),
-        'MP' => __( 'Madhya Pradesh', 'invoicing' ),
-        'MH' => __( 'Maharashtra', 'invoicing' ),
-        'MN' => __( 'Manipur', 'invoicing' ),
-        'ML' => __( 'Meghalaya', 'invoicing' ),
-        'MZ' => __( 'Mizoram', 'invoicing' ),
-        'NL' => __( 'Nagaland', 'invoicing' ),
-        'OR' => __( 'Orissa', 'invoicing' ),
-        'PB' => __( 'Punjab', 'invoicing' ),
-        'RJ' => __( 'Rajasthan', 'invoicing' ),
-        'SK' => __( 'Sikkim', 'invoicing' ),
-        'TN' => __( 'Tamil Nadu', 'invoicing' ),
-        'TG' => __( 'Telangana', 'invoicing' ),
-        'TR' => __( 'Tripura', 'invoicing' ),
-        'UT' => __( 'Uttarakhand', 'invoicing' ),
-        'UP' => __( 'Uttar Pradesh', 'invoicing' ),
-        'WB' => __( 'West Bengal', 'invoicing' ),
-        'AN' => __( 'Andaman and Nicobar Islands', 'invoicing' ),
-        'CH' => __( 'Chandigarh', 'invoicing' ),
-        'DN' => __( 'Dadar and Nagar Haveli', 'invoicing' ),
-        'DD' => __( 'Daman and Diu', 'invoicing' ),
-        'DL' => __( 'Delhi', 'invoicing' ),
-        'LD' => __( 'Lakshadweep', 'invoicing' ),
-        'PY' => __( 'Pondicherry (Puducherry)', 'invoicing' )
+        'AP' => __('Andhra Pradesh', 'invoicing'),
+        'AR' => __('Arunachal Pradesh', 'invoicing'),
+        'AS' => __('Assam', 'invoicing'),
+        'BR' => __('Bihar', 'invoicing'),
+        'CT' => __('Chhattisgarh', 'invoicing'),
+        'GA' => __('Goa', 'invoicing'),
+        'GJ' => __('Gujarat', 'invoicing'),
+        'HR' => __('Haryana', 'invoicing'),
+        'HP' => __('Himachal Pradesh', 'invoicing'),
+        'JK' => __('Jammu and Kashmir', 'invoicing'),
+        'JH' => __('Jharkhand', 'invoicing'),
+        'KA' => __('Karnataka', 'invoicing'),
+        'KL' => __('Kerala', 'invoicing'),
+        'MP' => __('Madhya Pradesh', 'invoicing'),
+        'MH' => __('Maharashtra', 'invoicing'),
+        'MN' => __('Manipur', 'invoicing'),
+        'ML' => __('Meghalaya', 'invoicing'),
+        'MZ' => __('Mizoram', 'invoicing'),
+        'NL' => __('Nagaland', 'invoicing'),
+        'OR' => __('Orissa', 'invoicing'),
+        'PB' => __('Punjab', 'invoicing'),
+        'RJ' => __('Rajasthan', 'invoicing'),
+        'SK' => __('Sikkim', 'invoicing'),
+        'TN' => __('Tamil Nadu', 'invoicing'),
+        'TG' => __('Telangana', 'invoicing'),
+        'TR' => __('Tripura', 'invoicing'),
+        'UT' => __('Uttarakhand', 'invoicing'),
+        'UP' => __('Uttar Pradesh', 'invoicing'),
+        'WB' => __('West Bengal', 'invoicing'),
+        'AN' => __('Andaman and Nicobar Islands', 'invoicing'),
+        'CH' => __('Chandigarh', 'invoicing'),
+        'DN' => __('Dadar and Nagar Haveli', 'invoicing'),
+        'DD' => __('Daman and Diu', 'invoicing'),
+        'DL' => __('Delhi', 'invoicing'),
+        'LD' => __('Lakshadweep', 'invoicing'),
+        'PY' => __('Pondicherry (Puducherry)', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_india_states', $states );
+    return apply_filters('wpinv_india_states', $states);
 }
 
 function wpinv_get_iran_states_list() {
     $states = array(
-        'KHZ' => __( 'Khuzestan', 'invoicing' ),
-        'THR' => __( 'Tehran', 'invoicing' ),
-        'ILM' => __( 'Ilaam', 'invoicing' ),
-        'BHR' => __( 'Bushehr', 'invoicing' ),
-        'ADL' => __( 'Ardabil', 'invoicing' ),
-        'ESF' => __( 'Isfahan', 'invoicing' ),
-        'YZD' => __( 'Yazd', 'invoicing' ),
-        'KRH' => __( 'Kermanshah', 'invoicing' ),
-        'KRN' => __( 'Kerman', 'invoicing' ),
-        'HDN' => __( 'Hamadan', 'invoicing' ),
-        'GZN' => __( 'Ghazvin', 'invoicing' ),
-        'ZJN' => __( 'Zanjan', 'invoicing' ),
-        'LRS' => __( 'Luristan', 'invoicing' ),
-        'ABZ' => __( 'Alborz', 'invoicing' ),
-        'EAZ' => __( 'East Azerbaijan', 'invoicing' ),
-        'WAZ' => __( 'West Azerbaijan', 'invoicing' ),
-        'CHB' => __( 'Chaharmahal and Bakhtiari', 'invoicing' ),
-        'SKH' => __( 'South Khorasan', 'invoicing' ),
-        'RKH' => __( 'Razavi Khorasan', 'invoicing' ),
-        'NKH' => __( 'North Khorasan', 'invoicing' ),
-        'SMN' => __( 'Semnan', 'invoicing' ),
-        'FRS' => __( 'Fars', 'invoicing' ),
-        'QHM' => __( 'Qom', 'invoicing' ),
-        'KRD' => __( 'Kurdistan', 'invoicing' ),
-        'KBD' => __( 'Kohgiluyeh and BoyerAhmad', 'invoicing' ),
-        'GLS' => __( 'Golestan', 'invoicing' ),
-        'GIL' => __( 'Gilan', 'invoicing' ),
-        'MZN' => __( 'Mazandaran', 'invoicing' ),
-        'MKZ' => __( 'Markazi', 'invoicing' ),
-        'HRZ' => __( 'Hormozgan', 'invoicing' ),
-        'SBN' => __( 'Sistan and Baluchestan', 'invoicing' )
+        'KHZ' => __('Khuzestan', 'invoicing'),
+        'THR' => __('Tehran', 'invoicing'),
+        'ILM' => __('Ilaam', 'invoicing'),
+        'BHR' => __('Bushehr', 'invoicing'),
+        'ADL' => __('Ardabil', 'invoicing'),
+        'ESF' => __('Isfahan', 'invoicing'),
+        'YZD' => __('Yazd', 'invoicing'),
+        'KRH' => __('Kermanshah', 'invoicing'),
+        'KRN' => __('Kerman', 'invoicing'),
+        'HDN' => __('Hamadan', 'invoicing'),
+        'GZN' => __('Ghazvin', 'invoicing'),
+        'ZJN' => __('Zanjan', 'invoicing'),
+        'LRS' => __('Luristan', 'invoicing'),
+        'ABZ' => __('Alborz', 'invoicing'),
+        'EAZ' => __('East Azerbaijan', 'invoicing'),
+        'WAZ' => __('West Azerbaijan', 'invoicing'),
+        'CHB' => __('Chaharmahal and Bakhtiari', 'invoicing'),
+        'SKH' => __('South Khorasan', 'invoicing'),
+        'RKH' => __('Razavi Khorasan', 'invoicing'),
+        'NKH' => __('North Khorasan', 'invoicing'),
+        'SMN' => __('Semnan', 'invoicing'),
+        'FRS' => __('Fars', 'invoicing'),
+        'QHM' => __('Qom', 'invoicing'),
+        'KRD' => __('Kurdistan', 'invoicing'),
+        'KBD' => __('Kohgiluyeh and BoyerAhmad', 'invoicing'),
+        'GLS' => __('Golestan', 'invoicing'),
+        'GIL' => __('Gilan', 'invoicing'),
+        'MZN' => __('Mazandaran', 'invoicing'),
+        'MKZ' => __('Markazi', 'invoicing'),
+        'HRZ' => __('Hormozgan', 'invoicing'),
+        'SBN' => __('Sistan and Baluchestan', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_iran_states', $states );
+    return apply_filters('wpinv_iran_states', $states);
 }
 
 function wpinv_get_italy_states_list() {
     $states = array(
-        'AG' => __( 'Agrigento', 'invoicing' ),
-        'AL' => __( 'Alessandria', 'invoicing' ),
-        'AN' => __( 'Ancona', 'invoicing' ),
-        'AO' => __( 'Aosta', 'invoicing' ),
-        'AR' => __( 'Arezzo', 'invoicing' ),
-        'AP' => __( 'Ascoli Piceno', 'invoicing' ),
-        'AT' => __( 'Asti', 'invoicing' ),
-        'AV' => __( 'Avellino', 'invoicing' ),
-        'BA' => __( 'Bari', 'invoicing' ),
-        'BT' => __( 'Barletta-Andria-Trani', 'invoicing' ),
-        'BL' => __( 'Belluno', 'invoicing' ),
-        'BN' => __( 'Benevento', 'invoicing' ),
-        'BG' => __( 'Bergamo', 'invoicing' ),
-        'BI' => __( 'Biella', 'invoicing' ),
-        'BO' => __( 'Bologna', 'invoicing' ),
-        'BZ' => __( 'Bolzano', 'invoicing' ),
-        'BS' => __( 'Brescia', 'invoicing' ),
-        'BR' => __( 'Brindisi', 'invoicing' ),
-        'CA' => __( 'Cagliari', 'invoicing' ),
-        'CL' => __( 'Caltanissetta', 'invoicing' ),
-        'CB' => __( 'Campobasso', 'invoicing' ),
-        'CI' => __( 'Caltanissetta', 'invoicing' ),
-        'CE' => __( 'Caserta', 'invoicing' ),
-        'CT' => __( 'Catania', 'invoicing' ),
-        'CZ' => __( 'Catanzaro', 'invoicing' ),
-        'CH' => __( 'Chieti', 'invoicing' ),
-        'CO' => __( 'Como', 'invoicing' ),
-        'CS' => __( 'Cosenza', 'invoicing' ),
-        'CR' => __( 'Cremona', 'invoicing' ),
-        'KR' => __( 'Crotone', 'invoicing' ),
-        'CN' => __( 'Cuneo', 'invoicing' ),
-        'EN' => __( 'Enna', 'invoicing' ),
-        'FM' => __( 'Fermo', 'invoicing' ),
-        'FE' => __( 'Ferrara', 'invoicing' ),
-        'FI' => __( 'Firenze', 'invoicing' ),
-        'FG' => __( 'Foggia', 'invoicing' ),
-        'FC' => __( 'Forli-Cesena', 'invoicing' ),
-        'FR' => __( 'Frosinone', 'invoicing' ),
-        'GE' => __( 'Genova', 'invoicing' ),
-        'GO' => __( 'Gorizia', 'invoicing' ),
-        'GR' => __( 'Grosseto', 'invoicing' ),
-        'IM' => __( 'Imperia', 'invoicing' ),
-        'IS' => __( 'Isernia', 'invoicing' ),
-        'SP' => __( 'La Spezia', 'invoicing' ),
-        'AQ' => __( 'L'Aquila', 'invoicing' ),
-        'LT' => __( 'Latina', 'invoicing' ),
-        'LE' => __( 'Lecce', 'invoicing' ),
-        'LC' => __( 'Lecco', 'invoicing' ),
-        'LI' => __( 'Livorno', 'invoicing' ),
-        'LO' => __( 'Lodi', 'invoicing' ),
-        'LU' => __( 'Lucca', 'invoicing' ),
-        'MC' => __( 'Macerata', 'invoicing' ),
-        'MN' => __( 'Mantova', 'invoicing' ),
-        'MS' => __( 'Massa-Carrara', 'invoicing' ),
-        'MT' => __( 'Matera', 'invoicing' ),
-        'ME' => __( 'Messina', 'invoicing' ),
-        'MI' => __( 'Milano', 'invoicing' ),
-        'MO' => __( 'Modena', 'invoicing' ),
-        'MB' => __( 'Monza e della Brianza', 'invoicing' ),
-        'NA' => __( 'Napoli', 'invoicing' ),
-        'NO' => __( 'Novara', 'invoicing' ),
-        'NU' => __( 'Nuoro', 'invoicing' ),
-        'OT' => __( 'Olbia-Tempio', 'invoicing' ),
-        'OR' => __( 'Oristano', 'invoicing' ),
-        'PD' => __( 'Padova', 'invoicing' ),
-        'PA' => __( 'Palermo', 'invoicing' ),
-        'PR' => __( 'Parma', 'invoicing' ),
-        'PV' => __( 'Pavia', 'invoicing' ),
-        'PG' => __( 'Perugia', 'invoicing' ),
-        'PU' => __( 'Pesaro e Urbino', 'invoicing' ),
-        'PE' => __( 'Pescara', 'invoicing' ),
-        'PC' => __( 'Piacenza', 'invoicing' ),
-        'PI' => __( 'Pisa', 'invoicing' ),
-        'PT' => __( 'Pistoia', 'invoicing' ),
-        'PN' => __( 'Pordenone', 'invoicing' ),
-        'PZ' => __( 'Potenza', 'invoicing' ),
-        'PO' => __( 'Prato', 'invoicing' ),
-        'RG' => __( 'Ragusa', 'invoicing' ),
-        'RA' => __( 'Ravenna', 'invoicing' ),
-        'RC' => __( 'Reggio Calabria', 'invoicing' ),
-        'RE' => __( 'Reggio Emilia', 'invoicing' ),
-        'RI' => __( 'Rieti', 'invoicing' ),
-        'RN' => __( 'Rimini', 'invoicing' ),
-        'RM' => __( 'Roma', 'invoicing' ),
-        'RO' => __( 'Rovigo', 'invoicing' ),
-        'SA' => __( 'Salerno', 'invoicing' ),
-        'VS' => __( 'Medio Campidano', 'invoicing' ),
-        'SS' => __( 'Sassari', 'invoicing' ),
-        'SV' => __( 'Savona', 'invoicing' ),
-        'SI' => __( 'Siena', 'invoicing' ),
-        'SR' => __( 'Siracusa', 'invoicing' ),
-        'SO' => __( 'Sondrio', 'invoicing' ),
-        'TA' => __( 'Taranto', 'invoicing' ),
-        'TE' => __( 'Teramo', 'invoicing' ),
-        'TR' => __( 'Terni', 'invoicing' ),
-        'TO' => __( 'Torino', 'invoicing' ),
-        'OG' => __( 'Ogliastra', 'invoicing' ),
-        'TP' => __( 'Trapani', 'invoicing' ),
-        'TN' => __( 'Trento', 'invoicing' ),
-        'TV' => __( 'Treviso', 'invoicing' ),
-        'TS' => __( 'Trieste', 'invoicing' ),
-        'UD' => __( 'Udine', 'invoicing' ),
-        'VA' => __( 'Varesa', 'invoicing' ),
-        'VE' => __( 'Venezia', 'invoicing' ),
-        'VB' => __( 'Verbano-Cusio-Ossola', 'invoicing' ),
-        'VC' => __( 'Vercelli', 'invoicing' ),
-        'VR' => __( 'Verona', 'invoicing' ),
-        'VV' => __( 'Vibo Valentia', 'invoicing' ),
-        'VI' => __( 'Vicenza', 'invoicing' ),
-        'VT' => __( 'Viterbo', 'invoicing' )
+        'AG' => __('Agrigento', 'invoicing'),
+        'AL' => __('Alessandria', 'invoicing'),
+        'AN' => __('Ancona', 'invoicing'),
+        'AO' => __('Aosta', 'invoicing'),
+        'AR' => __('Arezzo', 'invoicing'),
+        'AP' => __('Ascoli Piceno', 'invoicing'),
+        'AT' => __('Asti', 'invoicing'),
+        'AV' => __('Avellino', 'invoicing'),
+        'BA' => __('Bari', 'invoicing'),
+        'BT' => __('Barletta-Andria-Trani', 'invoicing'),
+        'BL' => __('Belluno', 'invoicing'),
+        'BN' => __('Benevento', 'invoicing'),
+        'BG' => __('Bergamo', 'invoicing'),
+        'BI' => __('Biella', 'invoicing'),
+        'BO' => __('Bologna', 'invoicing'),
+        'BZ' => __('Bolzano', 'invoicing'),
+        'BS' => __('Brescia', 'invoicing'),
+        'BR' => __('Brindisi', 'invoicing'),
+        'CA' => __('Cagliari', 'invoicing'),
+        'CL' => __('Caltanissetta', 'invoicing'),
+        'CB' => __('Campobasso', 'invoicing'),
+        'CI' => __('Caltanissetta', 'invoicing'),
+        'CE' => __('Caserta', 'invoicing'),
+        'CT' => __('Catania', 'invoicing'),
+        'CZ' => __('Catanzaro', 'invoicing'),
+        'CH' => __('Chieti', 'invoicing'),
+        'CO' => __('Como', 'invoicing'),
+        'CS' => __('Cosenza', 'invoicing'),
+        'CR' => __('Cremona', 'invoicing'),
+        'KR' => __('Crotone', 'invoicing'),
+        'CN' => __('Cuneo', 'invoicing'),
+        'EN' => __('Enna', 'invoicing'),
+        'FM' => __('Fermo', 'invoicing'),
+        'FE' => __('Ferrara', 'invoicing'),
+        'FI' => __('Firenze', 'invoicing'),
+        'FG' => __('Foggia', 'invoicing'),
+        'FC' => __('Forli-Cesena', 'invoicing'),
+        'FR' => __('Frosinone', 'invoicing'),
+        'GE' => __('Genova', 'invoicing'),
+        'GO' => __('Gorizia', 'invoicing'),
+        'GR' => __('Grosseto', 'invoicing'),
+        'IM' => __('Imperia', 'invoicing'),
+        'IS' => __('Isernia', 'invoicing'),
+        'SP' => __('La Spezia', 'invoicing'),
+        'AQ' => __('L'Aquila', 'invoicing'),
+        'LT' => __('Latina', 'invoicing'),
+        'LE' => __('Lecce', 'invoicing'),
+        'LC' => __('Lecco', 'invoicing'),
+        'LI' => __('Livorno', 'invoicing'),
+        'LO' => __('Lodi', 'invoicing'),
+        'LU' => __('Lucca', 'invoicing'),
+        'MC' => __('Macerata', 'invoicing'),
+        'MN' => __('Mantova', 'invoicing'),
+        'MS' => __('Massa-Carrara', 'invoicing'),
+        'MT' => __('Matera', 'invoicing'),
+        'ME' => __('Messina', 'invoicing'),
+        'MI' => __('Milano', 'invoicing'),
+        'MO' => __('Modena', 'invoicing'),
+        'MB' => __('Monza e della Brianza', 'invoicing'),
+        'NA' => __('Napoli', 'invoicing'),
+        'NO' => __('Novara', 'invoicing'),
+        'NU' => __('Nuoro', 'invoicing'),
+        'OT' => __('Olbia-Tempio', 'invoicing'),
+        'OR' => __('Oristano', 'invoicing'),
+        'PD' => __('Padova', 'invoicing'),
+        'PA' => __('Palermo', 'invoicing'),
+        'PR' => __('Parma', 'invoicing'),
+        'PV' => __('Pavia', 'invoicing'),
+        'PG' => __('Perugia', 'invoicing'),
+        'PU' => __('Pesaro e Urbino', 'invoicing'),
+        'PE' => __('Pescara', 'invoicing'),
+        'PC' => __('Piacenza', 'invoicing'),
+        'PI' => __('Pisa', 'invoicing'),
+        'PT' => __('Pistoia', 'invoicing'),
+        'PN' => __('Pordenone', 'invoicing'),
+        'PZ' => __('Potenza', 'invoicing'),
+        'PO' => __('Prato', 'invoicing'),
+        'RG' => __('Ragusa', 'invoicing'),
+        'RA' => __('Ravenna', 'invoicing'),
+        'RC' => __('Reggio Calabria', 'invoicing'),
+        'RE' => __('Reggio Emilia', 'invoicing'),
+        'RI' => __('Rieti', 'invoicing'),
+        'RN' => __('Rimini', 'invoicing'),
+        'RM' => __('Roma', 'invoicing'),
+        'RO' => __('Rovigo', 'invoicing'),
+        'SA' => __('Salerno', 'invoicing'),
+        'VS' => __('Medio Campidano', 'invoicing'),
+        'SS' => __('Sassari', 'invoicing'),
+        'SV' => __('Savona', 'invoicing'),
+        'SI' => __('Siena', 'invoicing'),
+        'SR' => __('Siracusa', 'invoicing'),
+        'SO' => __('Sondrio', 'invoicing'),
+        'TA' => __('Taranto', 'invoicing'),
+        'TE' => __('Teramo', 'invoicing'),
+        'TR' => __('Terni', 'invoicing'),
+        'TO' => __('Torino', 'invoicing'),
+        'OG' => __('Ogliastra', 'invoicing'),
+        'TP' => __('Trapani', 'invoicing'),
+        'TN' => __('Trento', 'invoicing'),
+        'TV' => __('Treviso', 'invoicing'),
+        'TS' => __('Trieste', 'invoicing'),
+        'UD' => __('Udine', 'invoicing'),
+        'VA' => __('Varesa', 'invoicing'),
+        'VE' => __('Venezia', 'invoicing'),
+        'VB' => __('Verbano-Cusio-Ossola', 'invoicing'),
+        'VC' => __('Vercelli', 'invoicing'),
+        'VR' => __('Verona', 'invoicing'),
+        'VV' => __('Vibo Valentia', 'invoicing'),
+        'VI' => __('Vicenza', 'invoicing'),
+        'VT' => __('Viterbo', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_italy_states', $states );
+    return apply_filters('wpinv_italy_states', $states);
 }
 
 function wpinv_get_malaysia_states_list() {
     $states = array(
-        'JHR' => __( 'Johor', 'invoicing' ),
-        'KDH' => __( 'Kedah', 'invoicing' ),
-        'KTN' => __( 'Kelantan', 'invoicing' ),
-        'MLK' => __( 'Melaka', 'invoicing' ),
-        'NSN' => __( 'Negeri Sembilan', 'invoicing' ),
-        'PHG' => __( 'Pahang', 'invoicing' ),
-        'PRK' => __( 'Perak', 'invoicing' ),
-        'PLS' => __( 'Perlis', 'invoicing' ),
-        'PNG' => __( 'Pulau Pinang', 'invoicing' ),
-        'SBH' => __( 'Sabah', 'invoicing' ),
-        'SWK' => __( 'Sarawak', 'invoicing' ),
-        'SGR' => __( 'Selangor', 'invoicing' ),
-        'TRG' => __( 'Terengganu', 'invoicing' ),
-        'KUL' => __( 'W.P. Kuala Lumpur', 'invoicing' ),
-        'LBN' => __( 'W.P. Labuan', 'invoicing' ),
-        'PJY' => __( 'W.P. Putrajaya', 'invoicing' )
+        'JHR' => __('Johor', 'invoicing'),
+        'KDH' => __('Kedah', 'invoicing'),
+        'KTN' => __('Kelantan', 'invoicing'),
+        'MLK' => __('Melaka', 'invoicing'),
+        'NSN' => __('Negeri Sembilan', 'invoicing'),
+        'PHG' => __('Pahang', 'invoicing'),
+        'PRK' => __('Perak', 'invoicing'),
+        'PLS' => __('Perlis', 'invoicing'),
+        'PNG' => __('Pulau Pinang', 'invoicing'),
+        'SBH' => __('Sabah', 'invoicing'),
+        'SWK' => __('Sarawak', 'invoicing'),
+        'SGR' => __('Selangor', 'invoicing'),
+        'TRG' => __('Terengganu', 'invoicing'),
+        'KUL' => __('W.P. Kuala Lumpur', 'invoicing'),
+        'LBN' => __('W.P. Labuan', 'invoicing'),
+        'PJY' => __('W.P. Putrajaya', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_malaysia_states', $states );
+    return apply_filters('wpinv_malaysia_states', $states);
 }
 
 function wpinv_get_mexico_states_list() {
     $states = array(
-        'DIF' => __( 'Distrito Federal', 'invoicing' ),
-        'JAL' => __( 'Jalisco', 'invoicing' ),
-        'NLE' => __( 'Nuevo León', 'invoicing' ),
-        'AGU' => __( 'Aguascalientes', 'invoicing' ),
-        'BCN' => __( 'Baja California Norte', 'invoicing' ),
-        'BCS' => __( 'Baja California Sur', 'invoicing' ),
-        'CAM' => __( 'Campeche', 'invoicing' ),
-        'CHP' => __( 'Chiapas', 'invoicing' ),
-        'CHH' => __( 'Chihuahua', 'invoicing' ),
-        'COA' => __( 'Coahuila', 'invoicing' ),
-        'COL' => __( 'Colima', 'invoicing' ),
-        'DUR' => __( 'Durango', 'invoicing' ),
-        'GUA' => __( 'Guanajuato', 'invoicing' ),
-        'GRO' => __( 'Guerrero', 'invoicing' ),
-        'HID' => __( 'Hidalgo', 'invoicing' ),
-        'MEX' => __( 'Edo. de México', 'invoicing' ),
-        'MIC' => __( 'Michoacán', 'invoicing' ),
-        'MOR' => __( 'Morelos', 'invoicing' ),
-        'NAY' => __( 'Nayarit', 'invoicing' ),
-        'OAX' => __( 'Oaxaca', 'invoicing' ),
-        'PUE' => __( 'Puebla', 'invoicing' ),
-        'QUE' => __( 'Querétaro', 'invoicing' ),
-        'ROO' => __( 'Quintana Roo', 'invoicing' ),
-        'SLP' => __( 'San Luis Potosí', 'invoicing' ),
-        'SIN' => __( 'Sinaloa', 'invoicing' ),
-        'SON' => __( 'Sonora', 'invoicing' ),
-        'TAB' => __( 'Tabasco', 'invoicing' ),
-        'TAM' => __( 'Tamaulipas', 'invoicing' ),
-        'TLA' => __( 'Tlaxcala', 'invoicing' ),
-        'VER' => __( 'Veracruz', 'invoicing' ),
-        'YUC' => __( 'Yucatán', 'invoicing' ),
-        'ZAC' => __( 'Zacatecas', 'invoicing' )
+        'DIF' => __('Distrito Federal', 'invoicing'),
+        'JAL' => __('Jalisco', 'invoicing'),
+        'NLE' => __('Nuevo León', 'invoicing'),
+        'AGU' => __('Aguascalientes', 'invoicing'),
+        'BCN' => __('Baja California Norte', 'invoicing'),
+        'BCS' => __('Baja California Sur', 'invoicing'),
+        'CAM' => __('Campeche', 'invoicing'),
+        'CHP' => __('Chiapas', 'invoicing'),
+        'CHH' => __('Chihuahua', 'invoicing'),
+        'COA' => __('Coahuila', 'invoicing'),
+        'COL' => __('Colima', 'invoicing'),
+        'DUR' => __('Durango', 'invoicing'),
+        'GUA' => __('Guanajuato', 'invoicing'),
+        'GRO' => __('Guerrero', 'invoicing'),
+        'HID' => __('Hidalgo', 'invoicing'),
+        'MEX' => __('Edo. de México', 'invoicing'),
+        'MIC' => __('Michoacán', 'invoicing'),
+        'MOR' => __('Morelos', 'invoicing'),
+        'NAY' => __('Nayarit', 'invoicing'),
+        'OAX' => __('Oaxaca', 'invoicing'),
+        'PUE' => __('Puebla', 'invoicing'),
+        'QUE' => __('Querétaro', 'invoicing'),
+        'ROO' => __('Quintana Roo', 'invoicing'),
+        'SLP' => __('San Luis Potosí', 'invoicing'),
+        'SIN' => __('Sinaloa', 'invoicing'),
+        'SON' => __('Sonora', 'invoicing'),
+        'TAB' => __('Tabasco', 'invoicing'),
+        'TAM' => __('Tamaulipas', 'invoicing'),
+        'TLA' => __('Tlaxcala', 'invoicing'),
+        'VER' => __('Veracruz', 'invoicing'),
+        'YUC' => __('Yucatán', 'invoicing'),
+        'ZAC' => __('Zacatecas', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_mexico_states', $states );
+    return apply_filters('wpinv_mexico_states', $states);
 }
 
 function wpinv_get_nepal_states_list() {
     $states = array(
-        'ILL' => __( 'Illam', 'invoicing' ),
-        'JHA' => __( 'Jhapa', 'invoicing' ),
-        'PAN' => __( 'Panchthar', 'invoicing' ),
-        'TAP' => __( 'Taplejung', 'invoicing' ),
-        'BHO' => __( 'Bhojpur', 'invoicing' ),
-        'DKA' => __( 'Dhankuta', 'invoicing' ),
-        'MOR' => __( 'Morang', 'invoicing' ),
-        'SUN' => __( 'Sunsari', 'invoicing' ),
-        'SAN' => __( 'Sankhuwa', 'invoicing' ),
-        'TER' => __( 'Terhathum', 'invoicing' ),
-        'KHO' => __( 'Khotang', 'invoicing' ),
-        'OKH' => __( 'Okhaldhunga', 'invoicing' ),
-        'SAP' => __( 'Saptari', 'invoicing' ),
-        'SIR' => __( 'Siraha', 'invoicing' ),
-        'SOL' => __( 'Solukhumbu', 'invoicing' ),
-        'UDA' => __( 'Udayapur', 'invoicing' ),
-        'DHA' => __( 'Dhanusa', 'invoicing' ),
-        'DLK' => __( 'Dolakha', 'invoicing' ),
-        'MOH' => __( 'Mohottari', 'invoicing' ),
-        'RAM' => __( 'Ramechha', 'invoicing' ),
-        'SAR' => __( 'Sarlahi', 'invoicing' ),
-        'SIN' => __( 'Sindhuli', 'invoicing' ),
-        'BHA' => __( 'Bhaktapur', 'invoicing' ),
-        'DHD' => __( 'Dhading', 'invoicing' ),
-        'KTM' => __( 'Kathmandu', 'invoicing' ),
-        'KAV' => __( 'Kavrepalanchowk', 'invoicing' ),
-        'LAL' => __( 'Lalitpur', 'invoicing' ),
-        'NUW' => __( 'Nuwakot', 'invoicing' ),
-        'RAS' => __( 'Rasuwa', 'invoicing' ),
-        'SPC' => __( 'Sindhupalchowk', 'invoicing' ),
-        'BAR' => __( 'Bara', 'invoicing' ),
-        'CHI' => __( 'Chitwan', 'invoicing' ),
-        'MAK' => __( 'Makwanpur', 'invoicing' ),
-        'PAR' => __( 'Parsa', 'invoicing' ),
-        'RAU' => __( 'Rautahat', 'invoicing' ),
-        'GOR' => __( 'Gorkha', 'invoicing' ),
-        'KAS' => __( 'Kaski', 'invoicing' ),
-        'LAM' => __( 'Lamjung', 'invoicing' ),
-        'MAN' => __( 'Manang', 'invoicing' ),
-        'SYN' => __( 'Syangja', 'invoicing' ),
-        'TAN' => __( 'Tanahun', 'invoicing' ),
-        'BAG' => __( 'Baglung', 'invoicing' ),
-        'PBT' => __( 'Parbat', 'invoicing' ),
-        'MUS' => __( 'Mustang', 'invoicing' ),
-        'MYG' => __( 'Myagdi', 'invoicing' ),
-        'AGR' => __( 'Agrghakanchi', 'invoicing' ),
-        'GUL' => __( 'Gulmi', 'invoicing' ),
-        'KAP' => __( 'Kapilbastu', 'invoicing' ),
-        'NAW' => __( 'Nawalparasi', 'invoicing' ),
-        'PAL' => __( 'Palpa', 'invoicing' ),
-        'RUP' => __( 'Rupandehi', 'invoicing' ),
-        'DAN' => __( 'Dang', 'invoicing' ),
-        'PYU' => __( 'Pyuthan', 'invoicing' ),
-        'ROL' => __( 'Rolpa', 'invoicing' ),
-        'RUK' => __( 'Rukum', 'invoicing' ),
-        'SAL' => __( 'Salyan', 'invoicing' ),
-        'BAN' => __( 'Banke', 'invoicing' ),
-        'BDA' => __( 'Bardiya', 'invoicing' ),
-        'DAI' => __( 'Dailekh', 'invoicing' ),
-        'JAJ' => __( 'Jajarkot', 'invoicing' ),
-        'SUR' => __( 'Surkhet', 'invoicing' ),
-        'DOL' => __( 'Dolpa', 'invoicing' ),
-        'HUM' => __( 'Humla', 'invoicing' ),
-        'JUM' => __( 'Jumla', 'invoicing' ),
-        'KAL' => __( 'Kalikot', 'invoicing' ),
-        'MUG' => __( 'Mugu', 'invoicing' ),
-        'ACH' => __( 'Achham', 'invoicing' ),
-        'BJH' => __( 'Bajhang', 'invoicing' ),
-        'BJU' => __( 'Bajura', 'invoicing' ),
-        'DOT' => __( 'Doti', 'invoicing' ),
-        'KAI' => __( 'Kailali', 'invoicing' ),
-        'BAI' => __( 'Baitadi', 'invoicing' ),
-        'DAD' => __( 'Dadeldhura', 'invoicing' ),
-        'DAR' => __( 'Darchula', 'invoicing' ),
-        'KAN' => __( 'Kanchanpur', 'invoicing' )
+        'ILL' => __('Illam', 'invoicing'),
+        'JHA' => __('Jhapa', 'invoicing'),
+        'PAN' => __('Panchthar', 'invoicing'),
+        'TAP' => __('Taplejung', 'invoicing'),
+        'BHO' => __('Bhojpur', 'invoicing'),
+        'DKA' => __('Dhankuta', 'invoicing'),
+        'MOR' => __('Morang', 'invoicing'),
+        'SUN' => __('Sunsari', 'invoicing'),
+        'SAN' => __('Sankhuwa', 'invoicing'),
+        'TER' => __('Terhathum', 'invoicing'),
+        'KHO' => __('Khotang', 'invoicing'),
+        'OKH' => __('Okhaldhunga', 'invoicing'),
+        'SAP' => __('Saptari', 'invoicing'),
+        'SIR' => __('Siraha', 'invoicing'),
+        'SOL' => __('Solukhumbu', 'invoicing'),
+        'UDA' => __('Udayapur', 'invoicing'),
+        'DHA' => __('Dhanusa', 'invoicing'),
+        'DLK' => __('Dolakha', 'invoicing'),
+        'MOH' => __('Mohottari', 'invoicing'),
+        'RAM' => __('Ramechha', 'invoicing'),
+        'SAR' => __('Sarlahi', 'invoicing'),
+        'SIN' => __('Sindhuli', 'invoicing'),
+        'BHA' => __('Bhaktapur', 'invoicing'),
+        'DHD' => __('Dhading', 'invoicing'),
+        'KTM' => __('Kathmandu', 'invoicing'),
+        'KAV' => __('Kavrepalanchowk', 'invoicing'),
+        'LAL' => __('Lalitpur', 'invoicing'),
+        'NUW' => __('Nuwakot', 'invoicing'),
+        'RAS' => __('Rasuwa', 'invoicing'),
+        'SPC' => __('Sindhupalchowk', 'invoicing'),
+        'BAR' => __('Bara', 'invoicing'),
+        'CHI' => __('Chitwan', 'invoicing'),
+        'MAK' => __('Makwanpur', 'invoicing'),
+        'PAR' => __('Parsa', 'invoicing'),
+        'RAU' => __('Rautahat', 'invoicing'),
+        'GOR' => __('Gorkha', 'invoicing'),
+        'KAS' => __('Kaski', 'invoicing'),
+        'LAM' => __('Lamjung', 'invoicing'),
+        'MAN' => __('Manang', 'invoicing'),
+        'SYN' => __('Syangja', 'invoicing'),
+        'TAN' => __('Tanahun', 'invoicing'),
+        'BAG' => __('Baglung', 'invoicing'),
+        'PBT' => __('Parbat', 'invoicing'),
+        'MUS' => __('Mustang', 'invoicing'),
+        'MYG' => __('Myagdi', 'invoicing'),
+        'AGR' => __('Agrghakanchi', 'invoicing'),
+        'GUL' => __('Gulmi', 'invoicing'),
+        'KAP' => __('Kapilbastu', 'invoicing'),
+        'NAW' => __('Nawalparasi', 'invoicing'),
+        'PAL' => __('Palpa', 'invoicing'),
+        'RUP' => __('Rupandehi', 'invoicing'),
+        'DAN' => __('Dang', 'invoicing'),
+        'PYU' => __('Pyuthan', 'invoicing'),
+        'ROL' => __('Rolpa', 'invoicing'),
+        'RUK' => __('Rukum', 'invoicing'),
+        'SAL' => __('Salyan', 'invoicing'),
+        'BAN' => __('Banke', 'invoicing'),
+        'BDA' => __('Bardiya', 'invoicing'),
+        'DAI' => __('Dailekh', 'invoicing'),
+        'JAJ' => __('Jajarkot', 'invoicing'),
+        'SUR' => __('Surkhet', 'invoicing'),
+        'DOL' => __('Dolpa', 'invoicing'),
+        'HUM' => __('Humla', 'invoicing'),
+        'JUM' => __('Jumla', 'invoicing'),
+        'KAL' => __('Kalikot', 'invoicing'),
+        'MUG' => __('Mugu', 'invoicing'),
+        'ACH' => __('Achham', 'invoicing'),
+        'BJH' => __('Bajhang', 'invoicing'),
+        'BJU' => __('Bajura', 'invoicing'),
+        'DOT' => __('Doti', 'invoicing'),
+        'KAI' => __('Kailali', 'invoicing'),
+        'BAI' => __('Baitadi', 'invoicing'),
+        'DAD' => __('Dadeldhura', 'invoicing'),
+        'DAR' => __('Darchula', 'invoicing'),
+        'KAN' => __('Kanchanpur', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_nepal_states', $states );
+    return apply_filters('wpinv_nepal_states', $states);
 }
 
 function wpinv_get_south_africa_states_list() {
     $states = array(
-        'EC'  => __( 'Eastern Cape', 'invoicing' ),
-        'FS'  => __( 'Free State', 'invoicing' ),
-        'GP'  => __( 'Gauteng', 'invoicing' ),
-        'KZN' => __( 'KwaZulu-Natal', 'invoicing' ),
-        'LP'  => __( 'Limpopo', 'invoicing' ),
-        'MP'  => __( 'Mpumalanga', 'invoicing' ),
-        'NC'  => __( 'Northern Cape', 'invoicing' ),
-        'NW'  => __( 'North West', 'invoicing' ),
-        'WC'  => __( 'Western Cape', 'invoicing' )
+        'EC'  => __('Eastern Cape', 'invoicing'),
+        'FS'  => __('Free State', 'invoicing'),
+        'GP'  => __('Gauteng', 'invoicing'),
+        'KZN' => __('KwaZulu-Natal', 'invoicing'),
+        'LP'  => __('Limpopo', 'invoicing'),
+        'MP'  => __('Mpumalanga', 'invoicing'),
+        'NC'  => __('Northern Cape', 'invoicing'),
+        'NW'  => __('North West', 'invoicing'),
+        'WC'  => __('Western Cape', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_south_africa_states', $states );
+    return apply_filters('wpinv_south_africa_states', $states);
 }
 
 function wpinv_get_thailand_states_list() {
     $states = array(
-        'TH-37' => __( 'Amnat Charoen (อำนาจเจริญ)', 'invoicing' ),
-        'TH-15' => __( 'Ang Thong (อ่างทอง)', 'invoicing' ),
-        'TH-14' => __( 'Ayutthaya (พระนครศรีอยุธยา)', 'invoicing' ),
-        'TH-10' => __( 'Bangkok (กรุงเทพมหานคร)', 'invoicing' ),
-        'TH-38' => __( 'Bueng Kan (บึงกาฬ)', 'invoicing' ),
-        'TH-31' => __( 'Buri Ram (บุรีรัมย์)', 'invoicing' ),
-        'TH-24' => __( 'Chachoengsao (ฉะเชิงเทรา)', 'invoicing' ),
-        'TH-18' => __( 'Chai Nat (ชัยนาท)', 'invoicing' ),
-        'TH-36' => __( 'Chaiyaphum (ชัยภูมิ)', 'invoicing' ),
-        'TH-22' => __( 'Chanthaburi (จันทบุรี)', 'invoicing' ),
-        'TH-50' => __( 'Chiang Mai (เชียงใหม่)', 'invoicing' ),
-        'TH-57' => __( 'Chiang Rai (เชียงราย)', 'invoicing' ),
-        'TH-20' => __( 'Chonburi (ชลบุรี)', 'invoicing' ),
-        'TH-86' => __( 'Chumphon (ชุมพร)', 'invoicing' ),
-        'TH-46' => __( 'Kalasin (กาฬสินธุ์)', 'invoicing' ),
-        'TH-62' => __( 'Kamphaeng Phet (กำแพงเพชร)', 'invoicing' ),
-        'TH-71' => __( 'Kanchanaburi (กาญจนบุรี)', 'invoicing' ),
-        'TH-40' => __( 'Khon Kaen (ขอนแก่น)', 'invoicing' ),
-        'TH-81' => __( 'Krabi (กระบี่)', 'invoicing' ),
-        'TH-52' => __( 'Lampang (ลำปาง)', 'invoicing' ),
-        'TH-51' => __( 'Lamphun (ลำพูน)', 'invoicing' ),
-        'TH-42' => __( 'Loei (เลย)', 'invoicing' ),
-        'TH-16' => __( 'Lopburi (ลพบุรี)', 'invoicing' ),
-        'TH-58' => __( 'Mae Hong Son (แม่ฮ่องสอน)', 'invoicing' ),
-        'TH-44' => __( 'Maha Sarakham (มหาสารคาม)', 'invoicing' ),
-        'TH-49' => __( 'Mukdahan (มุกดาหาร)', 'invoicing' ),
-        'TH-26' => __( 'Nakhon Nayok (นครนายก)', 'invoicing' ),
-        'TH-73' => __( 'Nakhon Pathom (นครปฐม)', 'invoicing' ),
-        'TH-48' => __( 'Nakhon Phanom (นครพนม)', 'invoicing' ),
-        'TH-30' => __( 'Nakhon Ratchasima (นครราชสีมา)', 'invoicing' ),
-        'TH-60' => __( 'Nakhon Sawan (นครสวรรค์)', 'invoicing' ),
-        'TH-80' => __( 'Nakhon Si Thammarat (นครศรีธรรมราช)', 'invoicing' ),
-        'TH-55' => __( 'Nan (น่าน)', 'invoicing' ),
-        'TH-96' => __( 'Narathiwat (นราธิวาส)', 'invoicing' ),
-        'TH-39' => __( 'Nong Bua Lam Phu (หนองบัวลำภู)', 'invoicing' ),
-        'TH-43' => __( 'Nong Khai (หนองคาย)', 'invoicing' ),
-        'TH-12' => __( 'Nonthaburi (นนทบุรี)', 'invoicing' ),
-        'TH-13' => __( 'Pathum Thani (ปทุมธานี)', 'invoicing' ),
-        'TH-94' => __( 'Pattani (ปัตตานี)', 'invoicing' ),
-        'TH-82' => __( 'Phang Nga (พังงา)', 'invoicing' ),
-        'TH-93' => __( 'Phatthalung (พัทลุง)', 'invoicing' ),
-        'TH-56' => __( 'Phayao (พะเยา)', 'invoicing' ),
-        'TH-67' => __( 'Phetchabun (เพชรบูรณ์)', 'invoicing' ),
-        'TH-76' => __( 'Phetchaburi (เพชรบุรี)', 'invoicing' ),
-        'TH-66' => __( 'Phichit (พิจิตร)', 'invoicing' ),
-        'TH-65' => __( 'Phitsanulok (พิษณุโลก)', 'invoicing' ),
-        'TH-54' => __( 'Phrae (แพร่)', 'invoicing' ),
-        'TH-83' => __( 'Phuket (ภูเก็ต)', 'invoicing' ),
-        'TH-25' => __( 'Prachin Buri (ปราจีนบุรี)', 'invoicing' ),
-        'TH-77' => __( 'Prachuap Khiri Khan (ประจวบคีรีขันธ์)', 'invoicing' ),
-        'TH-85' => __( 'Ranong (ระนอง)', 'invoicing' ),
-        'TH-70' => __( 'Ratchaburi (ราชบุรี)', 'invoicing' ),
-        'TH-21' => __( 'Rayong (ระยอง)', 'invoicing' ),
-        'TH-45' => __( 'Roi Et (ร้อยเอ็ด)', 'invoicing' ),
-        'TH-27' => __( 'Sa Kaeo (สระแก้ว)', 'invoicing' ),
-        'TH-47' => __( 'Sakon Nakhon (สกลนคร)', 'invoicing' ),
-        'TH-11' => __( 'Samut Prakan (สมุทรปราการ)', 'invoicing' ),
-        'TH-74' => __( 'Samut Sakhon (สมุทรสาคร)', 'invoicing' ),
-        'TH-75' => __( 'Samut Songkhram (สมุทรสงคราม)', 'invoicing' ),
-        'TH-19' => __( 'Saraburi (สระบุรี)', 'invoicing' ),
-        'TH-91' => __( 'Satun (สตูล)', 'invoicing' ),
-        'TH-17' => __( 'Sing Buri (สิงห์บุรี)', 'invoicing' ),
-        'TH-33' => __( 'Sisaket (ศรีสะเกษ)', 'invoicing' ),
-        'TH-90' => __( 'Songkhla (สงขลา)', 'invoicing' ),
-        'TH-64' => __( 'Sukhothai (สุโขทัย)', 'invoicing' ),
-        'TH-72' => __( 'Suphan Buri (สุพรรณบุรี)', 'invoicing' ),
-        'TH-84' => __( 'Surat Thani (สุราษฎร์ธานี)', 'invoicing' ),
-        'TH-32' => __( 'Surin (สุรินทร์)', 'invoicing' ),
-        'TH-63' => __( 'Tak (ตาก)', 'invoicing' ),
-        'TH-92' => __( 'Trang (ตรัง)', 'invoicing' ),
-        'TH-23' => __( 'Trat (ตราด)', 'invoicing' ),
-        'TH-34' => __( 'Ubon Ratchathani (อุบลราชธานี)', 'invoicing' ),
-        'TH-41' => __( 'Udon Thani (อุดรธานี)', 'invoicing' ),
-        'TH-61' => __( 'Uthai Thani (อุทัยธานี)', 'invoicing' ),
-        'TH-53' => __( 'Uttaradit (อุตรดิตถ์)', 'invoicing' ),
-        'TH-95' => __( 'Yala (ยะลา)', 'invoicing' ),
-        'TH-35' => __( 'Yasothon (ยโสธร)', 'invoicing' )
+        'TH-37' => __('Amnat Charoen (อำนาจเจริญ)', 'invoicing'),
+        'TH-15' => __('Ang Thong (อ่างทอง)', 'invoicing'),
+        'TH-14' => __('Ayutthaya (พระนครศรีอยุธยา)', 'invoicing'),
+        'TH-10' => __('Bangkok (กรุงเทพมหานคร)', 'invoicing'),
+        'TH-38' => __('Bueng Kan (บึงกาฬ)', 'invoicing'),
+        'TH-31' => __('Buri Ram (บุรีรัมย์)', 'invoicing'),
+        'TH-24' => __('Chachoengsao (ฉะเชิงเทรา)', 'invoicing'),
+        'TH-18' => __('Chai Nat (ชัยนาท)', 'invoicing'),
+        'TH-36' => __('Chaiyaphum (ชัยภูมิ)', 'invoicing'),
+        'TH-22' => __('Chanthaburi (จันทบุรี)', 'invoicing'),
+        'TH-50' => __('Chiang Mai (เชียงใหม่)', 'invoicing'),
+        'TH-57' => __('Chiang Rai (เชียงราย)', 'invoicing'),
+        'TH-20' => __('Chonburi (ชลบุรี)', 'invoicing'),
+        'TH-86' => __('Chumphon (ชุมพร)', 'invoicing'),
+        'TH-46' => __('Kalasin (กาฬสินธุ์)', 'invoicing'),
+        'TH-62' => __('Kamphaeng Phet (กำแพงเพชร)', 'invoicing'),
+        'TH-71' => __('Kanchanaburi (กาญจนบุรี)', 'invoicing'),
+        'TH-40' => __('Khon Kaen (ขอนแก่น)', 'invoicing'),
+        'TH-81' => __('Krabi (กระบี่)', 'invoicing'),
+        'TH-52' => __('Lampang (ลำปาง)', 'invoicing'),
+        'TH-51' => __('Lamphun (ลำพูน)', 'invoicing'),
+        'TH-42' => __('Loei (เลย)', 'invoicing'),
+        'TH-16' => __('Lopburi (ลพบุรี)', 'invoicing'),
+        'TH-58' => __('Mae Hong Son (แม่ฮ่องสอน)', 'invoicing'),
+        'TH-44' => __('Maha Sarakham (มหาสารคาม)', 'invoicing'),
+        'TH-49' => __('Mukdahan (มุกดาหาร)', 'invoicing'),
+        'TH-26' => __('Nakhon Nayok (นครนายก)', 'invoicing'),
+        'TH-73' => __('Nakhon Pathom (นครปฐม)', 'invoicing'),
+        'TH-48' => __('Nakhon Phanom (นครพนม)', 'invoicing'),
+        'TH-30' => __('Nakhon Ratchasima (นครราชสีมา)', 'invoicing'),
+        'TH-60' => __('Nakhon Sawan (นครสวรรค์)', 'invoicing'),
+        'TH-80' => __('Nakhon Si Thammarat (นครศรีธรรมราช)', 'invoicing'),
+        'TH-55' => __('Nan (น่าน)', 'invoicing'),
+        'TH-96' => __('Narathiwat (นราธิวาส)', 'invoicing'),
+        'TH-39' => __('Nong Bua Lam Phu (หนองบัวลำภู)', 'invoicing'),
+        'TH-43' => __('Nong Khai (หนองคาย)', 'invoicing'),
+        'TH-12' => __('Nonthaburi (นนทบุรี)', 'invoicing'),
+        'TH-13' => __('Pathum Thani (ปทุมธานี)', 'invoicing'),
+        'TH-94' => __('Pattani (ปัตตานี)', 'invoicing'),
+        'TH-82' => __('Phang Nga (พังงา)', 'invoicing'),
+        'TH-93' => __('Phatthalung (พัทลุง)', 'invoicing'),
+        'TH-56' => __('Phayao (พะเยา)', 'invoicing'),
+        'TH-67' => __('Phetchabun (เพชรบูรณ์)', 'invoicing'),
+        'TH-76' => __('Phetchaburi (เพชรบุรี)', 'invoicing'),
+        'TH-66' => __('Phichit (พิจิตร)', 'invoicing'),
+        'TH-65' => __('Phitsanulok (พิษณุโลก)', 'invoicing'),
+        'TH-54' => __('Phrae (แพร่)', 'invoicing'),
+        'TH-83' => __('Phuket (ภูเก็ต)', 'invoicing'),
+        'TH-25' => __('Prachin Buri (ปราจีนบุรี)', 'invoicing'),
+        'TH-77' => __('Prachuap Khiri Khan (ประจวบคีรีขันธ์)', 'invoicing'),
+        'TH-85' => __('Ranong (ระนอง)', 'invoicing'),
+        'TH-70' => __('Ratchaburi (ราชบุรี)', 'invoicing'),
+        'TH-21' => __('Rayong (ระยอง)', 'invoicing'),
+        'TH-45' => __('Roi Et (ร้อยเอ็ด)', 'invoicing'),
+        'TH-27' => __('Sa Kaeo (สระแก้ว)', 'invoicing'),
+        'TH-47' => __('Sakon Nakhon (สกลนคร)', 'invoicing'),
+        'TH-11' => __('Samut Prakan (สมุทรปราการ)', 'invoicing'),
+        'TH-74' => __('Samut Sakhon (สมุทรสาคร)', 'invoicing'),
+        'TH-75' => __('Samut Songkhram (สมุทรสงคราม)', 'invoicing'),
+        'TH-19' => __('Saraburi (สระบุรี)', 'invoicing'),
+        'TH-91' => __('Satun (สตูล)', 'invoicing'),
+        'TH-17' => __('Sing Buri (สิงห์บุรี)', 'invoicing'),
+        'TH-33' => __('Sisaket (ศรีสะเกษ)', 'invoicing'),
+        'TH-90' => __('Songkhla (สงขลา)', 'invoicing'),
+        'TH-64' => __('Sukhothai (สุโขทัย)', 'invoicing'),
+        'TH-72' => __('Suphan Buri (สุพรรณบุรี)', 'invoicing'),
+        'TH-84' => __('Surat Thani (สุราษฎร์ธานี)', 'invoicing'),
+        'TH-32' => __('Surin (สุรินทร์)', 'invoicing'),
+        'TH-63' => __('Tak (ตาก)', 'invoicing'),
+        'TH-92' => __('Trang (ตรัง)', 'invoicing'),
+        'TH-23' => __('Trat (ตราด)', 'invoicing'),
+        'TH-34' => __('Ubon Ratchathani (อุบลราชธานี)', 'invoicing'),
+        'TH-41' => __('Udon Thani (อุดรธานี)', 'invoicing'),
+        'TH-61' => __('Uthai Thani (อุทัยธานี)', 'invoicing'),
+        'TH-53' => __('Uttaradit (อุตรดิตถ์)', 'invoicing'),
+        'TH-95' => __('Yala (ยะลา)', 'invoicing'),
+        'TH-35' => __('Yasothon (ยโสธร)', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_thailand_states', $states );
+    return apply_filters('wpinv_thailand_states', $states);
 }
 
 function wpinv_get_turkey_states_list() {
     $states = array(
-        'TR01' => __( 'Adana', 'invoicing' ),
-        'TR02' => __( 'Adıyaman', 'invoicing' ),
-        'TR03' => __( 'Afyon', 'invoicing' ),
-        'TR04' => __( 'Ağrı', 'invoicing' ),
-        'TR05' => __( 'Amasya', 'invoicing' ),
-        'TR06' => __( 'Ankara', 'invoicing' ),
-        'TR07' => __( 'Antalya', 'invoicing' ),
-        'TR08' => __( 'Artvin', 'invoicing' ),
-        'TR09' => __( 'Aydın', 'invoicing' ),
-        'TR10' => __( 'Balıkesir', 'invoicing' ),
-        'TR11' => __( 'Bilecik', 'invoicing' ),
-        'TR12' => __( 'Bingöl', 'invoicing' ),
-        'TR13' => __( 'Bitlis', 'invoicing' ),
-        'TR14' => __( 'Bolu', 'invoicing' ),
-        'TR15' => __( 'Burdur', 'invoicing' ),
-        'TR16' => __( 'Bursa', 'invoicing' ),
-        'TR17' => __( 'Çanakkale', 'invoicing' ),
-        'TR18' => __( 'Çankıkesir', 'invoicing' ),
-        'TR19' => __( 'Çorum', 'invoicing' ),
-        'TR20' => __( 'Denizli', 'invoicing' ),
-        'TR21' => __( 'Diyarbakır', 'invoicing' ),
-        'TR22' => __( 'Edirne', 'invoicing' ),
-        'TR23' => __( 'Elazığ', 'invoicing' ),
-        'TR24' => __( 'Erzincan', 'invoicing' ),
-        'TR25' => __( 'Erzurum', 'invoicing' ),
-        'TR26' => __( 'Eskişehir', 'invoicing' ),
-        'TR27' => __( 'Gaziantep', 'invoicing' ),
-        'TR28' => __( 'Giresun', 'invoicing' ),
-        'TR29' => __( 'Gümüşhane', 'invoicing' ),
-        'TR30' => __( 'Hakkari', 'invoicing' ),
-        'TR31' => __( 'Hatay', 'invoicing' ),
-        'TR32' => __( 'Isparta', 'invoicing' ),
-        'TR33' => __( 'İçel', 'invoicing' ),
-        'TR34' => __( 'İstanbul', 'invoicing' ),
-        'TR35' => __( 'İzmir', 'invoicing' ),
-        'TR36' => __( 'Kars', 'invoicing' ),
-        'TR37' => __( 'Kastamonu', 'invoicing' ),
-        'TR38' => __( 'Kayseri', 'invoicing' ),
-        'TR39' => __( 'Kırklareli', 'invoicing' ),
-        'TR40' => __( 'Kırşehir', 'invoicing' ),
-        'TR41' => __( 'Kocaeli', 'invoicing' ),
-        'TR42' => __( 'Konya', 'invoicing' ),
-        'TR43' => __( 'Kütahya', 'invoicing' ),
-        'TR44' => __( 'Malatya', 'invoicing' ),
-        'TR45' => __( 'Manisa', 'invoicing' ),
-        'TR46' => __( 'Kahramanmaraş', 'invoicing' ),
-        'TR47' => __( 'Mardin', 'invoicing' ),
-        'TR48' => __( 'Muğla', 'invoicing' ),
-        'TR49' => __( 'Muş', 'invoicing' ),
-        'TR50' => __( 'Nevşehir', 'invoicing' ),
-        'TR51' => __( 'Niğde', 'invoicing' ),
-        'TR52' => __( 'Ordu', 'invoicing' ),
-        'TR53' => __( 'Rize', 'invoicing' ),
-        'TR54' => __( 'Sakarya', 'invoicing' ),
-        'TR55' => __( 'Samsun', 'invoicing' ),
-        'TR56' => __( 'Siirt', 'invoicing' ),
-        'TR57' => __( 'Sinop', 'invoicing' ),
-        'TR58' => __( 'Sivas', 'invoicing' ),
-        'TR59' => __( 'Tekirdağ', 'invoicing' ),
-        'TR60' => __( 'Tokat', 'invoicing' ),
-        'TR61' => __( 'Trabzon', 'invoicing' ),
-        'TR62' => __( 'Tunceli', 'invoicing' ),
-        'TR63' => __( 'Şanlıurfa', 'invoicing' ),
-        'TR64' => __( 'Uşak', 'invoicing' ),
-        'TR65' => __( 'Van', 'invoicing' ),
-        'TR66' => __( 'Yozgat', 'invoicing' ),
-        'TR67' => __( 'Zonguldak', 'invoicing' ),
-        'TR68' => __( 'Aksaray', 'invoicing' ),
-        'TR69' => __( 'Bayburt', 'invoicing' ),
-        'TR70' => __( 'Karaman', 'invoicing' ),
-        'TR71' => __( 'Kırıkkale', 'invoicing' ),
-        'TR72' => __( 'Batman', 'invoicing' ),
-        'TR73' => __( 'Şırnak', 'invoicing' ),
-        'TR74' => __( 'Bartın', 'invoicing' ),
-        'TR75' => __( 'Ardahan', 'invoicing' ),
-        'TR76' => __( 'Iğdır', 'invoicing' ),
-        'TR77' => __( 'Yalova', 'invoicing' ),
-        'TR78' => __( 'Karabük', 'invoicing' ),
-        'TR79' => __( 'Kilis', 'invoicing' ),
-        'TR80' => __( 'Osmaniye', 'invoicing' ),
-        'TR81' => __( 'Düzce', 'invoicing' )
+        'TR01' => __('Adana', 'invoicing'),
+        'TR02' => __('Adıyaman', 'invoicing'),
+        'TR03' => __('Afyon', 'invoicing'),
+        'TR04' => __('Ağrı', 'invoicing'),
+        'TR05' => __('Amasya', 'invoicing'),
+        'TR06' => __('Ankara', 'invoicing'),
+        'TR07' => __('Antalya', 'invoicing'),
+        'TR08' => __('Artvin', 'invoicing'),
+        'TR09' => __('Aydın', 'invoicing'),
+        'TR10' => __('Balıkesir', 'invoicing'),
+        'TR11' => __('Bilecik', 'invoicing'),
+        'TR12' => __('Bingöl', 'invoicing'),
+        'TR13' => __('Bitlis', 'invoicing'),
+        'TR14' => __('Bolu', 'invoicing'),
+        'TR15' => __('Burdur', 'invoicing'),
+        'TR16' => __('Bursa', 'invoicing'),
+        'TR17' => __('Çanakkale', 'invoicing'),
+        'TR18' => __('Çankıkesir', 'invoicing'),
+        'TR19' => __('Çorum', 'invoicing'),
+        'TR20' => __('Denizli', 'invoicing'),
+        'TR21' => __('Diyarbakır', 'invoicing'),
+        'TR22' => __('Edirne', 'invoicing'),
+        'TR23' => __('Elazığ', 'invoicing'),
+        'TR24' => __('Erzincan', 'invoicing'),
+        'TR25' => __('Erzurum', 'invoicing'),
+        'TR26' => __('Eskişehir', 'invoicing'),
+        'TR27' => __('Gaziantep', 'invoicing'),
+        'TR28' => __('Giresun', 'invoicing'),
+        'TR29' => __('Gümüşhane', 'invoicing'),
+        'TR30' => __('Hakkari', 'invoicing'),
+        'TR31' => __('Hatay', 'invoicing'),
+        'TR32' => __('Isparta', 'invoicing'),
+        'TR33' => __('İçel', 'invoicing'),
+        'TR34' => __('İstanbul', 'invoicing'),
+        'TR35' => __('İzmir', 'invoicing'),
+        'TR36' => __('Kars', 'invoicing'),
+        'TR37' => __('Kastamonu', 'invoicing'),
+        'TR38' => __('Kayseri', 'invoicing'),
+        'TR39' => __('Kırklareli', 'invoicing'),
+        'TR40' => __('Kırşehir', 'invoicing'),
+        'TR41' => __('Kocaeli', 'invoicing'),
+        'TR42' => __('Konya', 'invoicing'),
+        'TR43' => __('Kütahya', 'invoicing'),
+        'TR44' => __('Malatya', 'invoicing'),
+        'TR45' => __('Manisa', 'invoicing'),
+        'TR46' => __('Kahramanmaraş', 'invoicing'),
+        'TR47' => __('Mardin', 'invoicing'),
+        'TR48' => __('Muğla', 'invoicing'),
+        'TR49' => __('Muş', 'invoicing'),
+        'TR50' => __('Nevşehir', 'invoicing'),
+        'TR51' => __('Niğde', 'invoicing'),
+        'TR52' => __('Ordu', 'invoicing'),
+        'TR53' => __('Rize', 'invoicing'),
+        'TR54' => __('Sakarya', 'invoicing'),
+        'TR55' => __('Samsun', 'invoicing'),
+        'TR56' => __('Siirt', 'invoicing'),
+        'TR57' => __('Sinop', 'invoicing'),
+        'TR58' => __('Sivas', 'invoicing'),
+        'TR59' => __('Tekirdağ', 'invoicing'),
+        'TR60' => __('Tokat', 'invoicing'),
+        'TR61' => __('Trabzon', 'invoicing'),
+        'TR62' => __('Tunceli', 'invoicing'),
+        'TR63' => __('Şanlıurfa', 'invoicing'),
+        'TR64' => __('Uşak', 'invoicing'),
+        'TR65' => __('Van', 'invoicing'),
+        'TR66' => __('Yozgat', 'invoicing'),
+        'TR67' => __('Zonguldak', 'invoicing'),
+        'TR68' => __('Aksaray', 'invoicing'),
+        'TR69' => __('Bayburt', 'invoicing'),
+        'TR70' => __('Karaman', 'invoicing'),
+        'TR71' => __('Kırıkkale', 'invoicing'),
+        'TR72' => __('Batman', 'invoicing'),
+        'TR73' => __('Şırnak', 'invoicing'),
+        'TR74' => __('Bartın', 'invoicing'),
+        'TR75' => __('Ardahan', 'invoicing'),
+        'TR76' => __('Iğdır', 'invoicing'),
+        'TR77' => __('Yalova', 'invoicing'),
+        'TR78' => __('Karabük', 'invoicing'),
+        'TR79' => __('Kilis', 'invoicing'),
+        'TR80' => __('Osmaniye', 'invoicing'),
+        'TR81' => __('Düzce', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_turkey_states', $states );
+    return apply_filters('wpinv_turkey_states', $states);
 }
 
 function wpinv_get_spain_states_list() {
     $states = array(
-        'C'  => __( 'A Coruña', 'invoicing' ),
-        'VI' => __( 'Araba', 'invoicing' ),
-        'AB' => __( 'Albacete', 'invoicing' ),
-        'A'  => __( 'Alicante', 'invoicing' ),
-        'AL' => __( 'Almería', 'invoicing' ),
-        'O'  => __( 'Asturias', 'invoicing' ),
-        'AV' => __( 'Ávila', 'invoicing' ),
-        'BA' => __( 'Badajoz', 'invoicing' ),
-        'PM' => __( 'Baleares', 'invoicing' ),
-        'B'  => __( 'Barcelona', 'invoicing' ),
-        'BU' => __( 'Burgos', 'invoicing' ),
-        'CC' => __( 'Cáceres', 'invoicing' ),
-        'CA' => __( 'Cádiz', 'invoicing' ),
-        'S'  => __( 'Cantabria', 'invoicing' ),
-        'CS' => __( 'Castellón', 'invoicing' ),
-        'CE' => __( 'Ceuta', 'invoicing' ),
-        'CR' => __( 'Ciudad Real', 'invoicing' ),
-        'CO' => __( 'Córdoba', 'invoicing' ),
-        'CU' => __( 'Cuenca', 'invoicing' ),
-        'GI' => __( 'Girona', 'invoicing' ),
-        'GR' => __( 'Granada', 'invoicing' ),
-        'GU' => __( 'Guadalajara', 'invoicing' ),
-        'SS' => __( 'Gipuzkoa', 'invoicing' ),
-        'H'  => __( 'Huelva', 'invoicing' ),
-        'HU' => __( 'Huesca', 'invoicing' ),
-        'J'  => __( 'Jaén', 'invoicing' ),
-        'LO' => __( 'La Rioja', 'invoicing' ),
-        'GC' => __( 'Las Palmas', 'invoicing' ),
-        'LE' => __( 'León', 'invoicing' ),
-        'L'  => __( 'Lleida', 'invoicing' ),
-        'LU' => __( 'Lugo', 'invoicing' ),
-        'M'  => __( 'Madrid', 'invoicing' ),
-        'MA' => __( 'Málaga', 'invoicing' ),
-        'ML' => __( 'Melilla', 'invoicing' ),
-        'MU' => __( 'Murcia', 'invoicing' ),
-        'NA' => __( 'Navarra', 'invoicing' ),
-        'OR' => __( 'Ourense', 'invoicing' ),
-        'P'  => __( 'Palencia', 'invoicing' ),
-        'PO' => __( 'Pontevedra', 'invoicing' ),
-        'SA' => __( 'Salamanca', 'invoicing' ),
-        'TF' => __( 'Santa Cruz de Tenerife', 'invoicing' ),
-        'SG' => __( 'Segovia', 'invoicing' ),
-        'SE' => __( 'Sevilla', 'invoicing' ),
-        'SO' => __( 'Soria', 'invoicing' ),
-        'T'  => __( 'Tarragona', 'invoicing' ),
-        'TE' => __( 'Teruel', 'invoicing' ),
-        'TO' => __( 'Toledo', 'invoicing' ),
-        'V'  => __( 'Valencia', 'invoicing' ),
-        'VA' => __( 'Valladolid', 'invoicing' ),
-        'BI' => __( 'Bizkaia', 'invoicing' ),
-        'ZA' => __( 'Zamora', 'invoicing' ),
-        'Z'  => __( 'Zaragoza', 'invoicing' )
+        'C'  => __('A Coruña', 'invoicing'),
+        'VI' => __('Araba', 'invoicing'),
+        'AB' => __('Albacete', 'invoicing'),
+        'A'  => __('Alicante', 'invoicing'),
+        'AL' => __('Almería', 'invoicing'),
+        'O'  => __('Asturias', 'invoicing'),
+        'AV' => __('Ávila', 'invoicing'),
+        'BA' => __('Badajoz', 'invoicing'),
+        'PM' => __('Baleares', 'invoicing'),
+        'B'  => __('Barcelona', 'invoicing'),
+        'BU' => __('Burgos', 'invoicing'),
+        'CC' => __('Cáceres', 'invoicing'),
+        'CA' => __('Cádiz', 'invoicing'),
+        'S'  => __('Cantabria', 'invoicing'),
+        'CS' => __('Castellón', 'invoicing'),
+        'CE' => __('Ceuta', 'invoicing'),
+        'CR' => __('Ciudad Real', 'invoicing'),
+        'CO' => __('Córdoba', 'invoicing'),
+        'CU' => __('Cuenca', 'invoicing'),
+        'GI' => __('Girona', 'invoicing'),
+        'GR' => __('Granada', 'invoicing'),
+        'GU' => __('Guadalajara', 'invoicing'),
+        'SS' => __('Gipuzkoa', 'invoicing'),
+        'H'  => __('Huelva', 'invoicing'),
+        'HU' => __('Huesca', 'invoicing'),
+        'J'  => __('Jaén', 'invoicing'),
+        'LO' => __('La Rioja', 'invoicing'),
+        'GC' => __('Las Palmas', 'invoicing'),
+        'LE' => __('León', 'invoicing'),
+        'L'  => __('Lleida', 'invoicing'),
+        'LU' => __('Lugo', 'invoicing'),
+        'M'  => __('Madrid', 'invoicing'),
+        'MA' => __('Málaga', 'invoicing'),
+        'ML' => __('Melilla', 'invoicing'),
+        'MU' => __('Murcia', 'invoicing'),
+        'NA' => __('Navarra', 'invoicing'),
+        'OR' => __('Ourense', 'invoicing'),
+        'P'  => __('Palencia', 'invoicing'),
+        'PO' => __('Pontevedra', 'invoicing'),
+        'SA' => __('Salamanca', 'invoicing'),
+        'TF' => __('Santa Cruz de Tenerife', 'invoicing'),
+        'SG' => __('Segovia', 'invoicing'),
+        'SE' => __('Sevilla', 'invoicing'),
+        'SO' => __('Soria', 'invoicing'),
+        'T'  => __('Tarragona', 'invoicing'),
+        'TE' => __('Teruel', 'invoicing'),
+        'TO' => __('Toledo', 'invoicing'),
+        'V'  => __('Valencia', 'invoicing'),
+        'VA' => __('Valladolid', 'invoicing'),
+        'BI' => __('Bizkaia', 'invoicing'),
+        'ZA' => __('Zamora', 'invoicing'),
+        'Z'  => __('Zaragoza', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_spain_states', $states );
+    return apply_filters('wpinv_spain_states', $states);
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
         
         $args = array(
 			'name'    => $sanitized_field_name,
 			'id'      => $sanitized_field_name,
 			'class'   => $sanitized_field_name . ' wpinv-select',
-			'options' => array_merge( array( '' => '' ), $states ),
+			'options' => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false
 		);
 
-		$response = wpinv_html_select( $args );
+		$response = wpinv_html_select($args);
 
 	} else {
 		$response = 'nostates';
@@ -1563,8 +1563,8 @@ 
 	return $response;
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = !empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
     
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
\ No newline at end of file

Braces +12 added lines, -8 removed lines

@@ -95,20 +95,24 @@
     }
 
     if ( !empty( $user_info ) ) {
-        if( empty( $address['first_name'] ) )
-            $address['first_name'] = $user_info->first_name;
+        if( empty( $address['first_name'] ) ) {
+                    $address['first_name'] = $user_info->first_name;
+        }
         
-        if( empty( $address['last_name'] ) )
-            $address['last_name'] = $user_info->last_name;
+        if( empty( $address['last_name'] ) ) {
+                    $address['last_name'] = $user_info->last_name;
+        }
     }
     
     $address['name'] = trim( trim( $address['first_name'] . ' ' . $address['last_name'] ), "," );
     
-    if( empty( $address['state'] ) && $with_default )
-        $address['state'] = wpinv_get_default_state();
+    if( empty( $address['state'] ) && $with_default ) {
+            $address['state'] = wpinv_get_default_state();
+    }
 
-    if( empty( $address['country'] ) && $with_default )
-        $address['country'] = wpinv_get_default_country();
+    if( empty( $address['country'] ) && $with_default ) {
+            $address['country'] = wpinv_get_default_country();
+    }
 
 
     return $address;

templates/emails/wpinv-email-user_note.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
     die('-1');
+}
 
 do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
 

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_before_note_details', $invoice, $email_type, $sent_to_admin, $customer_note );
+do_action('wpinv_email_before_note_details', $invoice, $email_type, $sent_to_admin, $customer_note);
 
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_after_note_details', $invoice, $email_type, $sent_to_admin, $customer_note );
+do_action('wpinv_email_after_note_details', $invoice, $email_type, $sent_to_admin, $customer_note);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/emails/wpinv-email-new_invoice.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
     die('-1');
+}
 
 do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
 ?>

Spacing +7 added lines, -7 removed lines

@@ -1,18 +1,18 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 ?>
 
-<p><?php printf( __( 'You have received payment from %s. The invoice is as follows:', 'invoicing' ), $invoice->get_user_full_name() ); ?></p>
+<p><?php printf(__('You have received payment from %s. The invoice is as follows:', 'invoicing'), $invoice->get_user_full_name()); ?></p>
 
 <?php
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/wpinv-invoice-print.php

Spacing +32 added lines, -32 removed lines

@@ -1,41 +1,41 @@ 
 <?php 
-if ( !defined('ABSPATH') ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 global $post;
 $invoice_id = $post->ID;
-$invoice = wpinv_get_invoice( $invoice_id );
-if ( empty( $invoice ) ) {
+$invoice = wpinv_get_invoice($invoice_id);
+if (empty($invoice)) {
     exit;
 }
-$type = $post->post_type == 'wpi_invoice' ? __( 'Invoice', 'invoicing' ): __( 'Quotation', 'invoicing' );
-do_action( 'wpinv_invoice_print_before_display', $invoice ); ?><!DOCTYPE html>
+$type = $post->post_type == 'wpi_invoice' ? __('Invoice', 'invoicing') : __('Quotation', 'invoicing');
+do_action('wpinv_invoice_print_before_display', $invoice); ?><!DOCTYPE html>
 <html <?php language_attributes(); ?>>
 <head>
     <meta charset="UTF-8">
     <title><?php wp_title() ?></title>
-    <meta charset="<?php bloginfo( 'charset' ); ?>" />
+    <meta charset="<?php bloginfo('charset'); ?>" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="robots" content="noindex,nofollow">
 
-    <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
+    <?php do_action('wpinv_invoice_print_head', $invoice); ?>
 </head>
 <body class="body wpinv wpinv-print">
-    <?php do_action( 'wpinv_invoice_print_body_start', $invoice ); ?>
+    <?php do_action('wpinv_invoice_print_body_start', $invoice); ?>
     <div class="container wpinv-wrap">
-        <?php if ( $watermark = wpinv_watermark( $invoice_id ) ) { ?>
-            <div class="watermark no-print"><p><?php echo esc_html( $watermark ) ?></p></div>
+        <?php if ($watermark = wpinv_watermark($invoice_id)) { ?>
+            <div class="watermark no-print"><p><?php echo esc_html($watermark) ?></p></div>
         <?php } ?>
         <!-- ///// Start PDF header -->
         <htmlpageheader name="wpinv-pdf-header">
-            <?php do_action( 'wpinv_invoice_print_before_header', $invoice ); ?>
+            <?php do_action('wpinv_invoice_print_before_header', $invoice); ?>
             <div class="row wpinv-header">
                 <div class="col-xs-6 wpinv-business">
-                    <a target="_blank" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
-                        <?php if ( $logo = wpinv_get_business_logo() ) { ?>
-                        <img class="logo" src="<?php echo esc_url( $logo ); ?>">
+                    <a target="_blank" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
+                        <?php if ($logo = wpinv_get_business_logo()) { ?>
+                        <img class="logo" src="<?php echo esc_url($logo); ?>">
                         <?php } else { ?>
-                        <h1><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
+                        <h1><?php echo esc_html(wpinv_get_business_name()); ?></h1>
                         <?php } ?>
                     </a>
                 </div>
@@ -44,56 +44,56 @@ 
                     <h2><?php echo $type; ?></h2>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invoice_print_after_header', $invoice ); ?>
+            <?php do_action('wpinv_invoice_print_after_header', $invoice); ?>
         </htmlpageheader>
         <!-- End PDF header ///// -->
         
-        <?php do_action( 'wpinv_invoice_print_before_top_content', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_before_top_content', $invoice); ?>
         <div class="row wpinv-top-content">
             <div class="col-xs-12 col-sm-6 wpinv-addresses">
                 <div class="col-xs-12 wpinv-address wpinv-from-address">
                     <?php wpinv_display_from_address(); ?>
                 </div>
                 <div class="col-xs-12 wpinv-address wpinv-to-address">
-                    <?php wpinv_display_to_address( $invoice_id ); ?>
+                    <?php wpinv_display_to_address($invoice_id); ?>
                 </div>
             </div>
             <div class="col-xs-12 col-sm-6 wpinv-details">
                 <div class="col-xs-12 wpinv-line-details">
-                    <?php do_action( 'wpinv_invoice_print_before_details', $invoice ); ?>
-                    <?php wpinv_display_invoice_details( $invoice ); ?>
-                    <?php do_action( 'wpinv_invoice_print_after_details', $invoice ); ?>
+                    <?php do_action('wpinv_invoice_print_before_details', $invoice); ?>
+                    <?php wpinv_display_invoice_details($invoice); ?>
+                    <?php do_action('wpinv_invoice_print_after_details', $invoice); ?>
                 </div>
             </div>
         </div>
-        <?php do_action( 'wpinv_invoice_print_after_top_content', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_after_top_content', $invoice); ?>
 
-        <?php do_action( 'wpinv_invoice_print_middle', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_middle', $invoice); ?>
         
-        <?php do_action( 'wpinv_invoice_print_before_line_items', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_before_line_items', $invoice); ?>
         <div class="row wpinv-items">
             <div class="col-sm-12 wpinv-line-items">
-                <?php wpinv_display_line_items( $invoice_id ); ?>
+                <?php wpinv_display_line_items($invoice_id); ?>
             </div>
         </div>
-        <?php do_action( 'wpinv_invoice_print_after_line_items', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_after_line_items', $invoice); ?>
         
         <!-- ///// Start PDF footer -->
         <htmlpagefooter name="wpinv-pdf-footer">
-            <?php do_action( 'wpinv_invoice_print_before_footer', $invoice ); ?>
+            <?php do_action('wpinv_invoice_print_before_footer', $invoice); ?>
             <div class="row wpinv-footer">
                 <div class="col-sm-12">
-                    <?php if ( $term_text = wpinv_get_terms_text() ) { ?>
-                    <div class="terms-text"><?php echo wpautop( $term_text ); ?></div>
+                    <?php if ($term_text = wpinv_get_terms_text()) { ?>
+                    <div class="terms-text"><?php echo wpautop($term_text); ?></div>
                     <?php } ?>
                     <div class="footer-text"><?php echo wpinv_get_business_footer(); ?></div>
-                    <div class="print-only"><?php _e( 'Page ', 'invoicing' ) ?> {PAGENO}/{nbpg}</div>
+                    <div class="print-only"><?php _e('Page ', 'invoicing') ?> {PAGENO}/{nbpg}</div>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invoice_print_after_footer', $invoice ); ?>
+            <?php do_action('wpinv_invoice_print_after_footer', $invoice); ?>
         </htmlpagefooter>
         <!-- End PDF footer ///// -->
     </div><!-- END wpinv-wrap -->
-    <?php do_action( 'wpinv_invoice_print_body_end', $invoice ); ?>
+    <?php do_action('wpinv_invoice_print_body_end', $invoice); ?>
 </body>
 </html>
\ No newline at end of file

includes/wpinv-gd-functions.php

Indentation +38 added lines, -38 removed lines

@@ -976,67 +976,67 @@
 function wpinv_tool_merge_fix_taxes() {
     global $wpdb;
     
-	$sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
-	$items = $wpdb->get_results( $sql );
+    $sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
+    $items = $wpdb->get_results( $sql );
 	
-	if ( !empty( $items ) ) {
-		foreach ( $items as $item ) {
-			if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
-				update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
-			}
-		}
-	}
+    if ( !empty( $items ) ) {
+        foreach ( $items as $item ) {
+            if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
+                update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
+            }
+        }
+    }
 		
     $sql = "SELECT `p`.`ID`, gdi.id AS gdp_id FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NOT NULL AND p.post_status NOT IN( 'publish', 'wpi-processing', 'wpi-renewal' ) ORDER BY `gdi`.`id` ASC";
     $items = $wpdb->get_results( $sql );
 	
-	if ( !empty( $items ) ) {
-		$success = false;
+    if ( !empty( $items ) ) {
+        $success = false;
         $message = __( 'Taxes fixed for non-paid merged GD invoices.', 'invoicing' );
 		
-		global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
+        global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
 		
-		foreach ( $items as $item ) {
-			$wpi_tax_rates = NULL;               
-			$data = wpinv_get_invoice($item->ID);
+        foreach ( $items as $item ) {
+            $wpi_tax_rates = NULL;               
+            $data = wpinv_get_invoice($item->ID);
 
-			if ( empty( $data ) ) {
-				continue;
-			}
+            if ( empty( $data ) ) {
+                continue;
+            }
 			
-			$checkout_session = wpinv_get_checkout_session();
+            $checkout_session = wpinv_get_checkout_session();
 			
-			$data_session                   = array();
-			$data_session['invoice_id']     = $data->ID;
-			$data_session['cart_discounts'] = $data->get_discounts( true );
+            $data_session                   = array();
+            $data_session['invoice_id']     = $data->ID;
+            $data_session['cart_discounts'] = $data->get_discounts( true );
 			
-			wpinv_set_checkout_session( $data_session );
+            wpinv_set_checkout_session( $data_session );
 			
-			$wpi_userID         = (int)$data->get_user_id();
-			$_POST['country']   = !empty($data->country) ? $data->country : wpinv_get_default_country();
+            $wpi_userID         = (int)$data->get_user_id();
+            $_POST['country']   = !empty($data->country) ? $data->country : wpinv_get_default_country();
 				
-			$data->country      = sanitize_text_field( $_POST['country'] );
-			$data->set( 'country', sanitize_text_field( $_POST['country'] ) );
+            $data->country      = sanitize_text_field( $_POST['country'] );
+            $data->set( 'country', sanitize_text_field( $_POST['country'] ) );
 			
-			$wpinv_ip_address_country = $data->country;
+            $wpinv_ip_address_country = $data->country;
 			
-			$data->recalculate_totals(true);
+            $data->recalculate_totals(true);
 			
-			wpinv_set_checkout_session( $checkout_session );
+            wpinv_set_checkout_session( $checkout_session );
 			
-			$update_data = array();
-			$update_data['tax_amount'] = $data->get_tax();
-			$update_data['paied_amount'] = $data->get_total();
-			$update_data['invoice_id'] = $data->ID;
+            $update_data = array();
+            $update_data['tax_amount'] = $data->get_tax();
+            $update_data['paied_amount'] = $data->get_total();
+            $update_data['invoice_id'] = $data->ID;
 			
-			$wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
-		}
-	} else {
+            $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
+        }
+    } else {
         $success = false;
         $message = __( 'No invoices found to fix taxes!', 'invoicing' );
     }
 	
-	$response = array();
+    $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
     wp_send_json( $response );

Doc Comments +3 added lines

@@ -740,6 +740,9 @@
 add_action( 'geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link' );
 remove_action( 'geodir_dashboard_links', 'geodir_payment_invoices_list_page_link' );
 
+/**
+ * @param string $new_status
+ */
 function wpinv_wpi_to_gdp_update_status( $invoice_id, $new_status, $old_status ) {
     if (!defined('GEODIRPAYMENT_VERSION')) {
         return false;

Spacing +266 added lines, -266 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_gd_active() {
-    return (bool)defined( 'GEODIRECTORY_VERSION' );
+    return (bool)defined('GEODIRECTORY_VERSION');
 }
 
 function wpinv_pm_active() {
-    return (bool)wpinv_gd_active() && (bool)defined( 'GEODIRPAYMENT_VERSION' );
+    return (bool)wpinv_gd_active() && (bool)defined('GEODIRPAYMENT_VERSION');
 }
 
-function wpinv_is_gd_post_type( $post_type ) {
+function wpinv_is_gd_post_type($post_type) {
     global $gd_posttypes;
     
-    $gd_posttypes = !empty( $gd_posttypes ) && is_array( $gd_posttypes ) ? $gd_posttypes : geodir_get_posttypes();
+    $gd_posttypes = !empty($gd_posttypes) && is_array($gd_posttypes) ? $gd_posttypes : geodir_get_posttypes();
     
-    if ( !empty( $post_type ) && !empty( $gd_posttypes ) && in_array( $post_type, $gd_posttypes ) ) {
+    if (!empty($post_type) && !empty($gd_posttypes) && in_array($post_type, $gd_posttypes)) {
         return true;
     }
     
@@ -29,10 +29,10 @@ 
         return;
     }
     
-    if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
+    if (!(defined('DOING_AJAX') && DOING_AJAX)) {
         // Add  fields for force upgrade
-        if ( defined('INVOICE_TABLE') && !get_option('wpinv_gdp_column') ) {
-            geodir_add_column_if_not_exist( INVOICE_TABLE, 'invoice_id', 'INT( 11 ) NOT NULL DEFAULT 0' );
+        if (defined('INVOICE_TABLE') && !get_option('wpinv_gdp_column')) {
+            geodir_add_column_if_not_exist(INVOICE_TABLE, 'invoice_id', 'INT( 11 ) NOT NULL DEFAULT 0');
             
             update_option('wpinv_gdp_column', '1');
         }
@@ -40,39 +40,39 @@ 
         wpinv_merge_gd_packages_to_items();
     }
 }
-add_action( 'admin_init', 'wpinv_geodir_integration' );
+add_action('admin_init', 'wpinv_geodir_integration');
 
-function wpinv_get_gdp_package_type( $item_types ) {
-    if ( wpinv_pm_active() ) {
-        $item_types['package'] = __( 'Package', 'invoicing' );
+function wpinv_get_gdp_package_type($item_types) {
+    if (wpinv_pm_active()) {
+        $item_types['package'] = __('Package', 'invoicing');
     }
         
     return $item_types;
 }
-add_filter( 'wpinv_get_item_types', 'wpinv_get_gdp_package_type', 10, 1 );
+add_filter('wpinv_get_item_types', 'wpinv_get_gdp_package_type', 10, 1);
 
 function wpinv_update_package_item($package_id) {
     return wpinv_merge_gd_package_to_item($package_id, true);
 }
 add_action('geodir_after_save_package', 'wpinv_update_package_item', 10, 1);
 
-function wpinv_merge_gd_packages_to_items( $force = false ) {    
-    if ( $merged = get_option( 'wpinv_merge_gd_packages' ) && !$force ) {
+function wpinv_merge_gd_packages_to_items($force = false) {    
+    if ($merged = get_option('wpinv_merge_gd_packages') && !$force) {
         return true;
     }
 
-    if(!function_exists('geodir_package_list_info')){
+    if (!function_exists('geodir_package_list_info')) {
         return false;
     }
     
     $packages = geodir_package_list_info();
     
-    foreach ( $packages as $key => $package ) {
-        wpinv_merge_gd_package_to_item( $package->pid, $force, $package );
+    foreach ($packages as $key => $package) {
+        wpinv_merge_gd_package_to_item($package->pid, $force, $package);
     }
     
-    if ( !$merged ) {
-        update_option( 'wpinv_merge_gd_packages', 1 );
+    if (!$merged) {
+        update_option('wpinv_merge_gd_packages', 1);
     }
     
     return true;
@@ -101,7 +101,7 @@ 
 
     $package = empty($package) ? geodir_get_package_info_by_id($package_id, '') : $package;
 
-    if ( empty($package) || !wpinv_is_gd_post_type( $package->post_type ) ) {
+    if (empty($package) || !wpinv_is_gd_post_type($package->post_type)) {
         return false;
     }
         
@@ -110,17 +110,17 @@ 
     $meta['custom_id']              = $package_id;
     $meta['custom_singular_name']   = get_post_type_singular_label($package->post_type);
     $meta['custom_name']            = get_post_type_plural_label($package->post_type);
-    $meta['price']                  = wpinv_round_amount( $package->amount );
+    $meta['price']                  = wpinv_round_amount($package->amount);
     $meta['vat_rule']               = 'digital';
     $meta['vat_class']              = '_standard';
     
-    if ( !empty( $package->sub_active ) ) {
-        $sub_num_trial_days = absint( $package->sub_num_trial_days );
+    if (!empty($package->sub_active)) {
+        $sub_num_trial_days = absint($package->sub_num_trial_days);
         
         $meta['is_recurring']       = 1;
         $meta['recurring_period']   = $package->sub_units;
-        $meta['recurring_interval'] = absint( $package->sub_units_num );
-        $meta['recurring_limit']    = absint( $package->sub_units_num_times );
+        $meta['recurring_interval'] = absint($package->sub_units_num);
+        $meta['recurring_limit']    = absint($package->sub_units_num_times);
         $meta['free_trial']         = $sub_num_trial_days > 0 ? 1 : 0;
         $meta['trial_period']       = $package->sub_num_trial_units;
         $meta['trial_interval']     = $sub_num_trial_days;
@@ -134,7 +134,7 @@ 
         $meta['trial_interval']     = '';
     }
     
-    $data  = array( 
+    $data = array( 
         'post_title'    => $package->title,
         'post_excerpt'  => $package->title_desc,
         'post_status'   => $package->status == 1 ? 'publish' : 'pending',
@@ -151,48 +151,48 @@ 
     return $item;
 }
 
-function wpinv_gdp_to_wpi_gateway( $payment_method ) {
-    switch( $payment_method ) {
+function wpinv_gdp_to_wpi_gateway($payment_method) {
+    switch ($payment_method) {
         case 'prebanktransfer':
             $gateway = 'bank_transfer';
         break;
         default:
-            $gateway = empty( $payment_method ) ? 'manual' : $payment_method;
+            $gateway = empty($payment_method) ? 'manual' : $payment_method;
         break;
     }
     
-    return apply_filters( 'wpinv_gdp_to_wpi_gateway', $gateway, $payment_method );
+    return apply_filters('wpinv_gdp_to_wpi_gateway', $gateway, $payment_method);
 }
 
-function wpinv_gdp_to_wpi_gateway_title( $payment_method ) {
-    $gateway = wpinv_gdp_to_wpi_gateway( $payment_method );
+function wpinv_gdp_to_wpi_gateway_title($payment_method) {
+    $gateway = wpinv_gdp_to_wpi_gateway($payment_method);
     
-    $gateway_title = wpinv_get_gateway_checkout_label( $gateway );
+    $gateway_title = wpinv_get_gateway_checkout_label($gateway);
     
-    if ( $gateway == $gateway_title ) {
-        $gateway_title = geodir_payment_method_title( $gateway );
+    if ($gateway == $gateway_title) {
+        $gateway_title = geodir_payment_method_title($gateway);
     }
     
-    return apply_filters( 'wpinv_gdp_to_wpi_gateway_title', $gateway_title, $payment_method );
+    return apply_filters('wpinv_gdp_to_wpi_gateway_title', $gateway_title, $payment_method);
 }
 
 function wpinv_print_checkout_errors() {
     global $wpi_session;
     wpinv_print_errors();
 }
-add_action( 'geodir_checkout_page_content', 'wpinv_print_checkout_errors', -10 );
+add_action('geodir_checkout_page_content', 'wpinv_print_checkout_errors', -10);
 
-function wpinv_cpt_save( $invoice_id, $update = false, $pre_status = NULL ) {
+function wpinv_cpt_save($invoice_id, $update = false, $pre_status = NULL) {
     global $wpi_nosave, $wpi_zero_tax, $wpi_gdp_inv_merge;
     
-    $invoice_info = geodir_get_invoice( $invoice_id );
+    $invoice_info = geodir_get_invoice($invoice_id);
     
-    $wpi_invoice_id  = !empty( $invoice_info->invoice_id ) ? $invoice_info->invoice_id : 0;
+    $wpi_invoice_id  = !empty($invoice_info->invoice_id) ? $invoice_info->invoice_id : 0;
     
     if (!empty($invoice_info)) {
-        $wpi_invoice = $wpi_invoice_id > 0 ? wpinv_get_invoice( $wpi_invoice_id ) : NULL;
+        $wpi_invoice = $wpi_invoice_id > 0 ? wpinv_get_invoice($wpi_invoice_id) : NULL;
         
-        if ( !empty( $wpi_invoice ) ) { // update invoice
+        if (!empty($wpi_invoice)) { // update invoice
             $save = false;
             if ($invoice_info->coupon_code !== $wpi_invoice->discount_code || (float)$invoice_info->discount < (float)$wpi_invoice->discount || (float)$invoice_info->discount > (float)$wpi_invoice->discount) {
                 $save = true;
@@ -202,16 +202,16 @@ 
             
             if ($invoice_info->paymentmethod !== $wpi_invoice->gateway) {
                 $save = true;
-                $gateway = !empty( $invoice_info->paymentmethod ) ? $invoice_info->paymentmethod : '';
-                $gateway = wpinv_gdp_to_wpi_gateway( $gateway );
-                $gateway_title = wpinv_gdp_to_wpi_gateway_title( $gateway );
-                $wpi_invoice->set('gateway', $gateway );
-                $wpi_invoice->set('gateway_title', $gateway_title );
+                $gateway = !empty($invoice_info->paymentmethod) ? $invoice_info->paymentmethod : '';
+                $gateway = wpinv_gdp_to_wpi_gateway($gateway);
+                $gateway_title = wpinv_gdp_to_wpi_gateway_title($gateway);
+                $wpi_invoice->set('gateway', $gateway);
+                $wpi_invoice->set('gateway_title', $gateway_title);
             }
             
-            if ( ( $status = wpinv_gdp_to_wpi_status( $invoice_info->status ) ) !== $wpi_invoice->status ) {
+            if (($status = wpinv_gdp_to_wpi_status($invoice_info->status)) !== $wpi_invoice->status) {
                 $save = true;
-                $wpi_invoice->set( 'status', $status );
+                $wpi_invoice->set('status', $status);
             }
             
             if ($save) {
@@ -222,16 +222,16 @@ 
             
             return $wpi_invoice;
         } else { // create invoice
-            $user_info = get_userdata( $invoice_info->user_id );
+            $user_info = get_userdata($invoice_info->user_id);
             
-            if ( !empty( $pre_status ) ) {
+            if (!empty($pre_status)) {
                 $invoice_info->status = $pre_status;
             }
-            $status = wpinv_gdp_to_wpi_status( $invoice_info->status );
+            $status = wpinv_gdp_to_wpi_status($invoice_info->status);
             
             $wpi_zero_tax = false;
             
-            if ( $wpi_gdp_inv_merge && in_array( $status, array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+            if ($wpi_gdp_inv_merge && in_array($status, array('publish', 'wpi-processing', 'wpi-renewal'))) {
                 $wpi_zero_tax = true;
             }
             
@@ -241,13 +241,13 @@ 
             $invoice_data['user_id']        = $invoice_info->user_id;
             $invoice_data['created_via']    = 'API';
             
-            if ( !empty( $invoice_info->date ) ) {
-                $invoice_data['created_date']   = $invoice_info->date;
+            if (!empty($invoice_info->date)) {
+                $invoice_data['created_date'] = $invoice_info->date;
             }
             
-            $paymentmethod = !empty( $invoice_info->paymentmethod ) ? $invoice_info->paymentmethod : '';
-            $paymentmethod = wpinv_gdp_to_wpi_gateway( $paymentmethod );
-            $payment_method_title = wpinv_gdp_to_wpi_gateway_title( $paymentmethod );
+            $paymentmethod = !empty($invoice_info->paymentmethod) ? $invoice_info->paymentmethod : '';
+            $paymentmethod = wpinv_gdp_to_wpi_gateway($paymentmethod);
+            $payment_method_title = wpinv_gdp_to_wpi_gateway_title($paymentmethod);
             
             $invoice_data['payment_details'] = array( 
                 'gateway'           => $paymentmethod, 
@@ -255,7 +255,7 @@ 
                 'currency'          => geodir_get_currency_type(),
             );
             
-            $user_address = wpinv_get_user_address( $invoice_info->user_id, false );
+            $user_address = wpinv_get_user_address($invoice_info->user_id, false);
             
             $invoice_data['user_info'] = array( 
                 'user_id'       => $invoice_info->user_id, 
@@ -278,14 +278,14 @@ 
             
             $post_item = wpinv_get_gd_package_item($invoice_info->package_id);
 
-            if ( $invoice_info->invoice_type == 'add_franchise' ) {
+            if ($invoice_info->invoice_type == 'add_franchise') {
                 $custom_price = $invoice_info->amount;
             } else {
                 $custom_price = '';
             }
 
-            if ( !empty( $post_item ) ) {
-                $cart_details  = array();
+            if (!empty($post_item)) {
+                $cart_details = array();
                 $cart_details[] = array(
                     'id'            => $post_item->ID,
                     'name'          => $post_item->get_name(),
@@ -299,19 +299,19 @@ 
                     ),
                 );
                 
-                $invoice_data['cart_details']  = $cart_details;
+                $invoice_data['cart_details'] = $cart_details;
             }
 
-            $data = array( 'invoice' => $invoice_data );
+            $data = array('invoice' => $invoice_data);
 
             $wpinv_api = new WPInv_API();
-            $data = $wpinv_api->insert_invoice( $data );
+            $data = $wpinv_api->insert_invoice($data);
             
-            if ( is_wp_error( $data ) ) {
-                wpinv_error_log( 'WPInv_Invoice: ' . $data->get_error_message() );
+            if (is_wp_error($data)) {
+                wpinv_error_log('WPInv_Invoice: ' . $data->get_error_message());
             } else {
-                if ( !empty( $data ) ) {
-                    update_post_meta( $data->ID, '_wpinv_gdp_id', $invoice_id );
+                if (!empty($data)) {
+                    update_post_meta($data->ID, '_wpinv_gdp_id', $invoice_id);
                     
                     $update_data = array();
                     $update_data['tax_amount'] = $data->get_tax();
@@ -319,14 +319,14 @@ 
                     $update_data['invoice_id'] = $data->ID;
                     
                     global $wpdb;
-                    $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $invoice_id ) );
+                    $wpdb->update(INVOICE_TABLE, $update_data, array('id' => $invoice_id));
                     
                     return $data;
                 } else {
-                    if ( $update ) {
-                        wpinv_error_log( 'WPInv_Invoice: ' . __( 'Fail to update invoice.', 'invoicing' ) );
+                    if ($update) {
+                        wpinv_error_log('WPInv_Invoice: ' . __('Fail to update invoice.', 'invoicing'));
                     } else {
-                        wpinv_error_log( 'WPInv_Invoice: ' . __( 'Fail to create invoice.', 'invoicing' ) );
+                        wpinv_error_log('WPInv_Invoice: ' . __('Fail to create invoice.', 'invoicing'));
                     }
                 }
             }
@@ -337,59 +337,59 @@ 
 }
 add_action('geodir_payment_invoice_created', 'wpinv_cpt_save', 11, 3);
 
-function wpinv_cpt_update( $invoice_id ) {
-    return wpinv_cpt_save( $invoice_id, true );
+function wpinv_cpt_update($invoice_id) {
+    return wpinv_cpt_save($invoice_id, true);
 }
 add_action('geodir_payment_invoice_updated', 'wpinv_cpt_update', 11, 1);
 
-function wpinv_payment_status_changed( $invoice_id, $new_status, $old_status = 'wpi-pending', $subscription = false ) {
-    $invoice_info = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice_info ) ) {
+function wpinv_payment_status_changed($invoice_id, $new_status, $old_status = 'wpi-pending', $subscription = false) {
+    $invoice_info = geodir_get_invoice($invoice_id);
+    if (empty($invoice_info)) {
         return false;
     }
 
-    $invoice = !empty( $invoice_info->invoice_id ) ? wpinv_get_invoice( $invoice_info->invoice_id ) : NULL;
-    if ( !empty( $invoice ) ) {
+    $invoice = !empty($invoice_info->invoice_id) ? wpinv_get_invoice($invoice_info->invoice_id) : NULL;
+    if (!empty($invoice)) {
         $new_status = wpinv_gdp_to_wpi_status($new_status);
-        $invoice    = wpinv_update_payment_status( $invoice->ID, $new_status );
+        $invoice    = wpinv_update_payment_status($invoice->ID, $new_status);
     } else {
-        $invoice = wpinv_cpt_save( $invoice_id );
+        $invoice = wpinv_cpt_save($invoice_id);
     }
     
     return $invoice;
 }
-add_action( 'geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4 );
+add_action('geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4);
 
-function wpinv_transaction_details_note( $invoice_id, $html ) {
-    $invoice_info = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice_info ) ) {
+function wpinv_transaction_details_note($invoice_id, $html) {
+    $invoice_info = geodir_get_invoice($invoice_id);
+    if (empty($invoice_info)) {
         return false;
     }
 
-    $wpi_invoice_id = !empty( $invoice_info->invoice_id ) ? $invoice_info->invoice_id : NULL;
+    $wpi_invoice_id = !empty($invoice_info->invoice_id) ? $invoice_info->invoice_id : NULL;
     
-    if ( !$wpi_invoice_id ) {
-        $invoice = wpinv_cpt_save( $invoice_id, false, $old_status );
+    if (!$wpi_invoice_id) {
+        $invoice = wpinv_cpt_save($invoice_id, false, $old_status);
         
-        if ( !empty( $invoice ) ) {
+        if (!empty($invoice)) {
             $wpi_invoice_id = $invoice->ID;
         }
     }
 
-    $invoice = wpinv_get_invoice( $wpi_invoice_id );
+    $invoice = wpinv_get_invoice($wpi_invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
-    return $invoice->add_note( $html, true );
+    return $invoice->add_note($html, true);
 }
-add_action( 'geodir_payment_invoice_transaction_details_changed', 'wpinv_transaction_details_note', 11, 2 );
+add_action('geodir_payment_invoice_transaction_details_changed', 'wpinv_transaction_details_note', 11, 2);
 
-function wpinv_gdp_to_wpi_status( $status ) {
+function wpinv_gdp_to_wpi_status($status) {
     $inv_status = $status ? $status : 'wpi-pending';
     
-    switch ( $status ) {
+    switch ($status) {
         case 'pending':
             $inv_status = 'wpi-pending';
         break;
@@ -412,10 +412,10 @@ 
     return $inv_status;
 }
 
-function wpinv_wpi_to_gdp_status( $status ) {
+function wpinv_wpi_to_gdp_status($status) {
     $inv_status = $status ? $status : 'pending';
     
-    switch ( $status ) {
+    switch ($status) {
         case 'wpi-pending':
             $inv_status = 'pending';
         break;
@@ -441,72 +441,72 @@ 
     return $inv_status;
 }
 
-function wpinv_wpi_to_gdp_id( $invoice_id ) {
+function wpinv_wpi_to_gdp_id($invoice_id) {
     global $wpdb;
     
-    return $wpdb->get_var( $wpdb->prepare( "SELECT `id` FROM `" . INVOICE_TABLE . "` WHERE `invoice_id` = %d AND `invoice_id` > 0 ORDER BY id DESC LIMIT 1", array( (int)$invoice_id ) ) );
+    return $wpdb->get_var($wpdb->prepare("SELECT `id` FROM `" . INVOICE_TABLE . "` WHERE `invoice_id` = %d AND `invoice_id` > 0 ORDER BY id DESC LIMIT 1", array((int)$invoice_id)));
 }
 
-function wpinv_gdp_to_wpi_id( $invoice_id ) {
-    $invoice = geodir_get_invoice( $invoice_id );    
-    return ( empty( $invoice->invoice_id ) ? $invoice->invoice_id : false);
+function wpinv_gdp_to_wpi_id($invoice_id) {
+    $invoice = geodir_get_invoice($invoice_id);    
+    return (empty($invoice->invoice_id) ? $invoice->invoice_id : false);
 }
 
-function wpinv_to_gdp_recalculate_total( $invoice, $wpi_nosave ) {
+function wpinv_to_gdp_recalculate_total($invoice, $wpi_nosave) {
     global $wpdb;
     
-    if ( !empty( $wpi_nosave ) ) {
+    if (!empty($wpi_nosave)) {
         return;
     }
     
-    $gdp_invoice_id = wpinv_wpi_to_gdp_id( $invoice->ID );
+    $gdp_invoice_id = wpinv_wpi_to_gdp_id($invoice->ID);
     
-    if ( $gdp_invoice_id > 0 ) {
+    if ($gdp_invoice_id > 0) {
         $update_data = array();
         $update_data['tax_amount']      = $invoice->tax;
         $update_data['paied_amount']    = $invoice->total;
         $update_data['discount']        = $invoice->discount;
         $update_data['coupon_code']     = $invoice->discount_code;
         
-        $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $gdp_invoice_id ) );
+        $wpdb->update(INVOICE_TABLE, $update_data, array('id' => $gdp_invoice_id));
     }
     
     return;
 }
 //add_action( 'wpinv_invoice_recalculate_total', 'wpinv_to_gdp_recalculate_total', 10, 2 );
 
-function wpinv_gdp_to_wpi_invoice( $invoice_id ) {
-    $invoice = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice->invoice_id ) ) {
+function wpinv_gdp_to_wpi_invoice($invoice_id) {
+    $invoice = geodir_get_invoice($invoice_id);
+    if (empty($invoice->invoice_id)) {
         return false;
     }
     
-    return wpinv_get_invoice( $invoice->invoice_id );
+    return wpinv_get_invoice($invoice->invoice_id);
 }
 
-function wpinv_payment_set_coupon_code( $status, $invoice_id, $coupon_code ) {
-    $invoice = wpinv_gdp_to_wpi_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+function wpinv_payment_set_coupon_code($status, $invoice_id, $coupon_code) {
+    $invoice = wpinv_gdp_to_wpi_invoice($invoice_id);
+    if (empty($invoice)) {
         return $status;
     }
 
-    if ( $status === 1 || $status === 0 ) {
-        if ( $status === 1 ) {
-            $discount = geodir_get_discount_amount( $coupon_code, $invoice->get_subtotal() );
+    if ($status === 1 || $status === 0) {
+        if ($status === 1) {
+            $discount = geodir_get_discount_amount($coupon_code, $invoice->get_subtotal());
         } else {
             $discount = '';
             $coupon_code = '';
         }
         
-        $invoice->set( 'discount', $discount );
-        $invoice->set( 'discount_code', $coupon_code );
+        $invoice->set('discount', $discount);
+        $invoice->set('discount_code', $coupon_code);
         $invoice->save();
         $invoice->recalculate_total();
     }
     
     return $status;
 }
-add_filter( 'geodir_payment_set_coupon_code', 'wpinv_payment_set_coupon_code', 10, 3 );
+add_filter('geodir_payment_set_coupon_code', 'wpinv_payment_set_coupon_code', 10, 3);
 
 function wpinv_merge_gd_invoices() {
     if (!defined('GEODIRPAYMENT_VERSION')) {
@@ -514,157 +514,157 @@ 
     }
     ?>
     <tr>
-        <td><?php _e( 'Merge Price Packages', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager price packages to the Invoicing items.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_packages" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Price Packages', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager price packages to the Invoicing items.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_packages" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <tr>
-        <td><?php _e( 'Merge Invoices', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager invoices to the Invoicing.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_invoices" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Invoices', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager invoices to the Invoicing.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_invoices" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
 	<tr>
-        <td><?php _e( 'Fix Taxes for Merged Invoices', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Fix taxes for NON-PAID invoices which are merged before, from GeoDirectory Payment Manager invoices to Invoicing. This will recalculate taxes for non-paid merged invoices.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_fix_taxes" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Fix Taxes for Merged Invoices', 'invoicing'); ?></td>
+        <td><p><?php _e('Fix taxes for NON-PAID invoices which are merged before, from GeoDirectory Payment Manager invoices to Invoicing. This will recalculate taxes for non-paid merged invoices.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_fix_taxes" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <tr>
-        <td><?php _e( 'Merge Coupons', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager coupons to the Invoicing.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_coupons" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Coupons', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager coupons to the Invoicing.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_coupons" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <?php
 }
-add_action( 'wpinv_tools_row', 'wpinv_merge_gd_invoices', 10 );
+add_action('wpinv_tools_row', 'wpinv_merge_gd_invoices', 10);
 
 function wpinv_tool_merge_packages() {
     $packages = geodir_package_list_info();
     
     $count = 0;
     
-    if ( !empty( $packages ) ) {
+    if (!empty($packages)) {
         $success = true;
         
-        foreach ( $packages as $key => $package ) {
+        foreach ($packages as $key => $package) {
             $item = wpinv_get_item_by('custom_id', $package->pid, 'package');
-            if ( !empty( $item ) ) {
+            if (!empty($item)) {
                 continue;
             }
             
-            $merged = wpinv_merge_gd_package_to_item( $package->pid, false, $package );
+            $merged = wpinv_merge_gd_package_to_item($package->pid, false, $package);
             
-            if ( !empty( $merged ) ) {
-                wpinv_error_log( 'Package merge S : ' . $package->pid );
+            if (!empty($merged)) {
+                wpinv_error_log('Package merge S : ' . $package->pid);
                 $count++;
             } else {
-                wpinv_error_log( 'Package merge F : ' . $package->pid );
+                wpinv_error_log('Package merge F : ' . $package->pid);
             }
         }
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> price package is merged successfully.', 'Total <b>%d</b> price packages are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> price package is merged successfully.', 'Total <b>%d</b> price packages are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No price packages merged.', 'invoicing' );
+            $message = __('No price packages merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No price packages found to merge!', 'invoicing' );
+        $message = __('No price packages found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_packages', 'wpinv_tool_merge_packages' );
+add_action('wpinv_tool_merge_packages', 'wpinv_tool_merge_packages');
 
 function wpinv_tool_merge_invoices() {
     global $wpdb, $wpi_gdp_inv_merge, $wpi_tax_rates;
     
     $sql = "SELECT `gdi`.`id`, `gdi`.`date`, `gdi`.`date_updated` FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NULL ORDER BY `gdi`.`id` ASC";
 
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
     
     $count = 0;
     
-    if ( !empty( $items ) ) {
+    if (!empty($items)) {
         $success = true;
         $wpi_gdp_inv_merge = true;
         
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
             $wpi_tax_rates = NULL;
             
-            $wpdb->query( "UPDATE `" . INVOICE_TABLE . "` SET `invoice_id` = 0 WHERE id = '" . $item->id . "'" );
+            $wpdb->query("UPDATE `" . INVOICE_TABLE . "` SET `invoice_id` = 0 WHERE id = '" . $item->id . "'");
             
-            $merged = wpinv_cpt_save( $item->id );
+            $merged = wpinv_cpt_save($item->id);
             
-            if ( !empty( $merged ) && !empty( $merged->ID ) ) {
+            if (!empty($merged) && !empty($merged->ID)) {
                 $count++;
                 
-                $post_date = !empty( $item->date ) && $item->date != '0000-00-00 00:00:00' ? $item->date : current_time( 'mysql' );
-                $post_date_gmt = get_gmt_from_date( $post_date );
-                $post_modified = !empty( $item->date_updated ) && $item->date_updated != '0000-00-00 00:00:00' ? $item->date_updated : $post_date;
-                $post_modified_gmt = get_gmt_from_date( $post_modified );
+                $post_date = !empty($item->date) && $item->date != '0000-00-00 00:00:00' ? $item->date : current_time('mysql');
+                $post_date_gmt = get_gmt_from_date($post_date);
+                $post_modified = !empty($item->date_updated) && $item->date_updated != '0000-00-00 00:00:00' ? $item->date_updated : $post_date;
+                $post_modified_gmt = get_gmt_from_date($post_modified);
                 
-                $wpdb->update( $wpdb->posts, array( 'post_date' => $post_date, 'post_date_gmt' => $post_date_gmt, 'post_modified' => $post_modified, 'post_modified_gmt' => $post_modified_gmt ), array( 'ID' => $merged->ID ) );
+                $wpdb->update($wpdb->posts, array('post_date' => $post_date, 'post_date_gmt' => $post_date_gmt, 'post_modified' => $post_modified, 'post_modified_gmt' => $post_modified_gmt), array('ID' => $merged->ID));
                 
-                if ( $merged->is_paid() ) {
-                    update_post_meta( $merged->ID, '_wpinv_completed_date', $post_modified );
+                if ($merged->is_paid()) {
+                    update_post_meta($merged->ID, '_wpinv_completed_date', $post_modified);
                 }
                 
-                clean_post_cache( $merged->ID );
+                clean_post_cache($merged->ID);
                 
-                wpinv_error_log( 'Invoice merge S : ' . $item->id . ' => ' . $merged->ID );
+                wpinv_error_log('Invoice merge S : ' . $item->id . ' => ' . $merged->ID);
             } else {
-                wpinv_error_log( 'Invoice merge F : ' . $item->id );
+                wpinv_error_log('Invoice merge F : ' . $item->id);
             }
         }
         
         $wpi_gdp_inv_merge = false;
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> invoice is merged successfully.', 'Total <b>%d</b> invoices are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> invoice is merged successfully.', 'Total <b>%d</b> invoices are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No invoices merged.', 'invoicing' );
+            $message = __('No invoices merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No invoices found to merge!', 'invoicing' );
+        $message = __('No invoices found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_invoices', 'wpinv_tool_merge_invoices' );
+add_action('wpinv_tool_merge_invoices', 'wpinv_tool_merge_invoices');
 
 function wpinv_tool_merge_coupons() {
     global $wpdb;
     
     $sql = "SELECT * FROM `" . COUPON_TABLE . "` WHERE `coupon_code` IS NOT NULL AND `coupon_code` != '' ORDER BY `cid` ASC";
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
     $count = 0;
     
-    if ( !empty( $items ) ) {
+    if (!empty($items)) {
         $success = true;
         
-        foreach ( $items as $item ) {
-            if ( wpinv_get_discount_by_code( $item->coupon_code ) ) {
+        foreach ($items as $item) {
+            if (wpinv_get_discount_by_code($item->coupon_code)) {
                 continue;
             }
             
             $args = array(
                 'post_type'   => 'wpi_discount',
                 'post_title'  => $item->coupon_code,
-                'post_status' => !empty( $item->status ) ? 'publish' : 'pending'
+                'post_status' => !empty($item->status) ? 'publish' : 'pending'
             );
 
-            $merged = wp_insert_post( $args );
+            $merged = wp_insert_post($args);
             
             $item_id = $item->cid;
             
-            if ( $merged ) {
+            if ($merged) {
                 $meta = array(
                     'code'              => $item->coupon_code,
                     'type'              => $item->discount_type != 'per' ? 'flat' : 'percent',
@@ -672,65 +672,65 @@ 
                     'max_uses'          => (int)$item->usage_limit,
                     'uses'              => (int)$item->usage_count,
                 );
-                wpinv_store_discount( $merged, $meta, get_post( $merged ) );
+                wpinv_store_discount($merged, $meta, get_post($merged));
                 
                 $count++;
                 
-                wpinv_error_log( 'Coupon merge S : ' . $item_id . ' => ' . $merged );
+                wpinv_error_log('Coupon merge S : ' . $item_id . ' => ' . $merged);
             } else {
-                wpinv_error_log( 'Coupon merge F : ' . $item_id );
+                wpinv_error_log('Coupon merge F : ' . $item_id);
             }
         }
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> coupon is merged successfully.', 'Total <b>%d</b> coupons are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> coupon is merged successfully.', 'Total <b>%d</b> coupons are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No coupons merged.', 'invoicing' );
+            $message = __('No coupons merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No coupons found to merge!', 'invoicing' );
+        $message = __('No coupons found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_coupons', 'wpinv_tool_merge_coupons' );
+add_action('wpinv_tool_merge_coupons', 'wpinv_tool_merge_coupons');
 
-function wpinv_gdp_to_wpi_currency( $value, $option = '' ) {
+function wpinv_gdp_to_wpi_currency($value, $option = '') {
     return wpinv_get_currency();
 }
-add_filter( 'pre_option_geodir_currency', 'wpinv_gdp_to_wpi_currency', 10, 2 );
+add_filter('pre_option_geodir_currency', 'wpinv_gdp_to_wpi_currency', 10, 2);
 
-function wpinv_gdp_to_wpi_currency_sign( $value, $option = '' ) {
+function wpinv_gdp_to_wpi_currency_sign($value, $option = '') {
     return wpinv_currency_symbol();
 }
-add_filter( 'pre_option_geodir_currencysym', 'wpinv_gdp_to_wpi_currency_sign', 10, 2 );
+add_filter('pre_option_geodir_currencysym', 'wpinv_gdp_to_wpi_currency_sign', 10, 2);
 
-function wpinv_gdp_to_wpi_display_price( $price, $amount, $display = true , $decimal_sep, $thousand_sep ) {
-    if ( !$display ) {
-        $price = wpinv_round_amount( $amount );
+function wpinv_gdp_to_wpi_display_price($price, $amount, $display = true, $decimal_sep, $thousand_sep) {
+    if (!$display) {
+        $price = wpinv_round_amount($amount);
     } else {
-        $price = wpinv_price( wpinv_format_amount( $amount ) );
+        $price = wpinv_price(wpinv_format_amount($amount));
     }
     
     return $price;
 }
-add_filter( 'geodir_payment_price' , 'wpinv_gdp_to_wpi_display_price', 10000, 5 );
+add_filter('geodir_payment_price', 'wpinv_gdp_to_wpi_display_price', 10000, 5);
 
-function wpinv_gdp_to_inv_checkout_redirect( $redirect_url ) {
+function wpinv_gdp_to_inv_checkout_redirect($redirect_url) {
     $invoice_id         = geodir_payment_cart_id();
-    $invoice_info       = geodir_get_invoice( $invoice_id );
-    $wpi_invoice        = !empty( $invoice_info->invoice_id ) ? wpinv_get_invoice( $invoice_info->invoice_id ) : NULL;
+    $invoice_info       = geodir_get_invoice($invoice_id);
+    $wpi_invoice        = !empty($invoice_info->invoice_id) ? wpinv_get_invoice($invoice_info->invoice_id) : NULL;
     
-    if ( !( !empty( $wpi_invoice ) && !empty( $wpi_invoice->ID ) ) ) {
-        $wpi_invoice_id = wpinv_cpt_save( $invoice_id );
-        $wpi_invoice    = wpinv_get_invoice( $wpi_invoice_id );
+    if (!(!empty($wpi_invoice) && !empty($wpi_invoice->ID))) {
+        $wpi_invoice_id = wpinv_cpt_save($invoice_id);
+        $wpi_invoice    = wpinv_get_invoice($wpi_invoice_id);
     }
     
-    if ( !empty( $wpi_invoice ) && !empty( $wpi_invoice->ID ) ) {
+    if (!empty($wpi_invoice) && !empty($wpi_invoice->ID)) {
         
         // Clear cart
         geodir_payment_clear_cart();
@@ -740,121 +740,121 @@ 
     
     return $redirect_url;
 }
-add_filter( 'geodir_payment_checkout_redirect_url', 'wpinv_gdp_to_inv_checkout_redirect', 100, 1 );
+add_filter('geodir_payment_checkout_redirect_url', 'wpinv_gdp_to_inv_checkout_redirect', 100, 1);
 
-function wpinv_gdp_dashboard_invoice_history_link( $dashboard_links ) {    
-    if ( get_current_user_id() ) {        
-        $dashboard_links .= '<li><i class="fa fa-shopping-cart"></i><a class="gd-invoice-link" href="' . esc_url( wpinv_get_history_page_uri() ) . '">' . __( 'My Invoice History', 'invoicing' ) . '</a></li>';
+function wpinv_gdp_dashboard_invoice_history_link($dashboard_links) {    
+    if (get_current_user_id()) {        
+        $dashboard_links .= '<li><i class="fa fa-shopping-cart"></i><a class="gd-invoice-link" href="' . esc_url(wpinv_get_history_page_uri()) . '">' . __('My Invoice History', 'invoicing') . '</a></li>';
     }
 
     return $dashboard_links;
 }
-add_action( 'geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link' );
-remove_action( 'geodir_dashboard_links', 'geodir_payment_invoices_list_page_link' );
+add_action('geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link');
+remove_action('geodir_dashboard_links', 'geodir_payment_invoices_list_page_link');
 
-function wpinv_wpi_to_gdp_update_status( $invoice_id, $new_status, $old_status ) {
+function wpinv_wpi_to_gdp_update_status($invoice_id, $new_status, $old_status) {
     if (!defined('GEODIRPAYMENT_VERSION')) {
         return false;
     }
     
-    $invoice    = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    remove_action( 'geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4 );
+    remove_action('geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4);
     
-    $invoice_id = wpinv_wpi_to_gdp_id( $invoice_id );
-    $new_status = wpinv_wpi_to_gdp_status( $new_status );
+    $invoice_id = wpinv_wpi_to_gdp_id($invoice_id);
+    $new_status = wpinv_wpi_to_gdp_status($new_status);
     
-    geodir_update_invoice_status( $invoice_id, $new_status, $invoice->is_recurring() );
+    geodir_update_invoice_status($invoice_id, $new_status, $invoice->is_recurring());
 }
-add_action( 'wpinv_update_status', 'wpinv_wpi_to_gdp_update_status', 999, 3 );
+add_action('wpinv_update_status', 'wpinv_wpi_to_gdp_update_status', 999, 3);
 
-function wpinv_gdp_to_wpi_delete_package( $gd_package_id ) {
-    $item = wpinv_get_item_by( 'custom_id', $gd_package_id, 'package' );
+function wpinv_gdp_to_wpi_delete_package($gd_package_id) {
+    $item = wpinv_get_item_by('custom_id', $gd_package_id, 'package');
     
-    if ( !empty( $item ) ) {
-        wpinv_remove_item( $item, true );
+    if (!empty($item)) {
+        wpinv_remove_item($item, true);
     }
 }
-add_action( 'geodir_payment_post_delete_package', 'wpinv_gdp_to_wpi_delete_package', 10, 1 ) ;
+add_action('geodir_payment_post_delete_package', 'wpinv_gdp_to_wpi_delete_package', 10, 1);
 
-function wpinv_can_delete_package_item( $return, $post_id ) {
-    if ( $return && function_exists( 'geodir_get_package_info_by_id' ) && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' && $package_id = get_post_meta( $post_id, '_wpinv_custom_id', true ) ) {
-        $gd_package = geodir_get_package_info_by_id( $package_id, '' );
+function wpinv_can_delete_package_item($return, $post_id) {
+    if ($return && function_exists('geodir_get_package_info_by_id') && get_post_meta($post_id, '_wpinv_type', true) == 'package' && $package_id = get_post_meta($post_id, '_wpinv_custom_id', true)) {
+        $gd_package = geodir_get_package_info_by_id($package_id, '');
         
-        if ( !empty( $gd_package ) ) {
+        if (!empty($gd_package)) {
             $return = false;
         }
     }
 
     return $return;
 }
-add_filter( 'wpinv_can_delete_item', 'wpinv_can_delete_package_item', 10, 2 );
+add_filter('wpinv_can_delete_item', 'wpinv_can_delete_package_item', 10, 2);
 
-function wpinv_package_item_classes( $classes, $class, $post_id ) {
+function wpinv_package_item_classes($classes, $class, $post_id) {
     global $typenow;
 
-    if ( $typenow == 'wpi_item' && in_array( 'wpi-gd-package', $classes ) ) {
-        if ( wpinv_item_in_use( $post_id ) ) {
+    if ($typenow == 'wpi_item' && in_array('wpi-gd-package', $classes)) {
+        if (wpinv_item_in_use($post_id)) {
             $classes[] = 'wpi-inuse-pkg';
-        } else if ( !( function_exists( 'geodir_get_package_info_by_id' ) && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' && geodir_get_package_info_by_id( (int)get_post_meta( $post_id, '_wpinv_custom_id', true ), '' ) ) ) {
+        } else if (!(function_exists('geodir_get_package_info_by_id') && get_post_meta($post_id, '_wpinv_type', true) == 'package' && geodir_get_package_info_by_id((int)get_post_meta($post_id, '_wpinv_custom_id', true), ''))) {
             $classes[] = 'wpi-delete-pkg';
         }
     }
 
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_package_item_classes', 10, 3 );
+add_filter('post_class', 'wpinv_package_item_classes', 10, 3);
 
-function wpinv_gdp_package_type_info( $post ) {
-    if ( wpinv_pm_active() ) {
-        ?><p class="wpi-m0"><?php _e( 'Package: GeoDirectory price packages items.', 'invoicing' );?></p>
+function wpinv_gdp_package_type_info($post) {
+    if (wpinv_pm_active()) {
+        ?><p class="wpi-m0"><?php _e('Package: GeoDirectory price packages items.', 'invoicing'); ?></p>
         <?php
     }
 }
-add_action( 'wpinv_item_info_metabox_after', 'wpinv_gdp_package_type_info', 10, 1 ) ;
+add_action('wpinv_item_info_metabox_after', 'wpinv_gdp_package_type_info', 10, 1);
 
-function wpinv_gdp_to_gdi_set_zero_tax( $is_taxable, $item_id, $country , $state ) {
+function wpinv_gdp_to_gdi_set_zero_tax($is_taxable, $item_id, $country, $state) {
     global $wpi_zero_tax;
 
-    if ( $wpi_zero_tax ) {
+    if ($wpi_zero_tax) {
         $is_taxable = false;
     }
 
     return $is_taxable;
 }
-add_action( 'wpinv_item_is_taxable', 'wpinv_gdp_to_gdi_set_zero_tax', 10, 4 ) ;
+add_action('wpinv_item_is_taxable', 'wpinv_gdp_to_gdi_set_zero_tax', 10, 4);
 
 function wpinv_tool_merge_fix_taxes() {
     global $wpdb;
     
 	$sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
-	$items = $wpdb->get_results( $sql );
+	$items = $wpdb->get_results($sql);
 	
-	if ( !empty( $items ) ) {
-		foreach ( $items as $item ) {
-			if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
-				update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
+	if (!empty($items)) {
+		foreach ($items as $item) {
+			if (get_post_meta($item->ID, '_wpinv_vat_class', true) == '_exempt') {
+				update_post_meta($item->ID, '_wpinv_vat_class', '_standard');
 			}
 		}
 	}
 		
     $sql = "SELECT `p`.`ID`, gdi.id AS gdp_id FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NOT NULL AND p.post_status NOT IN( 'publish', 'wpi-processing', 'wpi-renewal' ) ORDER BY `gdi`.`id` ASC";
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
 	
-	if ( !empty( $items ) ) {
+	if (!empty($items)) {
 		$success = false;
-        $message = __( 'Taxes fixed for non-paid merged GD invoices.', 'invoicing' );
+        $message = __('Taxes fixed for non-paid merged GD invoices.', 'invoicing');
 		
 		global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
 		
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 			$wpi_tax_rates = NULL;               
 			$data = wpinv_get_invoice($item->ID);
 
-			if ( empty( $data ) ) {
+			if (empty($data)) {
 				continue;
 			}
 			
@@ -862,51 +862,51 @@ 
 			
 			$data_session                   = array();
 			$data_session['invoice_id']     = $data->ID;
-			$data_session['cart_discounts'] = $data->get_discounts( true );
+			$data_session['cart_discounts'] = $data->get_discounts(true);
 			
-			wpinv_set_checkout_session( $data_session );
+			wpinv_set_checkout_session($data_session);
 			
 			$wpi_userID         = (int)$data->get_user_id();
 			$_POST['country']   = !empty($data->country) ? $data->country : wpinv_get_default_country();
 				
-			$data->country      = sanitize_text_field( $_POST['country'] );
-			$data->set( 'country', sanitize_text_field( $_POST['country'] ) );
+			$data->country      = sanitize_text_field($_POST['country']);
+			$data->set('country', sanitize_text_field($_POST['country']));
 			
 			$wpinv_ip_address_country = $data->country;
 			
 			$data->recalculate_totals(true);
 			
-			wpinv_set_checkout_session( $checkout_session );
+			wpinv_set_checkout_session($checkout_session);
 			
 			$update_data = array();
 			$update_data['tax_amount'] = $data->get_tax();
 			$update_data['paied_amount'] = $data->get_total();
 			$update_data['invoice_id'] = $data->ID;
 			
-			$wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
+			$wpdb->update(INVOICE_TABLE, $update_data, array('id' => $item->gdp_id));
 		}
 	} else {
         $success = false;
-        $message = __( 'No invoices found to fix taxes!', 'invoicing' );
+        $message = __('No invoices found to fix taxes!', 'invoicing');
     }
 	
 	$response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_fix_taxes', 'wpinv_tool_merge_fix_taxes' );
-remove_action( 'geodir_before_detail_fields' , 'geodir_build_coupon', 2 );
+add_action('wpinv_tool_merge_fix_taxes', 'wpinv_tool_merge_fix_taxes');
+remove_action('geodir_before_detail_fields', 'geodir_build_coupon', 2);
 
-function wpinv_wpi_to_gdp_handle_subscription_cancel( $invoice_id, $invoice ) {
-    if ( wpinv_pm_active() && !empty( $invoice ) && $invoice->is_recurring() ) {
-        if ( $invoice->is_renewal() ) {
+function wpinv_wpi_to_gdp_handle_subscription_cancel($invoice_id, $invoice) {
+    if (wpinv_pm_active() && !empty($invoice) && $invoice->is_recurring()) {
+        if ($invoice->is_renewal()) {
             $invoice = $invoice->get_parent_payment();
         }
         
-        if ( !empty( $invoice ) ) {
-            wpinv_wpi_to_gdp_update_status( $invoice->ID, 'wpi-cancelled', $invoice->get_status() );
+        if (!empty($invoice)) {
+            wpinv_wpi_to_gdp_update_status($invoice->ID, 'wpi-cancelled', $invoice->get_status());
         }
     }
 }
-add_action( 'wpinv_subscription_cancelled', 'wpinv_wpi_to_gdp_handle_subscription_cancel', 10, 2 );
\ No newline at end of file
+add_action('wpinv_subscription_cancelled', 'wpinv_wpi_to_gdp_handle_subscription_cancel', 10, 2);
\ No newline at end of file

includes/wpinv-template-functions.php

Indentation +97 added lines, -97 removed lines

@@ -121,29 +121,29 @@ 
 
 function wpinv_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
     if ( ! empty( $args ) && is_array( $args ) ) {
-		extract( $args );
-	}
+        extract( $args );
+    }
 
-	$located = wpinv_locate_template( $template_name, $template_path, $default_path );
-	// Allow 3rd party plugin filter template file from their plugin.
-	$located = apply_filters( 'wpinv_get_template', $located, $template_name, $args, $template_path, $default_path );
+    $located = wpinv_locate_template( $template_name, $template_path, $default_path );
+    // Allow 3rd party plugin filter template file from their plugin.
+    $located = apply_filters( 'wpinv_get_template', $located, $template_name, $args, $template_path, $default_path );
 
-	if ( ! file_exists( $located ) ) {
+    if ( ! file_exists( $located ) ) {
         _doing_it_wrong( __FUNCTION__, sprintf( '<code>%s</code> does not exist.', $located ), '2.1' );
-		return;
-	}
+        return;
+    }
 
-	do_action( 'wpinv_before_template_part', $template_name, $template_path, $located, $args );
+    do_action( 'wpinv_before_template_part', $template_name, $template_path, $located, $args );
 
-	include( $located );
+    include( $located );
 
-	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
+    do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
 }
 
 function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-	ob_start();
-	wpinv_get_template( $template_name, $args, $template_path, $default_path );
-	return ob_get_clean();
+    ob_start();
+    wpinv_get_template( $template_name, $args, $template_path, $default_path );
+    return ob_get_clean();
 }
 
 function wpinv_locate_template( $template_name, $template_path = '', $default_path = '' ) {
@@ -173,120 +173,120 @@ 
 }
 
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+    do_action( 'get_template_part_' . $slug, $slug, $name );
 
-	// Setup possible parts
-	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
-	$templates[] = $slug . '.php';
+    // Setup possible parts
+    $templates = array();
+    if ( isset( $name ) )
+        $templates[] = $slug . '-' . $name . '.php';
+    $templates[] = $slug . '.php';
 
-	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+    // Allow template parts to be filtered
+    $templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
 
-	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+    // Return the part that is found
+    return wpinv_locate_tmpl( $templates, $load, false );
 }
 
 function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
-	// No file found yet
-	$located = false;
+    // No file found yet
+    $located = false;
 
-	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+    // Try to find a template file
+    foreach ( (array)$template_names as $template_name ) {
 
-		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+        // Continue if template is empty
+        if ( empty( $template_name ) )
+            continue;
 
-		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+        // Trim off any slashes from the template name
+        $template_name = ltrim( $template_name, '/' );
 
-		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+        // try locating this template file by looping through the template paths
+        foreach( wpinv_get_theme_template_paths() as $template_path ) {
 
-			if( file_exists( $template_path . $template_name ) ) {
-				$located = $template_path . $template_name;
-				break;
-			}
-		}
+            if( file_exists( $template_path . $template_name ) ) {
+                $located = $template_path . $template_name;
+                break;
+            }
+        }
 
-		if( !empty( $located ) ) {
-			break;
-		}
-	}
+        if( !empty( $located ) ) {
+            break;
+        }
+    }
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+    if ( ( true == $load ) && ! empty( $located ) )
+        load_template( $located, $require_once );
 
-	return $located;
+    return $located;
 }
 
 function wpinv_get_theme_template_paths() {
-	$template_dir = wpinv_get_theme_template_dir_name();
+    $template_dir = wpinv_get_theme_template_dir_name();
 
-	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
-		100 => wpinv_get_templates_dir()
-	);
+    $file_paths = array(
+        1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
+        10 => trailingslashit( get_template_directory() ) . $template_dir,
+        100 => wpinv_get_templates_dir()
+    );
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+    $file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
 
-	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+    // sort the file paths based on priority
+    ksort( $file_paths, SORT_NUMERIC );
 
-	return array_map( 'trailingslashit', $file_paths );
+    return array_map( 'trailingslashit', $file_paths );
 }
 
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'wpinv_templates' ) );
+    return trailingslashit( apply_filters( 'wpinv_templates_dir', 'wpinv_templates' ) );
 }
 
 function wpinv_checkout_meta_tags() {
 
-	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
+    $pages   = array();
+    $pages[] = wpinv_get_option( 'success_page' );
+    $pages[] = wpinv_get_option( 'failure_page' );
+    $pages[] = wpinv_get_option( 'invoice_history_page' );
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
-		return;
-	}
+    if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+        return;
+    }
 
-	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
+    echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
 add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
 
 function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+    $classes = (array)$class;
 
-	if( wpinv_is_checkout() ) {
-		$classes[] = 'wpinv-checkout';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_checkout() ) {
+        $classes[] = 'wpinv-checkout';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_success_page() ) {
-		$classes[] = 'wpinv-success';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_success_page() ) {
+        $classes[] = 'wpinv-success';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_failed_transaction_page() ) {
-		$classes[] = 'wpinv-failed-transaction';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_failed_transaction_page() ) {
+        $classes[] = 'wpinv-failed-transaction';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_invoice_history_page() ) {
-		$classes[] = 'wpinv-history';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_invoice_history_page() ) {
+        $classes[] = 'wpinv-history';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_test_mode() ) {
-		$classes[] = 'wpinv-test-mode';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_test_mode() ) {
+        $classes[] = 'wpinv-test-mode';
+        $classes[] = 'wpinv-page';
+    }
 
-	return array_unique( $classes );
+    return array_unique( $classes );
 }
 add_filter( 'body_class', 'wpinv_add_body_classes' );
 
@@ -1451,7 +1451,7 @@ 
 add_action( 'wpinv_checkout_cart', 'wpinv_checkout_cart', 10 );
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+    return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
 }
 
 /**
@@ -1461,7 +1461,7 @@ 
  * @return void
  */
 function wpinv_empty_checkout_cart() {
-	echo wpinv_empty_cart_message();
+    echo wpinv_empty_cart_message();
 }
 add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
 
@@ -1598,11 +1598,11 @@ 
                     do_action( 'wpinv_payment_mode_before_gateways' );
                     
                     if(!empty($gateways)){
-	                    foreach ( $gateways as $gateway_id => $gateway ) {
-		                    $checked = checked( $gateway_id, $chosen_gateway, false );
-		                    $button_label = wpinv_get_gateway_button_label( $gateway_id );
-		                    $description = wpinv_get_gateway_description( $gateway_id );
-		                    ?>
+                        foreach ( $gateways as $gateway_id => $gateway ) {
+                            $checked = checked( $gateway_id, $chosen_gateway, false );
+                            $button_label = wpinv_get_gateway_button_label( $gateway_id );
+                            $description = wpinv_get_gateway_description( $gateway_id );
+                            ?>
 		                    <div class="list-group-item">
 			                    <div class="radio">
 				                    <label><input type="radio" data-button-text="<?php echo esc_attr( $button_label );?>" value="<?php echo esc_attr( $gateway_id ) ;?>" <?php echo $checked ;?> id="wpi_gateway_<?php echo esc_attr( $gateway_id );?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html( $gateway['checkout_label'] ); ?></label>
@@ -1615,9 +1615,9 @@ 
 			                    </div>
 		                    </div>
 		                    <?php
-	                    }
+                        }
                     }else{
-	                    echo '<div class="alert alert-warning">'. __('No payment gateway active','invoicing') .'</div>';
+                        echo '<div class="alert alert-warning">'. __('No payment gateway active','invoicing') .'</div>';
                     }
 
                     do_action( 'wpinv_payment_mode_after_gateways' );

Doc Comments +9 added lines

@@ -140,6 +140,9 @@ 
 	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
 }
 
+/**
+ * @param string $template_name
+ */
 function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
 	ob_start();
 	wpinv_get_template( $template_name, $args, $template_path, $default_path );
@@ -172,6 +175,9 @@ 
     return apply_filters( 'wpinv_locate_template', $template, $template_name, $template_path );
 }
 
+/**
+ * @param string $slug
+ */
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
 	do_action( 'get_template_part_' . $slug, $slug, $name );
 
@@ -871,6 +877,9 @@ 
     return apply_filters( 'wpinv_get_watermark', $output, $id );
 }
 
+/**
+ * @param integer $id
+ */
 function wpinv_get_watermark( $id ) {
     if ( !$id > 0 ) {
         return NULL;

Braces +26 added lines, -17 removed lines

@@ -169,8 +169,9 @@ 
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
+	if ( isset( $name ) ) {
+			$templates[] = $slug . '-' . $name . '.php';
+	}
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
@@ -188,8 +189,9 @@ 
 	foreach ( (array)$template_names as $template_name ) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+		if ( empty( $template_name ) ) {
+					continue;
+		}
 
 		// Trim off any slashes from the template name
 		$template_name = ltrim( $template_name, '/' );
@@ -208,8 +210,9 @@ 
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ( ( true == $load ) && ! empty( $located ) ) {
+			load_template( $located, $require_once );
+	}
 
 	return $located;
 }
@@ -285,8 +288,9 @@ 
 function wpinv_html_dropdown( $name = 'wpinv_discounts', $selected = 0, $status = '' ) {
     $args = array( 'nopaging' => true );
 
-    if ( ! empty( $status ) )
-        $args['post_status'] = $status;
+    if ( ! empty( $status ) ) {
+            $args['post_status'] = $status;
+    }
 
     $discounts = wpinv_get_discounts( $args );
     $options   = array();
@@ -893,8 +897,11 @@ 
     
     $invoice_status = wpinv_get_invoice_status( $invoice_id );
     
-    if($invoice->post_type == 'wpi_invoice') $type = 'Invoice';
-    elseif($invoice->post_type == 'wpi_quote') $type = 'Quote';
+    if($invoice->post_type == 'wpi_invoice') {
+        $type = 'Invoice';
+    } elseif($invoice->post_type == 'wpi_quote') {
+        $type = 'Quote';
+    }
     ?>
     <table class="table table-bordered table-sm">
         <?php if ( $invoice_number = wpinv_get_invoice_number( $invoice_id ) ) { ?>
@@ -1461,17 +1468,19 @@ 
 add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
 
 function wpinv_save_cart_button() {
-    if ( wpinv_is_cart_saving_disabled() )
-        return;
-?>
+    if ( wpinv_is_cart_saving_disabled() ) {
+            return;
+    }
+    ?>
     <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url( add_query_arg( 'wpi_action', 'save_cart' ) ); ?>"><?php _e( 'Save Cart', 'invoicing' ); ?></a>
 <?php
 }
 
 function wpinv_update_cart_button() {
-    if ( !wpinv_item_quantities_enabled() )
-        return;
-?>
+    if ( !wpinv_item_quantities_enabled() ) {
+            return;
+    }
+    ?>
     <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e( 'Update Cart', 'invoicing' ); ?>"/>
     <input type="hidden" name="wpi_action" value="update_cart"/>
 <?php
@@ -1612,7 +1621,7 @@ 
 		                    </div>
 		                    <?php
 	                    }
-                    }else{
+                    } else{
 	                    echo '<div class="alert alert-warning">'. __('No payment gateway active','invoicing') .'</div>';
                     }
 

Spacing +696 added lines, -696 removed lines

@@ -7,101 +7,101 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-if ( !is_admin() ) {
-    add_filter( 'template_include', 'wpinv_template', 10, 1 );
-    add_action( 'wpinv_invoice_print_body_start', 'wpinv_display_invoice_top_bar' );
-    add_action( 'wpinv_invoice_top_bar_left', 'wpinv_invoice_display_left_actions' );
-    add_action( 'wpinv_invoice_top_bar_right', 'wpinv_invoice_display_right_actions' );
+if (!is_admin()) {
+    add_filter('template_include', 'wpinv_template', 10, 1);
+    add_action('wpinv_invoice_print_body_start', 'wpinv_display_invoice_top_bar');
+    add_action('wpinv_invoice_top_bar_left', 'wpinv_invoice_display_left_actions');
+    add_action('wpinv_invoice_top_bar_right', 'wpinv_invoice_display_right_actions');
 }
 
 function wpinv_template_path() {
-    return apply_filters( 'wpinv_template_path', 'invoicing/' );
+    return apply_filters('wpinv_template_path', 'invoicing/');
 }
 
-function wpinv_post_class( $classes, $class, $post_id ) {
+function wpinv_post_class($classes, $class, $post_id) {
     global $pagenow, $typenow;
 
-    if ( $pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type( $post_id ) == $typenow && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' ) {
+    if ($pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type($post_id) == $typenow && get_post_meta($post_id, '_wpinv_type', true) == 'package') {
         $classes[] = 'wpi-gd-package';
     }
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_post_class', 10, 3 );
+add_filter('post_class', 'wpinv_post_class', 10, 3);
 
-function wpinv_display_invoice_top_bar( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_display_invoice_top_bar($invoice) {
+    if (empty($invoice)) {
         return;
     }
     ?>
     <div class="row wpinv-top-bar no-print">
         <div class="container">
             <div class="col-xs-6">
-                <?php do_action( 'wpinv_invoice_top_bar_left', $invoice );?>
+                <?php do_action('wpinv_invoice_top_bar_left', $invoice); ?>
             </div>
             <div class="col-xs-6 text-right">
-                <?php do_action( 'wpinv_invoice_top_bar_right', $invoice );?>
+                <?php do_action('wpinv_invoice_top_bar_right', $invoice); ?>
             </div>
         </div>
     </div>
     <?php
 }
 
-function wpinv_invoice_display_left_actions( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_display_left_actions($invoice) {
+    if (empty($invoice)) {
         return; // Exit if invoice is not set.
     }
     
-    if ( $invoice->post_type == 'wpi_invoice' ) {
-        if ( $invoice->needs_payment() ) {
-            ?> <a class="btn btn-success btn-sm" title="<?php esc_attr_e( 'Pay This Invoice', 'invoicing' ); ?>" href="<?php echo esc_url( $invoice->get_checkout_payment_url() ); ?>"><?php _e( 'Pay For Invoice', 'invoicing' ); ?></a><?php
+    if ($invoice->post_type == 'wpi_invoice') {
+        if ($invoice->needs_payment()) {
+            ?> <a class="btn btn-success btn-sm" title="<?php esc_attr_e('Pay This Invoice', 'invoicing'); ?>" href="<?php echo esc_url($invoice->get_checkout_payment_url()); ?>"><?php _e('Pay For Invoice', 'invoicing'); ?></a><?php
         }
     }
     do_action('wpinv_invoice_display_left_actions', $invoice);
 }
 
-function wpinv_invoice_display_right_actions( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_display_right_actions($invoice) {
+    if (empty($invoice)) {
         return; // Exit if invoice is not set.
     }
 
-    if ( $invoice->post_type == 'wpi_invoice' ) { ?>
-        <a class="btn btn-primary btn-sm" onclick="window.print();" href="javascript:void(0)"><?php _e( 'Print Invoice', 'invoicing' ); ?></a>
-        <?php if ( is_user_logged_in() ) { ?>
-        &nbsp;&nbsp;<a class="btn btn-warning btn-sm" href="<?php echo esc_url( wpinv_get_history_page_uri() ); ?>"><?php _e( 'Invoice History', 'invoicing' ); ?></a>
+    if ($invoice->post_type == 'wpi_invoice') { ?>
+        <a class="btn btn-primary btn-sm" onclick="window.print();" href="javascript:void(0)"><?php _e('Print Invoice', 'invoicing'); ?></a>
+        <?php if (is_user_logged_in()) { ?>
+        &nbsp;&nbsp;<a class="btn btn-warning btn-sm" href="<?php echo esc_url(wpinv_get_history_page_uri()); ?>"><?php _e('Invoice History', 'invoicing'); ?></a>
         <?php }
     }
     do_action('wpinv_invoice_display_right_actions', $invoice);
 }
 
-function wpinv_before_invoice_content( $content ) {
+function wpinv_before_invoice_content($content) {
     global $post;
 
-    if ( !empty( $post ) && $post->post_type == 'wpi_invoice' && is_singular( 'wpi_invoice' ) && is_main_query() ) {
+    if (!empty($post) && $post->post_type == 'wpi_invoice' && is_singular('wpi_invoice') && is_main_query()) {
         ob_start();
-        do_action( 'wpinv_before_invoice_content', $post->ID );
+        do_action('wpinv_before_invoice_content', $post->ID);
         $content = ob_get_clean() . $content;
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_before_invoice_content' );
+add_filter('the_content', 'wpinv_before_invoice_content');
 
-function wpinv_after_invoice_content( $content ) {
+function wpinv_after_invoice_content($content) {
     global $post;
 
-    if ( !empty( $post ) && $post->post_type == 'wpi_invoice' && is_singular( 'wpi_invoice' ) && is_main_query() ) {
+    if (!empty($post) && $post->post_type == 'wpi_invoice' && is_singular('wpi_invoice') && is_main_query()) {
         ob_start();
-        do_action( 'wpinv_after_invoice_content', $post->ID );
+        do_action('wpinv_after_invoice_content', $post->ID);
         $content .= ob_get_clean();
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_after_invoice_content' );
+add_filter('the_content', 'wpinv_after_invoice_content');
 
 function wpinv_get_templates_dir() {
     return WPINV_PLUGIN_DIR . 'templates';
@@ -111,105 +111,105 @@ 
     return WPINV_PLUGIN_URL . 'templates';
 }
 
-function wpinv_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-    if ( ! empty( $args ) && is_array( $args ) ) {
-		extract( $args );
+function wpinv_get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
+    if (!empty($args) && is_array($args)) {
+		extract($args);
 	}
 
-	$located = wpinv_locate_template( $template_name, $template_path, $default_path );
+	$located = wpinv_locate_template($template_name, $template_path, $default_path);
 	// Allow 3rd party plugin filter template file from their plugin.
-	$located = apply_filters( 'wpinv_get_template', $located, $template_name, $args, $template_path, $default_path );
+	$located = apply_filters('wpinv_get_template', $located, $template_name, $args, $template_path, $default_path);
 
-	if ( ! file_exists( $located ) ) {
-        _doing_it_wrong( __FUNCTION__, sprintf( '<code>%s</code> does not exist.', $located ), '2.1' );
+	if (!file_exists($located)) {
+        _doing_it_wrong(__FUNCTION__, sprintf('<code>%s</code> does not exist.', $located), '2.1');
 		return;
 	}
 
-	do_action( 'wpinv_before_template_part', $template_name, $template_path, $located, $args );
+	do_action('wpinv_before_template_part', $template_name, $template_path, $located, $args);
 
-	include( $located );
+	include($located);
 
-	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
+	do_action('wpinv_after_template_part', $template_name, $template_path, $located, $args);
 }
 
-function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+function wpinv_get_template_html($template_name, $args = array(), $template_path = '', $default_path = '') {
 	ob_start();
-	wpinv_get_template( $template_name, $args, $template_path, $default_path );
+	wpinv_get_template($template_name, $args, $template_path, $default_path);
 	return ob_get_clean();
 }
 
-function wpinv_locate_template( $template_name, $template_path = '', $default_path = '' ) {
-    if ( ! $template_path ) {
+function wpinv_locate_template($template_name, $template_path = '', $default_path = '') {
+    if (!$template_path) {
         $template_path = wpinv_template_path();
     }
 
-    if ( ! $default_path ) {
+    if (!$default_path) {
         $default_path = WPINV_PLUGIN_DIR . 'templates/';
     }
 
     // Look within passed path within the theme - this is priority.
     $template = locate_template(
         array(
-            trailingslashit( $template_path ) . $template_name,
+            trailingslashit($template_path) . $template_name,
             $template_name
         )
     );
 
     // Get default templates/
-    if ( !$template && $default_path ) {
-        $template = trailingslashit( $default_path ) . $template_name;
+    if (!$template && $default_path) {
+        $template = trailingslashit($default_path) . $template_name;
     }
 
     // Return what we found.
-    return apply_filters( 'wpinv_locate_template', $template, $template_name, $template_path );
+    return apply_filters('wpinv_locate_template', $template, $template_name, $template_path);
 }
 
-function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+function wpinv_get_template_part($slug, $name = null, $load = true) {
+	do_action('get_template_part_' . $slug, $slug, $name);
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
+	if (isset($name))
 		$templates[] = $slug . '-' . $name . '.php';
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+	$templates = apply_filters('wpinv_get_template_part', $templates, $slug, $name);
 
 	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+	return wpinv_locate_tmpl($templates, $load, false);
 }
 
-function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
+function wpinv_locate_tmpl($template_names, $load = false, $require_once = true) {
 	// No file found yet
 	$located = false;
 
 	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+	foreach ((array)$template_names as $template_name) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
+		if (empty($template_name))
 			continue;
 
 		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+		$template_name = ltrim($template_name, '/');
 
 		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+		foreach (wpinv_get_theme_template_paths() as $template_path) {
 
-			if( file_exists( $template_path . $template_name ) ) {
+			if (file_exists($template_path . $template_name)) {
 				$located = $template_path . $template_name;
 				break;
 			}
 		}
 
-		if( !empty( $located ) ) {
+		if (!empty($located)) {
 			break;
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ((true == $load) && !empty($located))
+		load_template($located, $require_once);
 
 	return $located;
 }
@@ -218,143 +218,143 @@ 
 	$template_dir = wpinv_get_theme_template_dir_name();
 
 	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
+		1 => trailingslashit(get_stylesheet_directory()) . $template_dir,
+		10 => trailingslashit(get_template_directory()) . $template_dir,
 		100 => wpinv_get_templates_dir()
 	);
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+	$file_paths = apply_filters('wpinv_template_paths', $file_paths);
 
 	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+	ksort($file_paths, SORT_NUMERIC);
 
-	return array_map( 'trailingslashit', $file_paths );
+	return array_map('trailingslashit', $file_paths);
 }
 
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'wpinv_templates' ) );
+	return trailingslashit(apply_filters('wpinv_templates_dir', 'wpinv_templates'));
 }
 
 function wpinv_checkout_meta_tags() {
 
 	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
+	$pages[] = wpinv_get_option('success_page');
+	$pages[] = wpinv_get_option('failure_page');
+	$pages[] = wpinv_get_option('invoice_history_page');
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+	if (!wpinv_is_checkout() && !is_page($pages)) {
 		return;
 	}
 
 	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
-add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
+add_action('wp_head', 'wpinv_checkout_meta_tags');
 
-function wpinv_add_body_classes( $class ) {
+function wpinv_add_body_classes($class) {
 	$classes = (array)$class;
 
-	if( wpinv_is_checkout() ) {
+	if (wpinv_is_checkout()) {
 		$classes[] = 'wpinv-checkout';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_success_page() ) {
+	if (wpinv_is_success_page()) {
 		$classes[] = 'wpinv-success';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_failed_transaction_page() ) {
+	if (wpinv_is_failed_transaction_page()) {
 		$classes[] = 'wpinv-failed-transaction';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_invoice_history_page() ) {
+	if (wpinv_is_invoice_history_page()) {
 		$classes[] = 'wpinv-history';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_test_mode() ) {
+	if (wpinv_is_test_mode()) {
 		$classes[] = 'wpinv-test-mode';
 		$classes[] = 'wpinv-page';
 	}
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
-add_filter( 'body_class', 'wpinv_add_body_classes' );
+add_filter('body_class', 'wpinv_add_body_classes');
 
-function wpinv_html_dropdown( $name = 'wpinv_discounts', $selected = 0, $status = '' ) {
-    $args = array( 'nopaging' => true );
+function wpinv_html_dropdown($name = 'wpinv_discounts', $selected = 0, $status = '') {
+    $args = array('nopaging' => true);
 
-    if ( ! empty( $status ) )
+    if (!empty($status))
         $args['post_status'] = $status;
 
-    $discounts = wpinv_get_discounts( $args );
+    $discounts = wpinv_get_discounts($args);
     $options   = array();
 
-    if ( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $options[ absint( $discount->ID ) ] = esc_html( get_the_title( $discount->ID ) );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $options[absint($discount->ID)] = esc_html(get_the_title($discount->ID));
         }
     } else {
-        $options[0] = __( 'No discounts found', 'invoicing' );
+        $options[0] = __('No discounts found', 'invoicing');
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false,
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_year_dropdown( $name = 'year', $selected = 0, $years_before = 5, $years_after = 0 ) {
-    $current     = date( 'Y' );
-    $start_year  = $current - absint( $years_before );
-    $end_year    = $current + absint( $years_after );
-    $selected    = empty( $selected ) ? date( 'Y' ) : $selected;
+function wpinv_html_year_dropdown($name = 'year', $selected = 0, $years_before = 5, $years_after = 0) {
+    $current     = date('Y');
+    $start_year  = $current - absint($years_before);
+    $end_year    = $current + absint($years_after);
+    $selected    = empty($selected) ? date('Y') : $selected;
     $options     = array();
 
-    while ( $start_year <= $end_year ) {
-        $options[ absint( $start_year ) ] = $start_year;
+    while ($start_year <= $end_year) {
+        $options[absint($start_year)] = $start_year;
         $start_year++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_month_dropdown( $name = 'month', $selected = 0 ) {
+function wpinv_html_month_dropdown($name = 'month', $selected = 0) {
     $month   = 1;
     $options = array();
-    $selected = empty( $selected ) ? date( 'n' ) : $selected;
+    $selected = empty($selected) ? date('n') : $selected;
 
-    while ( $month <= 12 ) {
-        $options[ absint( $month ) ] = wpinv_month_num_to_name( $month );
+    while ($month <= 12) {
+        $options[absint($month)] = wpinv_month_num_to_name($month);
         $month++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_select( $args = array() ) {
+function wpinv_html_select($args = array()) {
     $defaults = array(
         'options'          => array(),
         'name'             => null,
@@ -364,8 +364,8 @@ 
         'chosen'           => false,
         'placeholder'      => null,
         'multiple'         => false,
-        'show_option_all'  => _x( 'All', 'all dropdown items', 'invoicing' ),
-        'show_option_none' => _x( 'None', 'no dropdown items', 'invoicing' ),
+        'show_option_all'  => _x('All', 'all dropdown items', 'invoicing'),
+        'show_option_none' => _x('None', 'no dropdown items', 'invoicing'),
         'data'             => array(),
         'onchange'         => null,
         'required'         => false,
@@ -373,78 +373,78 @@ 
         'readonly'         => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $data_elements = '';
-    foreach ( $args['data'] as $key => $value ) {
-        $data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+    foreach ($args['data'] as $key => $value) {
+        $data_elements .= ' data-' . esc_attr($key) . '="' . esc_attr($value) . '"';
     }
 
-    if( $args['multiple'] ) {
+    if ($args['multiple']) {
         $multiple = ' MULTIPLE';
     } else {
         $multiple = '';
     }
 
-    if( $args['chosen'] ) {
+    if ($args['chosen']) {
         $args['class'] .= ' wpinv-select-chosen';
     }
 
-    if( $args['placeholder'] ) {
+    if ($args['placeholder']) {
         $placeholder = $args['placeholder'];
     } else {
         $placeholder = '';
     }
     
     $options = '';
-    if( !empty( $args['onchange'] ) ) {
-        $options .= ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $options .= ' onchange="' . esc_attr($args['onchange']) . '"';
     }
     
-    if( !empty( $args['required'] ) ) {
+    if (!empty($args['required'])) {
         $options .= ' required="required"';
     }
     
-    if( !empty( $args['disabled'] ) ) {
+    if (!empty($args['disabled'])) {
         $options .= ' disabled';
     }
     
-    if( !empty( $args['readonly'] ) ) {
+    if (!empty($args['readonly'])) {
         $options .= ' readonly';
     }
 
-    $class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-    $output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim( $options ) . $data_elements . '>';
+    $class  = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
+    $output = '<select name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim($options) . $data_elements . '>';
 
-    if ( $args['show_option_all'] ) {
-        if( $args['multiple'] ) {
-            $selected = selected( true, in_array( 0, $args['selected'] ), false );
+    if ($args['show_option_all']) {
+        if ($args['multiple']) {
+            $selected = selected(true, in_array(0, $args['selected']), false);
         } else {
-            $selected = selected( $args['selected'], 0, false );
+            $selected = selected($args['selected'], 0, false);
         }
-        $output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+        $output .= '<option value="all"' . $selected . '>' . esc_html($args['show_option_all']) . '</option>';
     }
 
-    if ( !empty( $args['options'] ) ) {
+    if (!empty($args['options'])) {
 
-        if ( $args['show_option_none'] ) {
-            if( $args['multiple'] ) {
-                $selected = selected( true, in_array( "", $args['selected'] ), false );
+        if ($args['show_option_none']) {
+            if ($args['multiple']) {
+                $selected = selected(true, in_array("", $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'] === "", true, false );
+                $selected = selected($args['selected'] === "", true, false);
             }
-            $output .= '<option value=""' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+            $output .= '<option value=""' . $selected . '>' . esc_html($args['show_option_none']) . '</option>';
         }
 
-        foreach( $args['options'] as $key => $option ) {
+        foreach ($args['options'] as $key => $option) {
 
-            if( $args['multiple'] && is_array( $args['selected'] ) ) {
-                $selected = selected( true, (bool)in_array( $key, $args['selected'] ), false );
+            if ($args['multiple'] && is_array($args['selected'])) {
+                $selected = selected(true, (bool)in_array($key, $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'], $key, false );
+                $selected = selected($args['selected'], $key, false);
             }
 
-            $output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+            $output .= '<option value="' . esc_attr($key) . '"' . $selected . '>' . esc_html($option) . '</option>';
         }
     }
 
@@ -453,7 +453,7 @@ 
     return $output;
 }
 
-function wpinv_item_dropdown( $args = array() ) {
+function wpinv_item_dropdown($args = array()) {
     $defaults = array(
         'name'              => 'wpi_item',
         'id'                => 'wpi_item',
@@ -462,15 +462,15 @@ 
         'selected'          => 0,
         'chosen'            => false,
         'number'            => 100,
-        'placeholder'       => __( 'Choose a item', 'invoicing' ),
-        'data'              => array( 'search-type' => 'item' ),
+        'placeholder'       => __('Choose a item', 'invoicing'),
+        'data'              => array('search-type' => 'item'),
         'show_option_all'   => false,
         'show_option_none'  => false,
         'with_packages'     => true,
         'show_recurring'    => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $item_args = array(
         'post_type'      => 'wpi_item',
@@ -479,7 +479,7 @@ 
         'posts_per_page' => $args['number']
     );
     
-    if ( !$args['with_packages'] ) {
+    if (!$args['with_packages']) {
         $item_args['meta_query'] = array(
             array(
                 'key'       => '_wpinv_type',
@@ -489,42 +489,42 @@ 
         );
     }
 
-    $items      = get_posts( $item_args );
+    $items      = get_posts($item_args);
     $options    = array();
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            $title = esc_html( $item->post_title );
+    if ($items) {
+        foreach ($items as $item) {
+            $title = esc_html($item->post_title);
             
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $item->ID, false );
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($item->ID, false);
             }
             
-            $options[ absint( $item->ID ) ] = $title;
+            $options[absint($item->ID)] = $title;
         }
     }
 
     // This ensures that any selected items are included in the drop down
-    if( is_array( $args['selected'] ) ) {
-        foreach( $args['selected'] as $item ) {
-            if( ! in_array( $item, $options ) ) {
-                $title = get_the_title( $item );
-                if ( !empty( $args['show_recurring'] ) ) {
-                    $title .= wpinv_get_item_suffix( $item, false );
+    if (is_array($args['selected'])) {
+        foreach ($args['selected'] as $item) {
+            if (!in_array($item, $options)) {
+                $title = get_the_title($item);
+                if (!empty($args['show_recurring'])) {
+                    $title .= wpinv_get_item_suffix($item, false);
                 }
                 $options[$item] = $title;
             }
         }
-    } elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-        if ( ! in_array( $args['selected'], $options ) ) {
-            $title = get_the_title( $args['selected'] );
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $args['selected'], false );
+    } elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+        if (!in_array($args['selected'], $options)) {
+            $title = get_the_title($args['selected']);
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($args['selected'], false);
             }
-            $options[$args['selected']] = get_the_title( $args['selected'] );
+            $options[$args['selected']] = get_the_title($args['selected']);
         }
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $args['name'],
         'selected'         => $args['selected'],
         'id'               => $args['id'],
@@ -536,12 +536,12 @@ 
         'show_option_all'  => $args['show_option_all'],
         'show_option_none' => $args['show_option_none'],
         'data'             => $args['data'],
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_checkbox( $args = array() ) {
+function wpinv_html_checkbox($args = array()) {
     $defaults = array(
         'name'     => null,
         'current'  => null,
@@ -552,38 +552,38 @@ 
         )
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if ( ! empty( $args['options']['disabled'] ) ) {
+    if (!empty($args['options']['disabled'])) {
         $options .= ' disabled="disabled"';
-    } elseif ( ! empty( $args['options']['readonly'] ) ) {
+    } elseif (!empty($args['options']['readonly'])) {
         $options .= ' readonly';
     }
 
-    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $class . ' ' . esc_attr( $args['name'] ) . '" ' . checked( 1, $args['current'], false ) . ' />';
+    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['name']) . '" class="' . $class . ' ' . esc_attr($args['name']) . '" ' . checked(1, $args['current'], false) . ' />';
 
     return $output;
 }
 
-function wpinv_html_text( $args = array() ) {
+function wpinv_html_text($args = array()) {
     // Backwards compatibility
-    if ( func_num_args() > 1 ) {
+    if (func_num_args() > 1) {
         $args = func_get_args();
 
         $name  = $args[0];
-        $value = isset( $args[1] ) ? $args[1] : '';
-        $label = isset( $args[2] ) ? $args[2] : '';
-        $desc  = isset( $args[3] ) ? $args[3] : '';
+        $value = isset($args[1]) ? $args[1] : '';
+        $label = isset($args[2]) ? $args[2] : '';
+        $desc  = isset($args[3]) ? $args[3] : '';
     }
 
     $defaults = array(
         'id'           => '',
-        'name'         => isset( $name )  ? $name  : 'text',
-        'value'        => isset( $value ) ? $value : null,
-        'label'        => isset( $label ) ? $label : null,
-        'desc'         => isset( $desc )  ? $desc  : null,
+        'name'         => isset($name) ? $name : 'text',
+        'value'        => isset($value) ? $value : null,
+        'label'        => isset($label) ? $label : null,
+        'desc'         => isset($desc) ? $desc : null,
         'placeholder'  => '',
         'class'        => 'regular-text',
         'disabled'     => false,
@@ -593,51 +593,51 @@ 
         'data'         => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if( $args['required'] ) {
+    if ($args['required']) {
         $options .= ' required="required"';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
 
     $data = '';
-    if ( !empty( $args['data'] ) ) {
-        foreach ( $args['data'] as $key => $value ) {
-            $data .= 'data-' . wpinv_sanitize_key( $key ) . '="' . esc_attr( $value ) . '" ';
+    if (!empty($args['data'])) {
+        foreach ($args['data'] as $key => $value) {
+            $data .= 'data-' . wpinv_sanitize_key($key) . '="' . esc_attr($value) . '" ';
         }
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['id'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['id']) . '">' . esc_html($args['label']) . '</label>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
 
-    $output .= '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] )  . '" autocomplete="' . esc_attr( $args['autocomplete'] )  . '" value="' . esc_attr( $args['value'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="' . $class . '" ' . $data . ' ' . trim( $options ) . '/>';
+    $output .= '<input type="text" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" autocomplete="' . esc_attr($args['autocomplete']) . '" value="' . esc_attr($args['value']) . '" placeholder="' . esc_attr($args['placeholder']) . '" class="' . $class . '" ' . $data . ' ' . trim($options) . '/>';
 
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_date_field( $args = array() ) {
-    if( empty( $args['class'] ) ) {
+function wpinv_html_date_field($args = array()) {
+    if (empty($args['class'])) {
         $args['class'] = 'wpiDatepicker';
-    } elseif( ! strpos( $args['class'], 'wpiDatepicker' ) ) {
+    } elseif (!strpos($args['class'], 'wpiDatepicker')) {
         $args['class'] .= ' wpiDatepicker';
     }
 
-    return wpinv_html_text( $args );
+    return wpinv_html_text($args);
 }
 
-function wpinv_html_textarea( $args = array() ) {
+function wpinv_html_textarea($args = array()) {
     $defaults = array(
         'name'        => 'textarea',
         'value'       => null,
@@ -647,31 +647,31 @@ 
         'disabled'    => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $disabled = '';
-    if( $args['disabled'] ) {
+    if ($args['disabled']) {
         $disabled = ' disabled="disabled"';
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    $output .= '<textarea name="' . esc_attr( $args['name'] ) . '" id="' . wpinv_sanitize_key( $args['name'] ) . '" class="' . $class . '"' . $disabled . '>' . esc_attr( $args['value'] ) . '</textarea>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['name']) . '">' . esc_html($args['label']) . '</label>';
+    $output .= '<textarea name="' . esc_attr($args['name']) . '" id="' . wpinv_sanitize_key($args['name']) . '" class="' . $class . '"' . $disabled . '>' . esc_attr($args['value']) . '</textarea>';
 
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_ajax_user_search( $args = array() ) {
+function wpinv_html_ajax_user_search($args = array()) {
     $defaults = array(
         'name'        => 'user_id',
         'value'       => null,
-        'placeholder' => __( 'Enter username', 'invoicing' ),
+        'placeholder' => __('Enter username', 'invoicing'),
         'label'       => null,
         'desc'        => null,
         'class'       => '',
@@ -680,13 +680,13 @@ 
         'data'        => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $args['class'] = 'wpinv-ajax-user-search ' . $args['class'];
 
     $output  = '<span class="wpinv_user_search_wrap">';
-        $output .= wpinv_html_text( $args );
-        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __( 'Cancel', 'invoicing' ) . '" aria-label="' . __( 'Cancel', 'invoicing' ) . '" href="#">x</a><span></span></span>';
+        $output .= wpinv_html_text($args);
+        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __('Cancel', 'invoicing') . '" aria-label="' . __('Cancel', 'invoicing') . '" href="#">x</a><span></span></span>';
     $output .= '</span>';
 
     return $output;
@@ -695,7 +695,7 @@ 
 function wpinv_ip_geolocation() {
     global $wpinv_euvat;
     
-    $ip         = !empty( $_GET['ip'] ) ? sanitize_text_field( $_GET['ip'] ) : '';    
+    $ip         = !empty($_GET['ip']) ? sanitize_text_field($_GET['ip']) : '';    
     $content    = '';
     $iso        = '';
     $country    = '';
@@ -706,69 +706,69 @@ 
     $credit     = '';
     $address    = '';
     
-    if ( wpinv_get_option( 'vat_ip_lookup' ) == 'geoip2' && $geoip2_city = $wpinv_euvat->geoip2_city_record( $ip ) ) {
+    if (wpinv_get_option('vat_ip_lookup') == 'geoip2' && $geoip2_city = $wpinv_euvat->geoip2_city_record($ip)) {
         try {
             $iso        = $geoip2_city->country->isoCode;
             $country    = $geoip2_city->country->name;
-            $region     = !empty( $geoip2_city->subdivisions ) && !empty( $geoip2_city->subdivisions[0]->name ) ? $geoip2_city->subdivisions[0]->name : '';
+            $region     = !empty($geoip2_city->subdivisions) && !empty($geoip2_city->subdivisions[0]->name) ? $geoip2_city->subdivisions[0]->name : '';
             $city       = $geoip2_city->city->name;
             $longitude  = $geoip2_city->location->longitude;
             $latitude   = $geoip2_city->location->latitude;
-            $credit     = __( 'Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing' );
-        } catch( Exception $e ) { }
+            $credit     = __('Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing');
+        } catch (Exception $e) { }
     }
     
-    if ( !( $iso && $longitude && $latitude ) && function_exists( 'simplexml_load_file' ) ) {
+    if (!($iso && $longitude && $latitude) && function_exists('simplexml_load_file')) {
         try {
-            $load_xml = simplexml_load_file( 'http://www.geoplugin.net/xml.gp?ip=' . $ip );
+            $load_xml = simplexml_load_file('http://www.geoplugin.net/xml.gp?ip=' . $ip);
             
-            if ( !empty( $load_xml ) && isset( $load_xml->geoplugin_countryCode ) && !empty( $load_xml->geoplugin_latitude ) && !empty( $load_xml->geoplugin_longitude ) ) {
+            if (!empty($load_xml) && isset($load_xml->geoplugin_countryCode) && !empty($load_xml->geoplugin_latitude) && !empty($load_xml->geoplugin_longitude)) {
                 $iso        = $load_xml->geoplugin_countryCode;
                 $country    = $load_xml->geoplugin_countryName;
-                $region     = !empty( $load_xml->geoplugin_regionName ) ? $load_xml->geoplugin_regionName : '';
-                $city       = !empty( $load_xml->geoplugin_city ) ? $load_xml->geoplugin_city : '';
+                $region     = !empty($load_xml->geoplugin_regionName) ? $load_xml->geoplugin_regionName : '';
+                $city       = !empty($load_xml->geoplugin_city) ? $load_xml->geoplugin_city : '';
                 $longitude  = $load_xml->geoplugin_longitude;
                 $latitude   = $load_xml->geoplugin_latitude;
                 $credit     = $load_xml->geoplugin_credit;
-                $credit     = __( 'Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing' ) . '<br>' . $load_xml->geoplugin_credit;
+                $credit     = __('Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing') . '<br>' . $load_xml->geoplugin_credit;
             }
-        } catch( Exception $e ) { }
+        } catch (Exception $e) { }
     }
     
-    if ( $iso && $longitude && $latitude ) {
-        if ( $city ) {
+    if ($iso && $longitude && $latitude) {
+        if ($city) {
             $address .= $city . ', ';
         }
         
-        if ( $region ) {
+        if ($region) {
             $address .= $region . ', ';
         }
         
         $address .= $country . ' (' . $iso . ')';
-        $content = '<p>'. sprintf( __( '<b>Address:</b> %s', 'invoicing' ), $address ) . '</p>';
-        $content .= '<p>'. $credit . '</p>';
+        $content = '<p>' . sprintf(__('<b>Address:</b> %s', 'invoicing'), $address) . '</p>';
+        $content .= '<p>' . $credit . '</p>';
     } else {
-        $content = '<p>'. sprintf( __( 'Unable to find geolocation for the IP address: %s', 'invoicing' ), $ip ) . '</p>';
+        $content = '<p>' . sprintf(__('Unable to find geolocation for the IP address: %s', 'invoicing'), $ip) . '</p>';
     }
     ?>
 <!DOCTYPE html>
-<html><head><title><?php echo sprintf( __( 'IP: %s', 'invoicing' ), $ip );?></title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.css" /><style>html,body{height:100%;margin:0;padding:0;width:100%}body{text-align:center;background:#fff;color:#222;font-size:small;}body,p{font-family: arial,sans-serif}#map{margin:auto;width:100%;height:calc(100% - 120px);min-height:240px}</style></head>
+<html><head><title><?php echo sprintf(__('IP: %s', 'invoicing'), $ip); ?></title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.css" /><style>html,body{height:100%;margin:0;padding:0;width:100%}body{text-align:center;background:#fff;color:#222;font-size:small;}body,p{font-family: arial,sans-serif}#map{margin:auto;width:100%;height:calc(100% - 120px);min-height:240px}</style></head>
 <body>
-    <?php if ( $latitude && $latitude ) { ?>
+    <?php if ($latitude && $latitude) { ?>
     <div id="map"></div>
         <script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.js"></script>
         <script type="text/javascript">
         var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
             osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
             osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
-            latlng = new L.LatLng(<?php echo $latitude;?>, <?php echo $longitude;?>);
+            latlng = new L.LatLng(<?php echo $latitude; ?>, <?php echo $longitude; ?>);
 
         var map = new L.Map('map', {center: latlng, zoom: 12, layers: [osm]});
 
         var marker = new L.Marker(latlng);
         map.addLayer(marker);
 
-        marker.bindPopup("<p><?php esc_attr_e( $address );?></p>");
+        marker.bindPopup("<p><?php esc_attr_e($address); ?></p>");
     </script>
     <?php } ?>
     <div style="height:100px"><?php echo $content; ?></div>
@@ -776,18 +776,18 @@ 
 <?php
     exit;
 }
-add_action( 'wp_ajax_wpinv_ip_geolocation', 'wpinv_ip_geolocation' );
-add_action( 'wp_ajax_nopriv_wpinv_ip_geolocation', 'wpinv_ip_geolocation' );
+add_action('wp_ajax_wpinv_ip_geolocation', 'wpinv_ip_geolocation');
+add_action('wp_ajax_nopriv_wpinv_ip_geolocation', 'wpinv_ip_geolocation');
 
 // Set up the template for the invoice.
-function wpinv_template( $template ) {
+function wpinv_template($template) {
     global $post, $wp_query;
     
-    if ( ( is_single() || is_404() ) && !empty( $post->ID ) && (get_post_type( $post->ID ) == 'wpi_invoice' or get_post_type( $post->ID ) == 'wpi_quote')) {
-        if ( wpinv_user_can_view_invoice( $post->ID ) ) {
-            $template = wpinv_get_template_part( 'wpinv-invoice-print', false, false );
+    if ((is_single() || is_404()) && !empty($post->ID) && (get_post_type($post->ID) == 'wpi_invoice' or get_post_type($post->ID) == 'wpi_quote')) {
+        if (wpinv_user_can_view_invoice($post->ID)) {
+            $template = wpinv_get_template_part('wpinv-invoice-print', false, false);
         } else {
-            $template = wpinv_get_template_part( 'wpinv-invalid-access', false, false );
+            $template = wpinv_get_template_part('wpinv-invalid-access', false, false);
         }
     }
 
@@ -796,7 +796,7 @@ 
 
 function wpinv_get_business_address() {
     $business_address   = wpinv_store_address();
-    $business_address   = !empty( $business_address ) ? wpautop( wp_kses_post( $business_address ) ) : '';
+    $business_address   = !empty($business_address) ? wpautop(wp_kses_post($business_address)) : '';
     
     /*
     $default_country    = wpinv_get_default_country();
@@ -820,7 +820,7 @@ 
     
     $business_address = $business_address ? '<div class="address">' . $business_address . '</div>' : '';
     
-    return apply_filters( 'wpinv_get_business_address', $business_address );
+    return apply_filters('wpinv_get_business_address', $business_address);
 }
 
 function wpinv_display_from_address() {
@@ -830,188 +830,188 @@ 
     if (empty($from_name)) {
         $from_name = wpinv_get_business_name();
     }
-    ?><div class="from col-xs-2"><strong><?php _e( 'From:', 'invoicing' ) ?></strong></div>
+    ?><div class="from col-xs-2"><strong><?php _e('From:', 'invoicing') ?></strong></div>
     <div class="wrapper col-xs-10">
-        <div class="name"><?php echo esc_html( $from_name ); ?></div>
-        <?php if ( $address = wpinv_get_business_address() ) { ?>
-        <div class="address"><?php echo wpautop( wp_kses_post( $address ) );?></div>
+        <div class="name"><?php echo esc_html($from_name); ?></div>
+        <?php if ($address = wpinv_get_business_address()) { ?>
+        <div class="address"><?php echo wpautop(wp_kses_post($address)); ?></div>
         <?php } ?>
-        <?php if ( $email_from = wpinv_mail_get_from_address() ) { ?>
-        <div class="email_from"><?php echo wp_sprintf( __( 'Email: %s', 'invoicing' ), $email_from );?></div>
+        <?php if ($email_from = wpinv_mail_get_from_address()) { ?>
+        <div class="email_from"><?php echo wp_sprintf(__('Email: %s', 'invoicing'), $email_from); ?></div>
         <?php } ?>
     </div>
     <?php
 }
 
-function wpinv_watermark( $id = 0 ) {
-    $output = wpinv_get_watermark( $id );
+function wpinv_watermark($id = 0) {
+    $output = wpinv_get_watermark($id);
     
-    return apply_filters( 'wpinv_get_watermark', $output, $id );
+    return apply_filters('wpinv_get_watermark', $output, $id);
 }
 
-function wpinv_get_watermark( $id ) {
-    if ( !$id > 0 ) {
+function wpinv_get_watermark($id) {
+    if (!$id > 0) {
         return NULL;
     }
-    $invoice = wpinv_get_invoice( $id );
+    $invoice = wpinv_get_invoice($id);
     
-    if ( !empty( $invoice ) && "wpi_invoice" === $invoice->post_type ) {
-        if ( $invoice->is_paid() ) {
-            return __( 'Paid', 'invoicing' );
+    if (!empty($invoice) && "wpi_invoice" === $invoice->post_type) {
+        if ($invoice->is_paid()) {
+            return __('Paid', 'invoicing');
         }
-        if ( $invoice->is_refunded() ) {
-            return __( 'Refunded', 'invoicing' );
+        if ($invoice->is_refunded()) {
+            return __('Refunded', 'invoicing');
         }
-        if ( $invoice->has_status( array( 'wpi-cancelled' ) ) ) {
-            return __( 'Cancelled', 'invoicing' );
+        if ($invoice->has_status(array('wpi-cancelled'))) {
+            return __('Cancelled', 'invoicing');
         }
     }
     
     return NULL;
 }
 
-function wpinv_display_invoice_details( $invoice ) {
+function wpinv_display_invoice_details($invoice) {
     global $wpinv_euvat;
     
     $invoice_id = $invoice->ID;
     $vat_name   = $wpinv_euvat->get_vat_name();
     $use_taxes  = wpinv_use_taxes();
     
-    $invoice_status = wpinv_get_invoice_status( $invoice_id );
+    $invoice_status = wpinv_get_invoice_status($invoice_id);
     
-    if($invoice->post_type == 'wpi_invoice') $type = 'Invoice';
-    elseif($invoice->post_type == 'wpi_quote') $type = 'Quote';
+    if ($invoice->post_type == 'wpi_invoice') $type = 'Invoice';
+    elseif ($invoice->post_type == 'wpi_quote') $type = 'Quote';
     ?>
     <table class="table table-bordered table-sm">
-        <?php if ( $invoice_number = wpinv_get_invoice_number( $invoice_id ) ) { ?>
+        <?php if ($invoice_number = wpinv_get_invoice_number($invoice_id)) { ?>
             <tr class="wpi-row-number">
-                <th><?php echo sprintf(__( '%s Number', 'invoicing' ), $type); ?></th>
-                <td><?php echo esc_html( $invoice_number ); ?></td>
+                <th><?php echo sprintf(__('%s Number', 'invoicing'), $type); ?></th>
+                <td><?php echo esc_html($invoice_number); ?></td>
             </tr>
         <?php } ?>
         <tr class="wpi-row-status">
-            <th><?php echo wp_sprintf(__( '%s Status', 'invoicing' ), $type); ?></th>
-            <td><?php echo wpinv_invoice_status_label( $invoice_status, wpinv_get_invoice_status( $invoice_id, true ) ); ?></td>
+            <th><?php echo wp_sprintf(__('%s Status', 'invoicing'), $type); ?></th>
+            <td><?php echo wpinv_invoice_status_label($invoice_status, wpinv_get_invoice_status($invoice_id, true)); ?></td>
         </tr>
-        <?php if ( $invoice->is_renewal() ) { ?>
+        <?php if ($invoice->is_renewal()) { ?>
         <tr class="wpi-row-parent">
-            <th><?php echo wp_sprintf(__( 'Parent %s', 'invoicing' ), $type); ?></th>
-            <td><?php echo wpinv_invoice_link( $invoice->parent_invoice ); ?></td>
+            <th><?php echo wp_sprintf(__('Parent %s', 'invoicing'), $type); ?></th>
+            <td><?php echo wpinv_invoice_link($invoice->parent_invoice); ?></td>
         </tr>
         <?php } ?>
         <tr class="wpi-row-gateway">
-            <th><?php _e( 'Payment Method', 'invoicing' ); ?></th>
-            <td><?php echo wpinv_get_payment_gateway_name( $invoice_id ); ?></td>
+            <th><?php _e('Payment Method', 'invoicing'); ?></th>
+            <td><?php echo wpinv_get_payment_gateway_name($invoice_id); ?></td>
         </tr>
-        <?php if ( $invoice_date = wpinv_get_invoice_date( $invoice_id ) ) { ?>
+        <?php if ($invoice_date = wpinv_get_invoice_date($invoice_id)) { ?>
             <tr class="wpi-row-date">
-                <th><?php echo wp_sprintf(__( '%s Date', 'invoicing' ), $type); ?></th>
+                <th><?php echo wp_sprintf(__('%s Date', 'invoicing'), $type); ?></th>
                 <td><?php echo $invoice_date; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && $invoice->needs_payment() && ( $due_date = $invoice->get_due_date( true ) ) ) { ?>
+        <?php if (wpinv_get_option('overdue_active') && $invoice->needs_payment() && ($due_date = $invoice->get_due_date(true))) { ?>
             <tr class="wpi-row-date">
-                <th><?php _e( 'Due Date', 'invoicing' ); ?></th>
+                <th><?php _e('Due Date', 'invoicing'); ?></th>
                 <td><?php echo $due_date; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $owner_vat_number = $wpinv_euvat->get_vat_number() ) { ?>
+        <?php if ($owner_vat_number = $wpinv_euvat->get_vat_number()) { ?>
             <tr class="wpi-row-ovatno">
-                <th><?php echo wp_sprintf( __( 'Owner %s Number', 'invoicing' ), $vat_name ); ?></th>
+                <th><?php echo wp_sprintf(__('Owner %s Number', 'invoicing'), $vat_name); ?></th>
                 <td><?php echo $owner_vat_number; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $use_taxes && $user_vat_number = wpinv_get_invoice_vat_number( $invoice_id ) ) { ?>
+        <?php if ($use_taxes && $user_vat_number = wpinv_get_invoice_vat_number($invoice_id)) { ?>
             <tr class="wpi-row-uvatno">
-                <th><?php echo wp_sprintf( __( 'Your %s Number', 'invoicing' ), $vat_name ); ?></th>
+                <th><?php echo wp_sprintf(__('Your %s Number', 'invoicing'), $vat_name); ?></th>
                 <td><?php echo $user_vat_number; ?></td>
             </tr>
         <?php } ?>
         <tr class="table-active tr-total wpi-row-total">
-            <th><strong><?php _e( 'Total Amount', 'invoicing' ) ?></strong></th>
-            <td><strong><?php echo wpinv_payment_total( $invoice_id, true ); ?></strong></td>
+            <th><strong><?php _e('Total Amount', 'invoicing') ?></strong></th>
+            <td><strong><?php echo wpinv_payment_total($invoice_id, true); ?></strong></td>
         </tr>
     </table>
 <?php
 }
 
-function wpinv_display_to_address( $invoice_id = 0 ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_display_to_address($invoice_id = 0) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $billing_details = $invoice->get_user_info();
-    $output = '<div class="to col-xs-2"><strong>' . __( 'To:', 'invoicing' ) . '</strong></div>';
+    $output = '<div class="to col-xs-2"><strong>' . __('To:', 'invoicing') . '</strong></div>';
     $output .= '<div class="wrapper col-xs-10">';
     
     ob_start();
-    do_action( 'wpinv_display_to_address_top', $invoice );
+    do_action('wpinv_display_to_address_top', $invoice);
     $output .= ob_get_clean();
     
-    $output .= '<div class="name">' . esc_html( trim( $billing_details['first_name'] . ' ' . $billing_details['last_name'] ) ) . '</div>';
-    if ( $company = $billing_details['company'] ) {
-        $output .= '<div class="company">' . wpautop( wp_kses_post( $company ) ) . '</div>';
+    $output .= '<div class="name">' . esc_html(trim($billing_details['first_name'] . ' ' . $billing_details['last_name'])) . '</div>';
+    if ($company = $billing_details['company']) {
+        $output .= '<div class="company">' . wpautop(wp_kses_post($company)) . '</div>';
     }
     $address_row = '';
-    if ( $address = $billing_details['address'] ) {
-        $address_row .= wpautop( wp_kses_post( $address ) );
+    if ($address = $billing_details['address']) {
+        $address_row .= wpautop(wp_kses_post($address));
     }
     
     $address_fields = array();
-    if ( !empty( $billing_details['city'] ) ) {
+    if (!empty($billing_details['city'])) {
         $address_fields[] = $billing_details['city'];
     }
     
-    $billing_country = !empty( $billing_details['country'] ) ? $billing_details['country'] : '';
-    if ( !empty( $billing_details['state'] ) ) {
-        $address_fields[] = wpinv_state_name( $billing_details['state'], $billing_country );
+    $billing_country = !empty($billing_details['country']) ? $billing_details['country'] : '';
+    if (!empty($billing_details['state'])) {
+        $address_fields[] = wpinv_state_name($billing_details['state'], $billing_country);
     }
     
-    if ( !empty( $billing_country ) ) {
-        $address_fields[] = wpinv_country_name( $billing_country );
+    if (!empty($billing_country)) {
+        $address_fields[] = wpinv_country_name($billing_country);
     }
     
-    if ( !empty( $address_fields ) ) {
-        $address_fields = implode( ", ", $address_fields );
+    if (!empty($address_fields)) {
+        $address_fields = implode(", ", $address_fields);
         
-        if ( !empty( $billing_details['zip'] ) ) {
+        if (!empty($billing_details['zip'])) {
             $address_fields .= ' ' . $billing_details['zip'];
         }
         
-        $address_row .= wpautop( wp_kses_post( $address_fields ) );
+        $address_row .= wpautop(wp_kses_post($address_fields));
     }
     
-    if ( $address_row ) {
+    if ($address_row) {
         $output .= '<div class="address">' . $address_row . '</div>';
     }
     
-    if ( $phone = $invoice->get_phone() ) {
-        $output .= '<div class="phone">' . wp_sprintf( __( 'Phone: %s', 'invoicing' ), esc_html( $phone ) ) . '</div>';
+    if ($phone = $invoice->get_phone()) {
+        $output .= '<div class="phone">' . wp_sprintf(__('Phone: %s', 'invoicing'), esc_html($phone)) . '</div>';
     }
-    if ( $email = $invoice->get_email() ) {
-        $output .= '<div class="email">' . wp_sprintf( __( 'Email: %s' , 'invoicing'), esc_html( $email ) ) . '</div>';
+    if ($email = $invoice->get_email()) {
+        $output .= '<div class="email">' . wp_sprintf(__('Email: %s', 'invoicing'), esc_html($email)) . '</div>';
     }
     
     ob_start();
-    do_action( 'wpinv_display_to_address_bottom', $invoice );
+    do_action('wpinv_display_to_address_bottom', $invoice);
     $output .= ob_get_clean();
     
     $output .= '</div>';
-    $output = apply_filters( 'wpinv_display_to_address', $output, $invoice );
+    $output = apply_filters('wpinv_display_to_address', $output, $invoice);
 
     echo $output;
 }
 
-function wpinv_display_line_items( $invoice_id = 0 ) {
+function wpinv_display_line_items($invoice_id = 0) {
     global $wpinv_euvat, $ajax_cart_details;
-    $invoice            = wpinv_get_invoice( $invoice_id );
+    $invoice            = wpinv_get_invoice($invoice_id);
     $quantities_enabled = wpinv_item_quantities_enabled();
     $use_taxes          = wpinv_use_taxes();
     $zero_tax           = !(float)$invoice->get_tax() > 0 ? true : false;
-    $tax_label           = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __( 'Tax', 'invoicing' );
-    $tax_title          = !$zero_tax && $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+    $tax_label = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __('Tax', 'invoicing');
+    $tax_title          = !$zero_tax && $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
     
     $cart_details       = $invoice->get_cart_details();
     $ajax_cart_details  = $cart_details;
@@ -1020,68 +1020,68 @@ 
     <table class="table table-sm table-bordered table-responsive">
         <thead>
             <tr>
-                <th class="name"><strong><?php _e( "Item Name", "invoicing" );?></strong></th>
-                <th class="rate"><strong><?php _e( "Price", "invoicing" );?></strong></th>
+                <th class="name"><strong><?php _e("Item Name", "invoicing"); ?></strong></th>
+                <th class="rate"><strong><?php _e("Price", "invoicing"); ?></strong></th>
                 <?php if ($quantities_enabled) { ?>
-                    <th class="qty"><strong><?php _e( "Qty", "invoicing" );?></strong></th>
+                    <th class="qty"><strong><?php _e("Qty", "invoicing"); ?></strong></th>
                 <?php } ?>
                 <?php if ($use_taxes && !$zero_tax) { ?>
                     <th class="tax"><strong><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></strong></th>
                 <?php } ?>
-                <th class="total"><strong><?php echo __( "Item Total", "invoicing" ) . ' <span class="normal small">' . $tax_title . '<span>';?></strong></th>
+                <th class="total"><strong><?php echo __("Item Total", "invoicing") . ' <span class="normal small">' . $tax_title . '<span>'; ?></strong></th>
             </tr>
         </thead>
         <tbody>
         <?php 
-            if ( !empty( $cart_details ) ) {
-                do_action( 'wpinv_display_line_items_start', $invoice );
+            if (!empty($cart_details)) {
+                do_action('wpinv_display_line_items_start', $invoice);
                 
                 $count = 0;
                 $cols  = 3;
-                foreach ( $cart_details as $key => $cart_item ) {
-                    $item_id    = !empty($cart_item['id']) ? absint( $cart_item['id'] ) : '';
-                    $item_price = isset($cart_item["item_price"]) ? wpinv_round_amount( $cart_item["item_price"] ) : 0;
-                    $line_total = isset($cart_item["subtotal"]) ? wpinv_round_amount( $cart_item["subtotal"] ) : 0;
-                    $quantity   = !empty($cart_item['quantity']) && (int)$cart_item['quantity'] > 0 ? absint( $cart_item['quantity'] ) : 1;
+                foreach ($cart_details as $key => $cart_item) {
+                    $item_id    = !empty($cart_item['id']) ? absint($cart_item['id']) : '';
+                    $item_price = isset($cart_item["item_price"]) ? wpinv_round_amount($cart_item["item_price"]) : 0;
+                    $line_total = isset($cart_item["subtotal"]) ? wpinv_round_amount($cart_item["subtotal"]) : 0;
+                    $quantity   = !empty($cart_item['quantity']) && (int)$cart_item['quantity'] > 0 ? absint($cart_item['quantity']) : 1;
                     
-                    $item       = $item_id ? new WPInv_Item( $item_id ) : NULL;
+                    $item       = $item_id ? new WPInv_Item($item_id) : NULL;
                     $summary    = '';
                     $cols       = 3;
-                    if ( !empty($item) ) {
+                    if (!empty($item)) {
                         $item_name  = $item->get_name();
                         $summary    = $item->get_summary();
                     }
-                    $item_name  = !empty($cart_item['name']) ? $cart_item['name'] : $item_name;
+                    $item_name = !empty($cart_item['name']) ? $cart_item['name'] : $item_name;
                     
                     if (!empty($item) && $item->is_package() && !empty($cart_item['meta']['post_id'])) {
-                        $post_link = '<a href="' . get_edit_post_link( $cart_item['meta']['post_id'] ) .'" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title( $cart_item['meta']['post_id']) ) . '</a>';
-                        $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $item->get_custom_singular_name(), $post_link );
+                        $post_link = '<a href="' . get_edit_post_link($cart_item['meta']['post_id']) . '" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title($cart_item['meta']['post_id'])) . '</a>';
+                        $summary = wp_sprintf(__('%s: %s', 'invoicing'), $item->get_custom_singular_name(), $post_link);
                     }
-                    $summary = apply_filters( 'wpinv_print_invoice_line_item_summary', $summary, $cart_item, $item, $invoice );
+                    $summary = apply_filters('wpinv_print_invoice_line_item_summary', $summary, $cart_item, $item, $invoice);
                     
                     $item_tax       = '';
                     $tax_rate       = '';
-                    if ( $use_taxes && $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0 ) {
-                        $item_tax = wpinv_price( wpinv_format_amount( $cart_item['tax'] ) );
-                        $tax_rate = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : ( $cart_item['tax'] / $cart_item['subtotal'] ) * 100;
-                        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+                    if ($use_taxes && $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0) {
+                        $item_tax = wpinv_price(wpinv_format_amount($cart_item['tax']));
+                        $tax_rate = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : ($cart_item['tax'] / $cart_item['subtotal']) * 100;
+                        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount($tax_rate, 4) : '';
                         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate">(' . $tax_rate . '%)</small>' : '';
                     }
                     
                     $line_item_tax = $item_tax . $tax_rate;
                     
-                    if ( $line_item_tax === '' ) {
+                    if ($line_item_tax === '') {
                         $line_item_tax = 0; // Zero tax
                     }
                     
-                    $line_item = '<tr class="row-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . ' wpinv-item">';
-                        $line_item .= '<td class="name">' . esc_html__( $item_name, 'invoicing' ) . wpinv_get_item_suffix( $item );
-                        if ( $summary !== '' ) {
-                            $line_item .= '<br/><small class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</small>';
+                    $line_item = '<tr class="row-' . (($count % 2 == 0) ? 'even' : 'odd') . ' wpinv-item">';
+                        $line_item .= '<td class="name">' . esc_html__($item_name, 'invoicing') . wpinv_get_item_suffix($item);
+                        if ($summary !== '') {
+                            $line_item .= '<br/><small class="meta">' . wpautop(wp_kses_post($summary)) . '</small>';
                         }
                         $line_item .= '</td>';
                         
-                        $line_item .= '<td class="rate">' . esc_html__( wpinv_price( wpinv_format_amount( $item_price ), $invoice->get_currency() ) ) . '</td>';
+                        $line_item .= '<td class="rate">' . esc_html__(wpinv_price(wpinv_format_amount($item_price), $invoice->get_currency())) . '</td>';
                         if ($quantities_enabled) {
                             $cols++;
                             $line_item .= '<td class="qty">' . $quantity . '</td>';
@@ -1090,55 +1090,55 @@ 
                             $cols++;
                             $line_item .= '<td class="tax">' . $line_item_tax . '</td>';
                         }
-                        $line_item .= '<td class="total">' . esc_html__( wpinv_price( wpinv_format_amount( $line_total ), $invoice->get_currency() ) ) . '</td>';
+                        $line_item .= '<td class="total">' . esc_html__(wpinv_price(wpinv_format_amount($line_total), $invoice->get_currency())) . '</td>';
                     $line_item .= '</tr>';
                     
-                    echo apply_filters( 'wpinv_display_line_item', $line_item, $cart_item, $invoice, $cols );
+                    echo apply_filters('wpinv_display_line_item', $line_item, $cart_item, $invoice, $cols);
 
                     $count++;
                 }
                 
-                do_action( 'wpinv_display_before_subtotal', $invoice, $cols );
+                do_action('wpinv_display_before_subtotal', $invoice, $cols);
                 ?>
                 <tr class="row-sub-total row_odd">
-                    <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_subtotal_label', '<strong>' . __( 'Sub Total', 'invoicing' ) . ':</strong>', $invoice ); ?></td>
-                    <td class="total"><strong><?php _e( wpinv_subtotal( $invoice_id, true ) ) ?></strong></td>
+                    <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_subtotal_label', '<strong>' . __('Sub Total', 'invoicing') . ':</strong>', $invoice); ?></td>
+                    <td class="total"><strong><?php _e(wpinv_subtotal($invoice_id, true)) ?></strong></td>
                 </tr>
                 <?php
-                do_action( 'wpinv_display_after_subtotal', $invoice, $cols );
+                do_action('wpinv_display_after_subtotal', $invoice, $cols);
                 
-                if ( wpinv_discount( $invoice_id, false ) > 0 ) {
-                    do_action( 'wpinv_display_before_discount', $invoice, $cols );
+                if (wpinv_discount($invoice_id, false) > 0) {
+                    do_action('wpinv_display_before_discount', $invoice, $cols);
                     ?>
                         <tr class="row-discount">
-                            <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?>:</td>
-                            <td class="total"><?php echo wpinv_discount( $invoice_id, true, true ); ?></td>
+                            <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?>:</td>
+                            <td class="total"><?php echo wpinv_discount($invoice_id, true, true); ?></td>
                         </tr>
                     <?php
-                    do_action( 'wpinv_display_after_discount', $invoice, $cols );
+                    do_action('wpinv_display_after_discount', $invoice, $cols);
                 }
                 
-                if ( $use_taxes ) {
-                    do_action( 'wpinv_display_before_tax', $invoice, $cols );
+                if ($use_taxes) {
+                    do_action('wpinv_display_before_tax', $invoice, $cols);
                     ?>
                     <tr class="row-tax">
-                        <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_tax_label', '<strong>' . $tax_label . ':</strong>', $invoice ); ?></td>
-                        <td class="total"><?php _e( wpinv_tax( $invoice_id, true ) ) ?></td>
+                        <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_tax_label', '<strong>' . $tax_label . ':</strong>', $invoice); ?></td>
+                        <td class="total"><?php _e(wpinv_tax($invoice_id, true)) ?></td>
                     </tr>
                     <?php
-                    do_action( 'wpinv_display_after_tax', $invoice, $cols );
+                    do_action('wpinv_display_after_tax', $invoice, $cols);
                 }
                 
-                do_action( 'wpinv_display_before_total', $invoice, $cols );
+                do_action('wpinv_display_before_total', $invoice, $cols);
                 ?>
                 <tr class="table-active row-total">
-                    <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?></td>
-                    <td class="total"><strong><?php _e( wpinv_payment_total( $invoice_id, true ) ) ?></strong></td>
+                    <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?></td>
+                    <td class="total"><strong><?php _e(wpinv_payment_total($invoice_id, true)) ?></strong></td>
                 </tr>
                 <?php
-                do_action( 'wpinv_display_after_total', $invoice, $cols );
+                do_action('wpinv_display_after_total', $invoice, $cols);
                 
-                do_action( 'wpinv_display_line_end', $invoice, $cols );
+                do_action('wpinv_display_line_end', $invoice, $cols);
             }
         ?>
         </tbody>
@@ -1147,35 +1147,35 @@ 
     echo ob_get_clean();
 }
 
-function wpinv_display_invoice_totals( $invoice_id = 0 ) {    
+function wpinv_display_invoice_totals($invoice_id = 0) {    
     $use_taxes = wpinv_use_taxes();
     
-    do_action( 'wpinv_before_display_totals_table', $invoice_id ); 
+    do_action('wpinv_before_display_totals_table', $invoice_id); 
     ?>
     <table class="table table-sm table-bordered table-responsive">
         <tbody>
-            <?php do_action( 'wpinv_before_display_totals' ); ?>
+            <?php do_action('wpinv_before_display_totals'); ?>
             <tr class="row-sub-total">
-                <td class="rate"><strong><?php _e( 'Sub Total', 'invoicing' ); ?></strong></td>
-                <td class="total"><strong><?php _e( wpinv_subtotal( $invoice_id, true ) ) ?></strong></td>
+                <td class="rate"><strong><?php _e('Sub Total', 'invoicing'); ?></strong></td>
+                <td class="total"><strong><?php _e(wpinv_subtotal($invoice_id, true)) ?></strong></td>
             </tr>
-            <?php do_action( 'wpinv_after_display_totals' ); ?>
-            <?php if ( wpinv_discount( $invoice_id, false ) > 0 ) { ?>
+            <?php do_action('wpinv_after_display_totals'); ?>
+            <?php if (wpinv_discount($invoice_id, false) > 0) { ?>
                 <tr class="row-discount">
-                    <td class="rate"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?></td>
-                    <td class="total"><?php echo wpinv_discount( $invoice_id, true, true ); ?></td>
+                    <td class="rate"><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?></td>
+                    <td class="total"><?php echo wpinv_discount($invoice_id, true, true); ?></td>
                 </tr>
-            <?php do_action( 'wpinv_after_display_discount' ); ?>
+            <?php do_action('wpinv_after_display_discount'); ?>
             <?php } ?>
-            <?php if ( $use_taxes ) { ?>
+            <?php if ($use_taxes) { ?>
             <tr class="row-tax">
-                <td class="rate"><?php _e( 'Tax', 'invoicing' ); ?></td>
-                <td class="total"><?php _e( wpinv_tax( $invoice_id, true ) ) ?></td>
+                <td class="rate"><?php _e('Tax', 'invoicing'); ?></td>
+                <td class="total"><?php _e(wpinv_tax($invoice_id, true)) ?></td>
             </tr>
-            <?php do_action( 'wpinv_after_display_tax' ); ?>
+            <?php do_action('wpinv_after_display_tax'); ?>
             <?php } ?>
-            <?php if ( $fees = wpinv_get_fees( $invoice_id ) ) { ?>
-                <?php foreach ( $fees as $fee ) { ?>
+            <?php if ($fees = wpinv_get_fees($invoice_id)) { ?>
+                <?php foreach ($fees as $fee) { ?>
                     <tr class="row-fee">
                         <td class="rate"><?php echo $fee['label']; ?></td>
                         <td class="total"><?php echo $fee['amount_display']; ?></td>
@@ -1183,73 +1183,73 @@ 
                 <?php } ?>
             <?php } ?>
             <tr class="table-active row-total">
-                <td class="rate"><strong><?php _e( 'Total', 'invoicing' ) ?></strong></td>
-                <td class="total"><strong><?php _e( wpinv_payment_total( $invoice_id, true ) ) ?></strong></td>
+                <td class="rate"><strong><?php _e('Total', 'invoicing') ?></strong></td>
+                <td class="total"><strong><?php _e(wpinv_payment_total($invoice_id, true)) ?></strong></td>
             </tr>
-            <?php do_action( 'wpinv_after_totals' ); ?>
+            <?php do_action('wpinv_after_totals'); ?>
         </tbody>
 
     </table>
 
-    <?php do_action( 'wpinv_after_totals_table' );
+    <?php do_action('wpinv_after_totals_table');
 }
 
-function wpinv_display_payments_info( $invoice_id = 0, $echo = true ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_display_payments_info($invoice_id = 0, $echo = true) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
     ob_start();
-    do_action( 'wpinv_before_display_payments_info', $invoice_id );
-    if ( ( $gateway_title = $invoice->get_gateway_title() ) || $invoice->is_paid() || $invoice->is_refunded() ) {
+    do_action('wpinv_before_display_payments_info', $invoice_id);
+    if (($gateway_title = $invoice->get_gateway_title()) || $invoice->is_paid() || $invoice->is_refunded()) {
         ?>
         <div class="wpi-payment-info">
-            <p class="wpi-payment-gateway"><?php echo wp_sprintf( __( 'Payment via %s', 'invoicing' ), $gateway_title ? $gateway_title : __( 'Manually', 'invoicing' ) ); ?></p>
-            <?php if ( $gateway_title ) { ?>
-            <p class="wpi-payment-transid"><?php echo wp_sprintf( __( 'Transaction ID: %s', 'invoicing' ), $invoice->get_transaction_id() ); ?></p>
+            <p class="wpi-payment-gateway"><?php echo wp_sprintf(__('Payment via %s', 'invoicing'), $gateway_title ? $gateway_title : __('Manually', 'invoicing')); ?></p>
+            <?php if ($gateway_title) { ?>
+            <p class="wpi-payment-transid"><?php echo wp_sprintf(__('Transaction ID: %s', 'invoicing'), $invoice->get_transaction_id()); ?></p>
             <?php } ?>
         </div>
         <?php
     }
-    do_action( 'wpinv_after_display_payments_info', $invoice_id );
+    do_action('wpinv_after_display_payments_info', $invoice_id);
     $outout = ob_get_clean();
     
-    if ( $echo ) {
+    if ($echo) {
         echo $outout;
     } else {
         return $outout;
     }
 }
 
-function wpinv_display_style( $invoice ) {
-    wp_register_style( 'wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), WPINV_VERSION );
+function wpinv_display_style($invoice) {
+    wp_register_style('wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), WPINV_VERSION);
     
-    wp_print_styles( 'open-sans' );
-    wp_print_styles( 'wpinv-single-style' );
+    wp_print_styles('open-sans');
+    wp_print_styles('wpinv-single-style');
 }
-add_action( 'wpinv_invoice_print_head', 'wpinv_display_style' );
-add_action( 'wpinv_invalid_invoice_head', 'wpinv_display_style' );
+add_action('wpinv_invoice_print_head', 'wpinv_display_style');
+add_action('wpinv_invalid_invoice_head', 'wpinv_display_style');
 
 function wpinv_checkout_billing_details() {  
     $invoice_id = (int)wpinv_get_invoice_cart_id();
     if (empty($invoice_id)) {
-        wpinv_error_log( 'Invoice id not found', 'ERROR', __FILE__, __LINE__ );
+        wpinv_error_log('Invoice id not found', 'ERROR', __FILE__, __LINE__);
         return null;
     }
     
-    $invoice = wpinv_get_invoice_cart( $invoice_id );
+    $invoice = wpinv_get_invoice_cart($invoice_id);
     if (empty($invoice)) {
-        wpinv_error_log( 'Invoice not found', 'ERROR', __FILE__, __LINE__ );
+        wpinv_error_log('Invoice not found', 'ERROR', __FILE__, __LINE__);
         return null;
     }
     $user_id        = $invoice->get_user_id();
     $user_info      = $invoice->get_user_info();
-    $address_info   = wpinv_get_user_address( $user_id );
+    $address_info   = wpinv_get_user_address($user_id);
     
-    if ( empty( $user_info['first_name'] ) && !empty( $user_info['first_name'] ) ) {
+    if (empty($user_info['first_name']) && !empty($user_info['first_name'])) {
         $user_info['first_name'] = $user_info['first_name'];
         $user_info['last_name'] = $user_info['last_name'];
     }
     
-    if ( ( ( empty( $user_info['country'] ) && !empty( $address_info['country'] ) ) || ( empty( $user_info['state'] ) && !empty( $address_info['state'] ) && $user_info['country'] == $address_info['country'] ) ) ) {
+    if (((empty($user_info['country']) && !empty($address_info['country'])) || (empty($user_info['state']) && !empty($address_info['state']) && $user_info['country'] == $address_info['country']))) {
         $user_info['country']   = $address_info['country'];
         $user_info['state']     = $address_info['state'];
         $user_info['city']      = $address_info['city'];
@@ -1265,103 +1265,103 @@ 
         'address'
     );
     
-    foreach ( $address_fields as $field ) {
-        if ( empty( $user_info[$field] ) ) {
+    foreach ($address_fields as $field) {
+        if (empty($user_info[$field])) {
             $user_info[$field] = $address_info[$field];
         }
     }
     
-    return apply_filters( 'wpinv_checkout_billing_details', $user_info, $invoice );
+    return apply_filters('wpinv_checkout_billing_details', $user_info, $invoice);
 }
 
 function wpinv_admin_get_line_items($invoice = array()) {
     $item_quantities    = wpinv_item_quantities_enabled();
     $use_taxes          = wpinv_use_taxes();
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $cart_items = $invoice->get_cart_details();
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return NULL;
     }
     ob_start();
     
-    do_action( 'wpinv_admin_before_line_items', $cart_items, $invoice );
+    do_action('wpinv_admin_before_line_items', $cart_items, $invoice);
     
     $count = 0;
-    foreach ( $cart_items as $key => $cart_item ) {
+    foreach ($cart_items as $key => $cart_item) {
         $item_id    = $cart_item['id'];
-        $wpi_item   = $item_id > 0 ? new WPInv_Item( $item_id ) : NULL;
+        $wpi_item   = $item_id > 0 ? new WPInv_Item($item_id) : NULL;
         
         if (empty($wpi_item)) {
             continue;
         }
         
-        $item_price     = wpinv_price( wpinv_format_amount( $cart_item['item_price'] ) );
-        $quantity       = !empty( $cart_item['quantity'] ) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
-        $item_subtotal  = wpinv_price( wpinv_format_amount( $cart_item['subtotal'] ) );
+        $item_price     = wpinv_price(wpinv_format_amount($cart_item['item_price']));
+        $quantity       = !empty($cart_item['quantity']) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
+        $item_subtotal  = wpinv_price(wpinv_format_amount($cart_item['subtotal']));
         $can_remove     = true;
         
         $summary = '';
         if ($wpi_item->is_package() && !empty($cart_item['meta']['post_id'])) {
-            $post_link = '<a href="' . get_edit_post_link( $cart_item['meta']['post_id'] ) .'" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title( $cart_item['meta']['post_id']) ) . '</a>';
-            $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $wpi_item->get_custom_singular_name(), $post_link );
+            $post_link = '<a href="' . get_edit_post_link($cart_item['meta']['post_id']) . '" target="_blank">' . (!empty($cart_item['meta']['invoice_title']) ? $cart_item['meta']['invoice_title'] : get_the_title($cart_item['meta']['post_id'])) . '</a>';
+            $summary = wp_sprintf(__('%s: %s', 'invoicing'), $wpi_item->get_custom_singular_name(), $post_link);
         }
-        $summary = apply_filters( 'wpinv_admin_invoice_line_item_summary', $summary, $cart_item, $wpi_item, $invoice );
+        $summary = apply_filters('wpinv_admin_invoice_line_item_summary', $summary, $cart_item, $wpi_item, $invoice);
         
         $item_tax       = '';
         $tax_rate       = '';
-        if ( $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0 ) {
-            $item_tax = wpinv_price( wpinv_format_amount( $cart_item['tax'] ) );
-            $tax_rate = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : ( $cart_item['tax'] / $cart_item['subtotal'] ) * 100;
-            $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+        if ($cart_item['tax'] > 0 && $cart_item['subtotal'] > 0) {
+            $item_tax = wpinv_price(wpinv_format_amount($cart_item['tax']));
+            $tax_rate = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : ($cart_item['tax'] / $cart_item['subtotal']) * 100;
+            $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount($tax_rate, 4) : '';
             $tax_rate = $tax_rate != '' ? ' <span class="tax-rate">(' . $tax_rate . '%)</span>' : '';
         }
         $line_item_tax = $item_tax . $tax_rate;
         
-        if ( $line_item_tax === '' ) {
+        if ($line_item_tax === '') {
             $line_item_tax = 0; // Zero tax
         }
 
-        $line_item = '<tr class="item item-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . '" data-item-id="' . $item_id . '">';
+        $line_item = '<tr class="item item-' . (($count % 2 == 0) ? 'even' : 'odd') . '" data-item-id="' . $item_id . '">';
             $line_item .= '<td class="id">' . $item_id . '</td>';
-            $line_item .= '<td class="title"><a href="' . get_edit_post_link( $item_id ) . '" target="_blank">' . $cart_item['name'] . '</a>' . wpinv_get_item_suffix( $wpi_item );
-            if ( $summary !== '' ) {
-                $line_item .= '<span class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</span>';
+            $line_item .= '<td class="title"><a href="' . get_edit_post_link($item_id) . '" target="_blank">' . $cart_item['name'] . '</a>' . wpinv_get_item_suffix($wpi_item);
+            if ($summary !== '') {
+                $line_item .= '<span class="meta">' . wpautop(wp_kses_post($summary)) . '</span>';
             }
             $line_item .= '</td>';
             $line_item .= '<td class="price">' . $item_price . '</td>';
             
-            if ( $item_quantities ) {
-                if ( count( $cart_items ) == 1 && $quantity <= 1 ) {
+            if ($item_quantities) {
+                if (count($cart_items) == 1 && $quantity <= 1) {
                     $can_remove = false;
                 }
                 $line_item .= '<td class="qty" data-quantity="' . $quantity . '">&nbsp;&times;&nbsp;' . $quantity . '</td>';
             } else {
-                if ( count( $cart_items ) == 1 ) {
+                if (count($cart_items) == 1) {
                     $can_remove = false;
                 }
             }
             $line_item .= '<td class="total">' . $item_subtotal . '</td>';
             
-            if ( $use_taxes ) {
+            if ($use_taxes) {
                 $line_item .= '<td class="tax">' . $line_item_tax . '</td>';
             }
             $line_item .= '<td class="action">';
-            if ( !$invoice->is_paid() && !$invoice->is_refunded() && $can_remove ) {
+            if (!$invoice->is_paid() && !$invoice->is_refunded() && $can_remove) {
                 $line_item .= '<i class="fa fa-remove wpinv-item-remove"></i>';
             }
             $line_item .= '</td>';
         $line_item .= '</tr>';
         
-        echo apply_filters( 'wpinv_admin_line_item', $line_item, $cart_item, $invoice );
+        echo apply_filters('wpinv_admin_line_item', $line_item, $cart_item, $invoice);
         
         $count++;
     } 
     
-    do_action( 'wpinv_admin_after_line_items', $cart_items, $invoice );
+    do_action('wpinv_admin_after_line_items', $cart_items, $invoice);
     
     return ob_get_clean();
 }
@@ -1372,35 +1372,35 @@ 
     // Set current invoice id.
     $wpi_checkout_id = wpinv_get_invoice_cart_id();
     
-    $form_action  = esc_url( wpinv_get_checkout_uri() );
+    $form_action = esc_url(wpinv_get_checkout_uri());
 
     ob_start();
         echo '<div id="wpinv_checkout_wrap">';
         
-        if ( wpinv_get_cart_contents() || wpinv_cart_has_fees() ) {
+        if (wpinv_get_cart_contents() || wpinv_cart_has_fees()) {
             ?>
             <div id="wpinv_checkout_form_wrap" class="wpinv_clearfix table-responsive">
-                <?php do_action( 'wpinv_before_checkout_form' ); ?>
+                <?php do_action('wpinv_before_checkout_form'); ?>
                 <form id="wpinv_checkout_form" class="wpi-form" action="<?php echo $form_action; ?>" method="POST">
                     <?php
-                    do_action( 'wpinv_checkout_form_top' );
-                    do_action( 'wpinv_checkout_billing_info' );
-                    do_action( 'wpinv_checkout_cart' );
-                    do_action( 'wpinv_payment_mode_select'  );
-                    do_action( 'wpinv_checkout_form_bottom' )
+                    do_action('wpinv_checkout_form_top');
+                    do_action('wpinv_checkout_billing_info');
+                    do_action('wpinv_checkout_cart');
+                    do_action('wpinv_payment_mode_select');
+                    do_action('wpinv_checkout_form_bottom')
                     ?>
                 </form>
-                <?php do_action( 'wpinv_after_purchase_form' ); ?>
+                <?php do_action('wpinv_after_purchase_form'); ?>
             </div><!--end #wpinv_checkout_form_wrap-->
         <?php
         } else {
-            do_action( 'wpinv_cart_empty' );
+            do_action('wpinv_cart_empty');
         }
         echo '</div><!--end #wpinv_checkout_wrap-->';
     return ob_get_clean();
 }
 
-function wpinv_checkout_cart( $cart_details = array(), $echo = true ) {
+function wpinv_checkout_cart($cart_details = array(), $echo = true) {
     global $ajax_cart_details;
     $ajax_cart_details = $cart_details;
     /*
@@ -1415,25 +1415,25 @@ 
     }
     */
     ob_start();
-    do_action( 'wpinv_before_checkout_cart' );
+    do_action('wpinv_before_checkout_cart');
     echo '<div id="wpinv_checkout_cart_form" method="post">';
         echo '<div id="wpinv_checkout_cart_wrap">';
-            wpinv_get_template_part( 'wpinv-checkout-cart' );
+            wpinv_get_template_part('wpinv-checkout-cart');
         echo '</div>';
     echo '</div>';
-    do_action( 'wpinv_after_checkout_cart' );
+    do_action('wpinv_after_checkout_cart');
     $content = ob_get_clean();
     
-    if ( $echo ) {
+    if ($echo) {
         echo $content;
     } else {
         return $content;
     }
 }
-add_action( 'wpinv_checkout_cart', 'wpinv_checkout_cart', 10 );
+add_action('wpinv_checkout_cart', 'wpinv_checkout_cart', 10);
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+	return apply_filters('wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __('Your cart is empty.', 'invoicing') . '</span>');
 }
 
 /**
@@ -1445,91 +1445,91 @@ 
 function wpinv_empty_checkout_cart() {
 	echo wpinv_empty_cart_message();
 }
-add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
+add_action('wpinv_cart_empty', 'wpinv_empty_checkout_cart');
 
 function wpinv_save_cart_button() {
-    if ( wpinv_is_cart_saving_disabled() )
+    if (wpinv_is_cart_saving_disabled())
         return;
 ?>
-    <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url( add_query_arg( 'wpi_action', 'save_cart' ) ); ?>"><?php _e( 'Save Cart', 'invoicing' ); ?></a>
+    <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url(add_query_arg('wpi_action', 'save_cart')); ?>"><?php _e('Save Cart', 'invoicing'); ?></a>
 <?php
 }
 
 function wpinv_update_cart_button() {
-    if ( !wpinv_item_quantities_enabled() )
+    if (!wpinv_item_quantities_enabled())
         return;
 ?>
-    <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e( 'Update Cart', 'invoicing' ); ?>"/>
+    <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e('Update Cart', 'invoicing'); ?>"/>
     <input type="hidden" name="wpi_action" value="update_cart"/>
 <?php
 }
 
 function wpinv_checkout_cart_columns() {
     $default = 3;
-    if ( wpinv_item_quantities_enabled() ) {
+    if (wpinv_item_quantities_enabled()) {
         $default++;
     }
     
-    if ( wpinv_use_taxes() ) {
+    if (wpinv_use_taxes()) {
         $default++;
     }
 
-    return apply_filters( 'wpinv_checkout_cart_columns', $default );
+    return apply_filters('wpinv_checkout_cart_columns', $default);
 }
 
 function wpinv_display_cart_messages() {
     global $wpi_session;
 
-    $messages = $wpi_session->get( 'wpinv_cart_messages' );
+    $messages = $wpi_session->get('wpinv_cart_messages');
 
-    if ( $messages ) {
-        foreach ( $messages as $message_id => $message ) {
+    if ($messages) {
+        foreach ($messages as $message_id => $message) {
             // Try and detect what type of message this is
-            if ( strpos( strtolower( $message ), 'error' ) ) {
+            if (strpos(strtolower($message), 'error')) {
                 $type = 'error';
-            } elseif ( strpos( strtolower( $message ), 'success' ) ) {
+            } elseif (strpos(strtolower($message), 'success')) {
                 $type = 'success';
             } else {
                 $type = 'info';
             }
 
-            $classes = apply_filters( 'wpinv_' . $type . '_class', array( 'wpinv_errors', 'wpinv-alert', 'wpinv-alert-' . $type ) );
+            $classes = apply_filters('wpinv_' . $type . '_class', array('wpinv_errors', 'wpinv-alert', 'wpinv-alert-' . $type));
 
-            echo '<div class="' . implode( ' ', $classes ) . '">';
+            echo '<div class="' . implode(' ', $classes) . '">';
                 // Loop message codes and display messages
                     echo '<p class="wpinv_error" id="wpinv_msg_' . $message_id . '">' . $message . '</p>';
             echo '</div>';
         }
 
         // Remove all of the cart saving messages
-        $wpi_session->set( 'wpinv_cart_messages', null );
+        $wpi_session->set('wpinv_cart_messages', null);
     }
 }
-add_action( 'wpinv_before_checkout_cart', 'wpinv_display_cart_messages' );
+add_action('wpinv_before_checkout_cart', 'wpinv_display_cart_messages');
 
 function wpinv_discount_field() {
-    if ( isset( $_GET['wpi-gateway'] ) && wpinv_is_ajax_disabled() ) {
+    if (isset($_GET['wpi-gateway']) && wpinv_is_ajax_disabled()) {
         return; // Only show before a payment method has been selected if ajax is disabled
     }
 
-    if ( !wpinv_is_checkout() ) {
+    if (!wpinv_is_checkout()) {
         return;
     }
 
-    if ( wpinv_has_active_discounts() && wpinv_get_cart_total() ) {
+    if (wpinv_has_active_discounts() && wpinv_get_cart_total()) {
     ?>
     <div id="wpinv-discount-field" class="panel panel-default">
         <div class="panel-body">
             <p>
-                <label class="wpinv-label" for="wpinv_discount_code"><strong><?php _e( 'Discount', 'invoicing' ); ?></strong></label>
-                <span class="wpinv-description"><?php _e( 'Enter a discount code if you have one.', 'invoicing' ); ?></span>
+                <label class="wpinv-label" for="wpinv_discount_code"><strong><?php _e('Discount', 'invoicing'); ?></strong></label>
+                <span class="wpinv-description"><?php _e('Enter a discount code if you have one.', 'invoicing'); ?></span>
             </p>
             <div class="form-group row">
                 <div class="col-sm-4">
-                    <input class="wpinv-input form-control" type="text" id="wpinv_discount_code" name="wpinv_discount_code" placeholder="<?php _e( 'Enter discount code', 'invoicing' ); ?>"/>
+                    <input class="wpinv-input form-control" type="text" id="wpinv_discount_code" name="wpinv_discount_code" placeholder="<?php _e('Enter discount code', 'invoicing'); ?>"/>
                 </div>
                 <div class="col-sm-3">
-                    <button id="wpi-apply-discount" type="button" class="btn btn-success btn-sm"><?php _e( 'Apply Discount', 'invoicing' ); ?></button>
+                    <button id="wpi-apply-discount" type="button" class="btn btn-success btn-sm"><?php _e('Apply Discount', 'invoicing'); ?></button>
                 </div>
                 <div style="clear:both"></div>
                 <div class="col-sm-12 wpinv-discount-msg">
@@ -1542,10 +1542,10 @@ 
 <?php
     }
 }
-add_action( 'wpinv_after_checkout_cart', 'wpinv_discount_field', -10 );
+add_action('wpinv_after_checkout_cart', 'wpinv_discount_field', -10);
 
 function wpinv_agree_to_terms_js() {
-    if ( wpinv_get_option( 'show_agree_to_terms', false ) ) {
+    if (wpinv_get_option('show_agree_to_terms', false)) {
 ?>
 <script type="text/javascript">
     jQuery(document).ready(function($){
@@ -1560,126 +1560,126 @@ 
 <?php
     }
 }
-add_action( 'wpinv_checkout_form_top', 'wpinv_agree_to_terms_js' );
+add_action('wpinv_checkout_form_top', 'wpinv_agree_to_terms_js');
 
 function wpinv_payment_mode_select() {
-    $gateways = wpinv_get_enabled_payment_gateways( true );
-    $gateways = apply_filters( 'wpinv_payment_gateways_on_cart', $gateways );
+    $gateways = wpinv_get_enabled_payment_gateways(true);
+    $gateways = apply_filters('wpinv_payment_gateways_on_cart', $gateways);
     $page_URL = wpinv_get_current_page_url();
-    $invoice = wpinv_get_invoice( 0, true );
+    $invoice = wpinv_get_invoice(0, true);
     
     do_action('wpinv_payment_mode_top');
     $invoice_id = (int)$invoice->ID;
-    $chosen_gateway = wpinv_get_chosen_gateway( $invoice_id );
+    $chosen_gateway = wpinv_get_chosen_gateway($invoice_id);
     ?>
-    <div id="wpinv_payment_mode_select" data-gateway="<?php echo $chosen_gateway; ?>" <?php echo ( $invoice->is_free() ? 'style="display:none;"' : '' ); ?>>
-            <?php do_action( 'wpinv_payment_mode_before_gateways_wrap' ); ?>
+    <div id="wpinv_payment_mode_select" data-gateway="<?php echo $chosen_gateway; ?>" <?php echo ($invoice->is_free() ? 'style="display:none;"' : ''); ?>>
+            <?php do_action('wpinv_payment_mode_before_gateways_wrap'); ?>
             <div id="wpinv-payment-mode-wrap" class="panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Select Payment Method', 'invoicing' ); ?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php _e('Select Payment Method', 'invoicing'); ?></h3></div>
                 <div class="panel-body list-group wpi-payment_methods">
                     <?php
-                    do_action( 'wpinv_payment_mode_before_gateways' );
+                    do_action('wpinv_payment_mode_before_gateways');
                     
-                    if(!empty($gateways)){
-	                    foreach ( $gateways as $gateway_id => $gateway ) {
-		                    $checked = checked( $gateway_id, $chosen_gateway, false );
-		                    $button_label = wpinv_get_gateway_button_label( $gateway_id );
-		                    $description = wpinv_get_gateway_description( $gateway_id );
+                    if (!empty($gateways)) {
+	                    foreach ($gateways as $gateway_id => $gateway) {
+		                    $checked = checked($gateway_id, $chosen_gateway, false);
+		                    $button_label = wpinv_get_gateway_button_label($gateway_id);
+		                    $description = wpinv_get_gateway_description($gateway_id);
 		                    ?>
 		                    <div class="list-group-item">
 			                    <div class="radio">
-				                    <label><input type="radio" data-button-text="<?php echo esc_attr( $button_label );?>" value="<?php echo esc_attr( $gateway_id ) ;?>" <?php echo $checked ;?> id="wpi_gateway_<?php echo esc_attr( $gateway_id );?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html( $gateway['checkout_label'] ); ?></label>
+				                    <label><input type="radio" data-button-text="<?php echo esc_attr($button_label); ?>" value="<?php echo esc_attr($gateway_id); ?>" <?php echo $checked; ?> id="wpi_gateway_<?php echo esc_attr($gateway_id); ?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html($gateway['checkout_label']); ?></label>
 			                    </div>
-			                    <div style="display:none;" class="payment_box wpi_gateway_<?php echo esc_attr( $gateway_id );?>" role="alert">
-				                    <?php if ( !empty( $description ) ) { ?>
-					                    <div class="wpi-gateway-desc alert alert-info"><?php echo $description;?></div>
+			                    <div style="display:none;" class="payment_box wpi_gateway_<?php echo esc_attr($gateway_id); ?>" role="alert">
+				                    <?php if (!empty($description)) { ?>
+					                    <div class="wpi-gateway-desc alert alert-info"><?php echo $description; ?></div>
 				                    <?php } ?>
-				                    <?php do_action( 'wpinv_' . $gateway_id . '_cc_form', $invoice_id ) ;?>
+				                    <?php do_action('wpinv_' . $gateway_id . '_cc_form', $invoice_id); ?>
 			                    </div>
 		                    </div>
 		                    <?php
 	                    }
-                    }else{
-	                    echo '<div class="alert alert-warning">'. __('No payment gateway active','invoicing') .'</div>';
+                    } else {
+	                    echo '<div class="alert alert-warning">' . __('No payment gateway active', 'invoicing') . '</div>';
                     }
 
-                    do_action( 'wpinv_payment_mode_after_gateways' );
+                    do_action('wpinv_payment_mode_after_gateways');
                     ?>
                 </div>
             </div>
-            <?php do_action( 'wpinv_payment_mode_after_gateways_wrap' ); ?>
+            <?php do_action('wpinv_payment_mode_after_gateways_wrap'); ?>
     </div>
     <?php
     do_action('wpinv_payment_mode_bottom');
 }
-add_action( 'wpinv_payment_mode_select', 'wpinv_payment_mode_select' );
+add_action('wpinv_payment_mode_select', 'wpinv_payment_mode_select');
 
 function wpinv_checkout_billing_info() {    
-    if ( wpinv_is_checkout() ) {
+    if (wpinv_is_checkout()) {
         $logged_in          = is_user_logged_in();
         $billing_details    = wpinv_checkout_billing_details();
-        $selected_country   = !empty( $billing_details['country'] ) ? $billing_details['country'] : wpinv_default_billing_country();
+        $selected_country   = !empty($billing_details['country']) ? $billing_details['country'] : wpinv_default_billing_country();
         ?>
         <div id="wpinv-fields" class="clearfix">
             <div id="wpi-billing" class="wpi-billing clearfix panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Billing Details', 'invoicing' );?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php _e('Billing Details', 'invoicing'); ?></h3></div>
                 <div id="wpinv-fields-box" class="panel-body">
-                    <?php do_action( 'wpinv_checkout_billing_fields_first', $billing_details ); ?>
+                    <?php do_action('wpinv_checkout_billing_fields_first', $billing_details); ?>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_first_name" class="wpi-label"><?php _e( 'First Name', 'invoicing' );?><?php if ( wpinv_get_option( 'fname_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_first_name" class="wpi-label"><?php _e('First Name', 'invoicing'); ?><?php if (wpinv_get_option('fname_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_first_name',
                                 'name'          => 'wpinv_first_name',
                                 'value'         => $billing_details['first_name'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'First name', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'fname_mandatory' ),
-                            ) );
+                                'placeholder'   => __('First name', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('fname_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_last_name" class="wpi-label"><?php _e( 'Last Name', 'invoicing' );?><?php if ( wpinv_get_option( 'lname_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_last_name" class="wpi-label"><?php _e('Last Name', 'invoicing'); ?><?php if (wpinv_get_option('lname_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_last_name',
                                 'name'          => 'wpinv_last_name',
                                 'value'         => $billing_details['last_name'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Last name', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'lname_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Last name', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('lname_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_address" class="wpi-label"><?php _e( 'Address', 'invoicing' );?><?php if ( wpinv_get_option( 'address_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_address" class="wpi-label"><?php _e('Address', 'invoicing'); ?><?php if (wpinv_get_option('address_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_address',
                                 'name'          => 'wpinv_address',
                                 'value'         => $billing_details['address'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Address', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'address_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Address', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('address_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_city" class="wpi-label"><?php _e( 'City', 'invoicing' );?><?php if ( wpinv_get_option( 'city_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_city" class="wpi-label"><?php _e('City', 'invoicing'); ?><?php if (wpinv_get_option('city_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_city',
                                 'name'          => 'wpinv_city',
                                 'value'         => $billing_details['city'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'City', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'city_mandatory' ),
-                            ) );
+                                'placeholder'   => __('City', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('city_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p id="wpinv_country_box" class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_country" class="wpi-label"><?php _e( 'Country', 'invoicing' );?><?php if ( wpinv_get_option( 'country_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
-                        <?php echo wpinv_html_select( array(
+                        <label for="wpinv_country" class="wpi-label"><?php _e('Country', 'invoicing'); ?><?php if (wpinv_get_option('country_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <?php echo wpinv_html_select(array(
                             'options'          => wpinv_get_country_list(),
                             'name'             => 'wpinv_country',
                             'id'               => 'wpinv_country',
@@ -1687,16 +1687,16 @@ 
                             'show_option_all'  => false,
                             'show_option_none' => false,
                             'class'            => 'wpi-input form-control',
-                            'placeholder'      => __( 'Choose a country', 'invoicing' ),
-                            'required'         => (bool)wpinv_get_option( 'country_mandatory' ),
-                        ) ); ?>
+                            'placeholder'      => __('Choose a country', 'invoicing'),
+                            'required'         => (bool)wpinv_get_option('country_mandatory'),
+                        )); ?>
                     </p>
                     <p id="wpinv_state_box" class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_state" class="wpi-label"><?php _e( 'State / Province', 'invoicing' );?><?php if ( wpinv_get_option( 'state_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_state" class="wpi-label"><?php _e('State / Province', 'invoicing'); ?><?php if (wpinv_get_option('state_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        $states = wpinv_get_country_states( $selected_country );
-                        if( !empty( $states ) ) {
-                            echo wpinv_html_select( array(
+                        $states = wpinv_get_country_states($selected_country);
+                        if (!empty($states)) {
+                            echo wpinv_html_select(array(
                                 'options'          => $states,
                                 'name'             => 'wpinv_state',
                                 'id'               => 'wpinv_state',
@@ -1704,61 +1704,61 @@ 
                                 'show_option_all'  => false,
                                 'show_option_none' => false,
                                 'class'            => 'wpi-input form-control',
-                                'placeholder'      => __( 'Choose a state', 'invoicing' ),
-                                'required'         => (bool)wpinv_get_option( 'state_mandatory' ),
-                            ) );
+                                'placeholder'      => __('Choose a state', 'invoicing'),
+                                'required'         => (bool)wpinv_get_option('state_mandatory'),
+                            ));
                         } else {
-                            echo wpinv_html_text( array(
+                            echo wpinv_html_text(array(
                                 'name'          => 'wpinv_state',
                                 'value'         => $billing_details['state'],
                                 'id'            => 'wpinv_state',
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'State / Province', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'state_mandatory' ),
-                            ) );
+                                'placeholder'   => __('State / Province', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('state_mandatory'),
+                            ));
                         }
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_zip" class="wpi-label"><?php _e( 'ZIP / Postcode', 'invoicing' );?><?php if ( wpinv_get_option( 'zip_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_zip" class="wpi-label"><?php _e('ZIP / Postcode', 'invoicing'); ?><?php if (wpinv_get_option('zip_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'name'          => 'wpinv_zip',
                                 'value'         => $billing_details['zip'],
                                 'id'            => 'wpinv_zip',
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'ZIP / Postcode', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'zip_mandatory' ),
-                            ) );
+                                'placeholder'   => __('ZIP / Postcode', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('zip_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_phone" class="wpi-label"><?php _e( 'Phone', 'invoicing' );?><?php if ( wpinv_get_option( 'phone_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_phone" class="wpi-label"><?php _e('Phone', 'invoicing'); ?><?php if (wpinv_get_option('phone_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_phone',
                                 'name'          => 'wpinv_phone',
                                 'value'         => $billing_details['phone'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Phone', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'phone_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Phone', 'invoicing'),
+                                'required'      => (bool)wpinv_get_option('phone_mandatory'),
+                            ));
                         ?>
                     </p>
-                    <?php do_action( 'wpinv_checkout_billing_fields_last', $billing_details ); ?>
+                    <?php do_action('wpinv_checkout_billing_fields_last', $billing_details); ?>
                     <div class="clearfix"></div>
                 </div>
             </div>
-            <?php do_action( 'wpinv_after_billing_fields', $billing_details ); ?>
+            <?php do_action('wpinv_after_billing_fields', $billing_details); ?>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_checkout_billing_info', 'wpinv_checkout_billing_info' );
+add_action('wpinv_checkout_billing_info', 'wpinv_checkout_billing_info');
 
 function wpinv_checkout_hidden_fields() {
 ?>
-    <?php if ( is_user_logged_in() ) { ?>
+    <?php if (is_user_logged_in()) { ?>
     <input type="hidden" name="wpinv_user_id" value="<?php echo get_current_user_id(); ?>"/>
     <?php } ?>
     <input type="hidden" name="wpi_action" value="payment" />
@@ -1768,9 +1768,9 @@ 
 function wpinv_checkout_button_purchase() {
     ob_start();
 ?>
-    <input type="submit" class="btn btn-success wpinv-submit" id="wpinv-payment-button" data-value="<?php esc_attr_e( 'Proceed to Pay', 'invoicing' ) ?>" name="wpinv_payment" value="<?php esc_attr_e( 'Proceed to Pay', 'invoicing' ) ?>"/>
+    <input type="submit" class="btn btn-success wpinv-submit" id="wpinv-payment-button" data-value="<?php esc_attr_e('Proceed to Pay', 'invoicing') ?>" name="wpinv_payment" value="<?php esc_attr_e('Proceed to Pay', 'invoicing') ?>"/>
 <?php
-    return apply_filters( 'wpinv_checkout_button_purchase', ob_get_clean() );
+    return apply_filters('wpinv_checkout_button_purchase', ob_get_clean());
 }
 
 function wpinv_checkout_total() {
@@ -1779,96 +1779,96 @@ 
 <div id="wpinv_checkout_total" class="panel panel-info">
     <div class="panel-body">
     <?php
-    do_action( 'wpinv_purchase_form_before_checkout_total' );
+    do_action('wpinv_purchase_form_before_checkout_total');
     ?>
-    <strong><?php _e( 'Invoice Total:', 'invoicing' ) ?></strong> <span class="wpinv-chdeckout-total"><?php echo $cart_total;?></span>
+    <strong><?php _e('Invoice Total:', 'invoicing') ?></strong> <span class="wpinv-chdeckout-total"><?php echo $cart_total; ?></span>
     <?php
-    do_action( 'wpinv_purchase_form_after_checkout_total' );
+    do_action('wpinv_purchase_form_after_checkout_total');
     ?>
     </div>
 </div>
 <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_total', 9998 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_total', 9998);
 
 function wpinv_checkout_submit() {
 ?>
 <div id="wpinv_purchase_submit" class="panel panel-success">
     <div class="panel-body text-center">
     <?php
-    do_action( 'wpinv_purchase_form_before_submit' );
+    do_action('wpinv_purchase_form_before_submit');
     wpinv_checkout_hidden_fields();
     echo wpinv_checkout_button_purchase();
-    do_action( 'wpinv_purchase_form_after_submit' );
+    do_action('wpinv_purchase_form_after_submit');
     ?>
     </div>
 </div>
 <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_submit', 9999 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_submit', 9999);
 
-function wpinv_receipt_billing_address( $invoice_id = 0 ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_receipt_billing_address($invoice_id = 0) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $billing_details = $invoice->get_user_info();
     $address_row = '';
-    if ( $address = $billing_details['address'] ) {
-        $address_row .= wpautop( wp_kses_post( $address ) );
+    if ($address = $billing_details['address']) {
+        $address_row .= wpautop(wp_kses_post($address));
     }
     
     $address_fields = array();
-    if ( !empty( $billing_details['city'] ) ) {
+    if (!empty($billing_details['city'])) {
         $address_fields[] = $billing_details['city'];
     }
     
-    $billing_country = !empty( $billing_details['country'] ) ? $billing_details['country'] : '';
-    if ( !empty( $billing_details['state'] ) ) {
-        $address_fields[] = wpinv_state_name( $billing_details['state'], $billing_country );
+    $billing_country = !empty($billing_details['country']) ? $billing_details['country'] : '';
+    if (!empty($billing_details['state'])) {
+        $address_fields[] = wpinv_state_name($billing_details['state'], $billing_country);
     }
     
-    if ( !empty( $billing_country ) ) {
-        $address_fields[] = wpinv_country_name( $billing_country );
+    if (!empty($billing_country)) {
+        $address_fields[] = wpinv_country_name($billing_country);
     }
     
-    if ( !empty( $address_fields ) ) {
-        $address_fields = implode( ", ", $address_fields );
+    if (!empty($address_fields)) {
+        $address_fields = implode(", ", $address_fields);
         
-        if ( !empty( $billing_details['zip'] ) ) {
+        if (!empty($billing_details['zip'])) {
             $address_fields .= ' ' . $billing_details['zip'];
         }
         
-        $address_row .= wpautop( wp_kses_post( $address_fields ) );
+        $address_row .= wpautop(wp_kses_post($address_fields));
     }
     ob_start();
     ?>
     <table class="table table-bordered table-sm wpi-billing-details">
         <tbody>
             <tr class="wpi-receipt-name">
-                <th class="text-left"><?php _e( 'Name', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( trim( $billing_details['first_name'] . ' ' . $billing_details['last_name'] ) ) ;?></td>
+                <th class="text-left"><?php _e('Name', 'invoicing'); ?></th>
+                <td><?php echo esc_html(trim($billing_details['first_name'] . ' ' . $billing_details['last_name'])); ?></td>
             </tr>
             <tr class="wpi-receipt-email">
-                <th class="text-left"><?php _e( 'Email', 'invoicing' ); ?></th>
-                <td><?php echo $billing_details['email'] ;?></td>
+                <th class="text-left"><?php _e('Email', 'invoicing'); ?></th>
+                <td><?php echo $billing_details['email']; ?></td>
             </tr>
-            <?php if ( $billing_details['company'] ) { ?>
+            <?php if ($billing_details['company']) { ?>
             <tr class="wpi-receipt-company">
-                <th class="text-left"><?php _e( 'Company', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $billing_details['company'] ) ;?></td>
+                <th class="text-left"><?php _e('Company', 'invoicing'); ?></th>
+                <td><?php echo esc_html($billing_details['company']); ?></td>
             </tr>
             <?php } ?>
             <tr class="wpi-receipt-address">
-                <th class="text-left"><?php _e( 'Address', 'invoicing' ); ?></th>
-                <td><?php echo $address_row ;?></td>
+                <th class="text-left"><?php _e('Address', 'invoicing'); ?></th>
+                <td><?php echo $address_row; ?></td>
             </tr>
-            <?php if ( $billing_details['phone'] ) { ?>
+            <?php if ($billing_details['phone']) { ?>
             <tr class="wpi-receipt-phone">
-                <th class="text-left"><?php _e( 'Phone', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $billing_details['phone'] ) ;?></td>
+                <th class="text-left"><?php _e('Phone', 'invoicing'); ?></th>
+                <td><?php echo esc_html($billing_details['phone']); ?></td>
             </tr>
             <?php } ?>
         </tbody>
@@ -1876,103 +1876,103 @@ 
     <?php
     $output = ob_get_clean();
     
-    $output = apply_filters( 'wpinv_receipt_billing_address', $output, $invoice_id );
+    $output = apply_filters('wpinv_receipt_billing_address', $output, $invoice_id);
 
     echo $output;
 }
 
-function wpinv_filter_success_page_content( $content ) {
-    if ( isset( $_GET['payment-confirm'] ) && wpinv_is_success_page() ) {
-        if ( has_filter( 'wpinv_payment_confirm_' . sanitize_text_field( $_GET['payment-confirm'] ) ) ) {
-            $content = apply_filters( 'wpinv_payment_confirm_' . sanitize_text_field( $_GET['payment-confirm'] ), $content );
+function wpinv_filter_success_page_content($content) {
+    if (isset($_GET['payment-confirm']) && wpinv_is_success_page()) {
+        if (has_filter('wpinv_payment_confirm_' . sanitize_text_field($_GET['payment-confirm']))) {
+            $content = apply_filters('wpinv_payment_confirm_' . sanitize_text_field($_GET['payment-confirm']), $content);
         }
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_filter_success_page_content', 99999 );
+add_filter('the_content', 'wpinv_filter_success_page_content', 99999);
 
-function wpinv_receipt_actions( $invoice ) {
-    if ( !empty( $invoice ) ) {
+function wpinv_receipt_actions($invoice) {
+    if (!empty($invoice)) {
         $actions = array();
 
-        if ( wpinv_user_can_view_invoice( $invoice->ID ) ) {
-            $actions['print']   = array(
-                'url'  => $invoice->get_view_url( true ),
-                'name' => __( 'Print Invoice', 'invoicing' ),
+        if (wpinv_user_can_view_invoice($invoice->ID)) {
+            $actions['print'] = array(
+                'url'  => $invoice->get_view_url(true),
+                'name' => __('Print Invoice', 'invoicing'),
                 'class' => 'btn-primary',
             );
         }
 
-        if ( is_user_logged_in() ) {
+        if (is_user_logged_in()) {
             $actions['history'] = array(
                 'url'  => wpinv_get_history_page_uri(),
-                'name' => __( 'Invoice History', 'invoicing' ),
+                'name' => __('Invoice History', 'invoicing'),
                 'class' => 'btn-warning',
             );
         }
 
-        $actions = apply_filters( 'wpinv_invoice_receipt_actions', $actions, $invoice );
+        $actions = apply_filters('wpinv_invoice_receipt_actions', $actions, $invoice);
         
-        if ( !empty( $actions ) ) {
+        if (!empty($actions)) {
         ?>
         <div class="wpinv-receipt-actions text-right">
-            <?php foreach ( $actions as $key => $action ) { $class = !empty($action['class']) ? sanitize_html_class( $action['class'] ) : ''; ?>
-            <a href="<?php echo esc_url( $action['url'] );?>" class="btn btn-sm <?php echo $class . ' ' . sanitize_html_class( $key );?>" <?php echo ( !empty($action['attrs']) ? $action['attrs'] : '' ) ;?>><?php echo esc_html( $action['name'] );?></a>
+            <?php foreach ($actions as $key => $action) { $class = !empty($action['class']) ? sanitize_html_class($action['class']) : ''; ?>
+            <a href="<?php echo esc_url($action['url']); ?>" class="btn btn-sm <?php echo $class . ' ' . sanitize_html_class($key); ?>" <?php echo (!empty($action['attrs']) ? $action['attrs'] : ''); ?>><?php echo esc_html($action['name']); ?></a>
             <?php } ?>
         </div>
         <?php
         }
     }
 }
-add_action( 'wpinv_receipt_start', 'wpinv_receipt_actions', -10, 1 );
+add_action('wpinv_receipt_start', 'wpinv_receipt_actions', -10, 1);
 
-function wpinv_invoice_link( $invoice_id ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_invoice_link($invoice_id) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
-    $invoice_link = '<a href="' . esc_url( $invoice->get_view_url() ) . '">' . $invoice->get_number() . '</a>';
+    $invoice_link = '<a href="' . esc_url($invoice->get_view_url()) . '">' . $invoice->get_number() . '</a>';
     
-    return apply_filters( 'wpinv_get_invoice_link', $invoice_link, $invoice );
+    return apply_filters('wpinv_get_invoice_link', $invoice_link, $invoice);
 }
 
-function wpinv_invoice_subscription_details( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->is_recurring() && !wpinv_is_subscription_payment( $invoice ) ) {
+function wpinv_invoice_subscription_details($invoice) {
+    if (!empty($invoice) && $invoice->is_recurring() && !wpinv_is_subscription_payment($invoice)) {
         $total_payments = (int)$invoice->get_total_payments();
         $payments       = $invoice->get_child_payments();
         
         $subscription   = $invoice->get_subscription_data();
         
-        if ( !( !empty( $subscription ) && !empty( $subscription['item_id'] ) ) ) {
+        if (!(!empty($subscription) && !empty($subscription['item_id']))) {
             return;
         }
         
-        $billing_cycle  = wpinv_get_billing_cycle( $subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency() );
-        $times_billed   = $total_payments . ' / ' . ( ( (int)$subscription['bill_times'] == 0 ) ? __( 'Until cancelled', 'invoicing' ) : $subscription['bill_times'] );
+        $billing_cycle  = wpinv_get_billing_cycle($subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency());
+        $times_billed   = $total_payments . ' / ' . (((int)$subscription['bill_times'] == 0) ? __('Until cancelled', 'invoicing') : $subscription['bill_times']);
         
         $subscription_status = $invoice->get_subscription_status();
         
         $status_desc = '';
-        if ( $subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date() ) {
-            $status_desc = wp_sprintf( __( 'Until: %s', 'invoicing' ), $trial_end_date );
-        } else if ( $subscription_status == 'cancelled' && $cancelled_date = $invoice->get_cancelled_date() ) {
-            $status_desc = wp_sprintf( __( 'On: %s', 'invoicing' ), $cancelled_date );
+        if ($subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date()) {
+            $status_desc = wp_sprintf(__('Until: %s', 'invoicing'), $trial_end_date);
+        } else if ($subscription_status == 'cancelled' && $cancelled_date = $invoice->get_cancelled_date()) {
+            $status_desc = wp_sprintf(__('On: %s', 'invoicing'), $cancelled_date);
         }
         $status_desc = $status_desc != '' ? '<span class="meta">' . $status_desc . '</span>' : '';
         ?>
         <div class="wpinv-subscriptions-details">
-            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters( 'wpinv_subscription_details_title', __( 'Subscription Details', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters('wpinv_subscription_details_title', __('Subscription Details', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
-                        <th><?php _e( 'Billing Cycle', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Start Date', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Expiration Date', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Times Billed', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Status', 'invoicing' ) ;?></th>
+                        <th><?php _e('Billing Cycle', 'invoicing'); ?></th>
+                        <th><?php _e('Start Date', 'invoicing'); ?></th>
+                        <th><?php _e('Expiration Date', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Times Billed', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Status', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -1981,32 +1981,32 @@ 
                         <td><?php echo $invoice->get_subscription_start(); ?></td>
                         <td><?php echo $invoice->get_subscription_end(); ?></td>
                         <td class="text-center"><?php echo $times_billed; ?></td>
-                        <td class="text-center wpi-sub-status"><?php echo $invoice->get_subscription_status_label() ;?>
+                        <td class="text-center wpi-sub-status"><?php echo $invoice->get_subscription_status_label(); ?>
                         <?php echo $status_desc; ?>
                         </td>
                     </tr>
                 </tbody>
             </table>
         </div>
-        <?php if ( !empty( $payments ) ) { ?>
+        <?php if (!empty($payments)) { ?>
         <div class="wpinv-renewal-payments">
-            <h3 class="wpinv-renewals-t"><?php echo apply_filters( 'wpinv_renewal_payments_title', __( 'Renewal Payments', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-renewals-t"><?php echo apply_filters('wpinv_renewal_payments_title', __('Renewal Payments', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
                         <th>#</th>
-                        <th><?php _e( 'Invoice', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Date', 'invoicing' ) ;?></th>
-                        <th class="text-right"><?php _e( 'Amount', 'invoicing' ) ;?></th>
+                        <th><?php _e('Invoice', 'invoicing'); ?></th>
+                        <th><?php _e('Date', 'invoicing'); ?></th>
+                        <th class="text-right"><?php _e('Amount', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ( $payments as $key => $invoice_id ) { ?>
+                    <?php foreach ($payments as $key => $invoice_id) { ?>
                     <tr>
-                        <th scope="row"><?php echo ( $key + 1 );?></th>
-                        <td><?php echo wpinv_invoice_link( $invoice_id ) ;?></td>
-                        <td><?php echo wpinv_get_invoice_date( $invoice_id ); ?></td>
-                        <td class="text-right"><?php echo wpinv_payment_total( $invoice_id, true ); ?></td>
+                        <th scope="row"><?php echo ($key + 1); ?></th>
+                        <td><?php echo wpinv_invoice_link($invoice_id); ?></td>
+                        <td><?php echo wpinv_get_invoice_date($invoice_id); ?></td>
+                        <td class="text-right"><?php echo wpinv_payment_total($invoice_id, true); ?></td>
                     </tr>
                     <?php } ?>
                     <tr><td colspan="4" style="padding:0"></td></tr>
@@ -2018,52 +2018,52 @@ 
     }
 }
 
-function wpinv_cart_total_label( $label, $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_cart_total_label($label, $invoice) {
+    if (empty($invoice)) {
         return $label;
     }
     
     $prefix_label = '';
-    if ( $invoice->is_parent() && $item_id = $invoice->get_recurring() ) {        
-        $prefix_label   = '<span class="label label-primary label-recurring">' . __( 'Recurring Payment', 'invoicing' ) . '</span> ' . wpinv_subscription_payment_desc( $invoice );
-    } else if ( $invoice->is_renewal() ) {
-        $prefix_label   = '<span class="label label-primary label-renewal">' . __( 'Renewal Payment', 'invoicing' ) . '</span> ';        
+    if ($invoice->is_parent() && $item_id = $invoice->get_recurring()) {        
+        $prefix_label   = '<span class="label label-primary label-recurring">' . __('Recurring Payment', 'invoicing') . '</span> ' . wpinv_subscription_payment_desc($invoice);
+    } else if ($invoice->is_renewal()) {
+        $prefix_label   = '<span class="label label-primary label-renewal">' . __('Renewal Payment', 'invoicing') . '</span> ';        
     }
     
-    if ( $prefix_label != '' ) {
-        $label  = '<span class="wpinv-cart-sub-desc">' . $prefix_label . '</span> ' . $label;
+    if ($prefix_label != '') {
+        $label = '<span class="wpinv-cart-sub-desc">' . $prefix_label . '</span> ' . $label;
     }
     
     return $label;
 }
-add_filter( 'wpinv_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
-add_filter( 'wpinv_email_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
-add_filter( 'wpinv_print_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
+add_filter('wpinv_cart_total_label', 'wpinv_cart_total_label', 10, 2);
+add_filter('wpinv_email_cart_total_label', 'wpinv_cart_total_label', 10, 2);
+add_filter('wpinv_print_cart_total_label', 'wpinv_cart_total_label', 10, 2);
 
-add_action( 'wpinv_invoice_print_middle', 'wpinv_invoice_subscription_details', 10, 1 );
+add_action('wpinv_invoice_print_middle', 'wpinv_invoice_subscription_details', 10, 1);
 
-function wpinv_invoice_print_description( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_print_description($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
-    if ( $description = wpinv_get_invoice_description( $invoice->ID ) ) {
+    if ($description = wpinv_get_invoice_description($invoice->ID)) {
         ?>
         <div class="row wpinv-lower">
             <div class="col-sm-12 wpinv-description">
-                <?php echo wpautop( $description ); ?>
+                <?php echo wpautop($description); ?>
             </div>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_invoice_print_middle', 'wpinv_invoice_print_description', 10.1, 1 );
+add_action('wpinv_invoice_print_middle', 'wpinv_invoice_print_description', 10.1, 1);
 
-function wpinv_invoice_print_payment_info( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_print_payment_info($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
     
-    if ( $payments_info = wpinv_display_payments_info( $invoice->ID, false ) ) {
+    if ($payments_info = wpinv_display_payments_info($invoice->ID, false)) {
         ?>
         <div class="row wpinv-payments">
             <div class="col-sm-12">
@@ -2075,43 +2075,43 @@ 
 }
 // add_action( 'wpinv_invoice_print_after_line_items', 'wpinv_invoice_print_payment_info', 10, 1 );
 
-function wpinv_get_invoice_note_line_item( $note, $echo = true ) {
-    if ( empty( $note ) ) {
+function wpinv_get_invoice_note_line_item($note, $echo = true) {
+    if (empty($note)) {
         return NULL;
     }
     
-    if ( is_int( $note ) ) {
-        $note = get_comment( $note );
+    if (is_int($note)) {
+        $note = get_comment($note);
     }
     
-    if ( !( is_object( $note ) && is_a( $note, 'WP_Comment' ) ) ) {
+    if (!(is_object($note) && is_a($note, 'WP_Comment'))) {
         return NULL;
     }
     
-    $note_classes   = array( 'note' );
-    $note_classes[] = get_comment_meta( $note->comment_ID, '_wpi_customer_note', true ) ? 'customer-note' : '';
-    $note_classes[] = $note->comment_author === __( 'System', 'invoicing' ) ? 'system-note' : '';
-    $note_classes   = apply_filters( 'wpinv_invoice_note_class', array_filter( $note_classes ), $note );
-    $note_classes   = !empty( $note_classes ) ? implode( ' ', $note_classes ) : '';
+    $note_classes   = array('note');
+    $note_classes[] = get_comment_meta($note->comment_ID, '_wpi_customer_note', true) ? 'customer-note' : '';
+    $note_classes[] = $note->comment_author === __('System', 'invoicing') ? 'system-note' : '';
+    $note_classes   = apply_filters('wpinv_invoice_note_class', array_filter($note_classes), $note);
+    $note_classes   = !empty($note_classes) ? implode(' ', $note_classes) : '';
     
     ob_start();
     ?>
-    <li rel="<?php echo absint( $note->comment_ID ) ; ?>" class="<?php echo esc_attr( $note_classes ); ?>">
+    <li rel="<?php echo absint($note->comment_ID); ?>" class="<?php echo esc_attr($note_classes); ?>">
         <div class="note_content">
-            <?php echo wpautop( wptexturize( wp_kses_post( $note->comment_content ) ) ); ?>
+            <?php echo wpautop(wptexturize(wp_kses_post($note->comment_content))); ?>
         </div>
         <p class="meta">
-            <abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf( __( '%1$s - %2$s at %3$s', 'invoicing' ), $note->comment_author, date_i18n( get_option( 'date_format' ), strtotime( $note->comment_date ) ), date_i18n( get_option( 'time_format' ), strtotime( $note->comment_date ) ) ); ?></abbr>&nbsp;&nbsp;
-            <?php if($note->comment_author !== 'System') {?>
-                <a href="#" class="delete_note"><?php _e( 'Delete note', 'invoicing' ); ?></a>
+            <abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf(__('%1$s - %2$s at %3$s', 'invoicing'), $note->comment_author, date_i18n(get_option('date_format'), strtotime($note->comment_date)), date_i18n(get_option('time_format'), strtotime($note->comment_date))); ?></abbr>&nbsp;&nbsp;
+            <?php if ($note->comment_author !== 'System') {?>
+                <a href="#" class="delete_note"><?php _e('Delete note', 'invoicing'); ?></a>
             <?php } ?>
         </p>
     </li>
     <?php
     $note_content = ob_get_clean();
-    $note_content = apply_filters( 'wpinv_get_invoice_note_line_item', $note_content, $note, $echo );
+    $note_content = apply_filters('wpinv_get_invoice_note_line_item', $note_content, $note, $echo);
     
-    if ( $echo ) {
+    if ($echo) {
         echo $note_content;
     } else {
         return $note_content;
@@ -2121,33 +2121,33 @@ 
 function wpinv_invalid_invoice_content() {
     global $post;
 
-    $invoice = wpinv_get_invoice( $post->ID );
+    $invoice = wpinv_get_invoice($post->ID);
 
-    $error = __( 'This invoice is only viewable by clicking on the invoice link that sent to you via email.', 'invoicing' );
-    if ( !empty( $invoice->ID ) && $invoice->has_status( array_keys( wpinv_get_invoice_statuses() ) ) ) {
-        if ( is_user_logged_in() ) {
-            if ( wpinv_require_login_to_checkout() ) {
-                if ( isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-                    $error = __( 'You are not allowed to view this invoice.', 'invoicing' );
+    $error = __('This invoice is only viewable by clicking on the invoice link that sent to you via email.', 'invoicing');
+    if (!empty($invoice->ID) && $invoice->has_status(array_keys(wpinv_get_invoice_statuses()))) {
+        if (is_user_logged_in()) {
+            if (wpinv_require_login_to_checkout()) {
+                if (isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+                    $error = __('You are not allowed to view this invoice.', 'invoicing');
                 }
             }
         } else {
-            if ( wpinv_require_login_to_checkout() ) {
-                if ( isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-                    $error = __( 'You must be logged in to view this invoice.', 'invoicing' );
+            if (wpinv_require_login_to_checkout()) {
+                if (isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+                    $error = __('You must be logged in to view this invoice.', 'invoicing');
                 }
             }
         }
     } else {
-        $error = __( 'This invoice is deleted or does not exist.', 'invoicing' );
+        $error = __('This invoice is deleted or does not exist.', 'invoicing');
     }
     ?>
     <div class="row wpinv-row-invalid">
         <div class="col-md-6 col-md-offset-3 wpinv-message error">
-            <h3><?php _e( 'Access Denied', 'invoicing' ); ?></h3>
+            <h3><?php _e('Access Denied', 'invoicing'); ?></h3>
             <p class="wpinv-msg-text"><?php echo $error; ?></p>
         </div>
     </div>
     <?php
 }
-add_action( 'wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content' );
\ No newline at end of file
+add_action('wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content');
\ No newline at end of file