AyeCode / invoicing

includes/class-wpinv-cli.php

Spacing +16 added lines, -16 removed lines

@@ -7,7 +7,7 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -24,40 +24,40 @@ 
      *  @param Array $assoc_args Key value arguments stored in associated array format.
      *  @since 1.0.13
      */
-    public function insert_invoice( $args, $assoc_args ) {
+    public function insert_invoice($args, $assoc_args) {
 
         // Fetch invoice data from the args
-        $invoice_data = wp_unslash( $assoc_args );
+        $invoice_data = wp_unslash($assoc_args);
 
         // Abort if no invoice data is provided
-        if( empty( $invoice_data ) ) {
-            return WP_CLI::error( __( 'Invoice data not provided', 'invoicing' ) );
+        if (empty($invoice_data)) {
+            return WP_CLI::error(__('Invoice data not provided', 'invoicing'));
         }
 
         //Cart details
-        if( !empty( $invoice_data['cart_details'] ) ) {
-            $invoice_data['cart_details'] = json_decode( $invoice_data['cart_details'], true );
+        if (!empty($invoice_data['cart_details'])) {
+            $invoice_data['cart_details'] = json_decode($invoice_data['cart_details'], true);
         }
 
         //User details
-        if( !empty( $invoice_data['user_info'] ) ) {
-            $invoice_data['user_info'] = json_decode( $invoice_data['user_info'], true );
+        if (!empty($invoice_data['user_info'])) {
+            $invoice_data['user_info'] = json_decode($invoice_data['user_info'], true);
         }
 
         //Payment info
-        if( !empty( $invoice_data['payment_details'] ) ) {
-            $invoice_data['payment_details'] = json_decode( $invoice_data['payment_details'], true );
+        if (!empty($invoice_data['payment_details'])) {
+            $invoice_data['payment_details'] = json_decode($invoice_data['payment_details'], true);
         }
 
         // Try creating the invoice
-        $invoice = wpinv_insert_invoice( $invoice_data, true );
+        $invoice = wpinv_insert_invoice($invoice_data, true);
 
-        if ( is_wp_error( $invoice ) ) {
-            return WP_CLI::error( $invoice->get_error_message() );
+        if (is_wp_error($invoice)) {
+            return WP_CLI::error($invoice->get_error_message());
         }
 
-        $message = sprintf( __( 'Invoice %s created', 'invoicing' ), $invoice->ID );
-        WP_CLI::success( $message );
+        $message = sprintf(__('Invoice %s created', 'invoicing'), $invoice->ID);
+        WP_CLI::success($message);
     }
     
     

widgets/invoice-history.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -24,15 +24,15 @@ 
             'block-keywords'=> "['invoicing','history']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_history',
-            'name'          => __('Invoicing > Invoice History','invoicing'),
+            'name'          => __('Invoicing > Invoice History', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-history-class',
-                'description' => esc_html__('Displays invoice history.','invoicing'),
+                'description' => esc_html__('Displays invoice history.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -43,7 +43,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -55,13 +55,13 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    ob_start();
 
-	    do_action( 'wpinv_before_user_invoice_history' );
-	    wpinv_get_template_part( 'wpinv-invoice-history' );
-	    do_action( 'wpinv_after_user_invoice_history' );
+	    do_action('wpinv_before_user_invoice_history');
+	    wpinv_get_template_part('wpinv-invoice-history');
+	    do_action('wpinv_after_user_invoice_history');
 
 	    $output = ob_get_clean();
 	    return trim($output);

widgets/invoice-messages.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -22,15 +22,15 @@ 
             'block-keywords'=> "['invoicing','history']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_messages',
-            'name'          => __('Invoicing > Invoice Messages','invoicing'),
+            'name'          => __('Invoicing > Invoice Messages', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-messages-class',
-                'description' => esc_html__('Displays invoice error and warning messages on checkout page.','invoicing'),
+                'description' => esc_html__('Displays invoice error and warning messages on checkout page.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -41,7 +41,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -53,7 +53,7 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    ob_start();
 

widgets/checkout.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -24,15 +24,15 @@ 
             'block-keywords'=> "['invoicing','checkout']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_checkout',
-            'name'          => __('Invoicing > Checkout','invoicing'),
+            'name'          => __('Invoicing > Checkout', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-checkout-class',
-                'description' => esc_html__('Displays checkout form.','invoicing'),
+                'description' => esc_html__('Displays checkout form.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -43,7 +43,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -55,7 +55,7 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    return wpinv_checkout_form();
 

widgets/subscriptions.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -24,15 +24,15 @@ 
             'block-keywords'=> "['invoicing','subscriptions']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_subscriptions',
-            'name'          => __('Invoicing > Subscriptions History','invoicing'),
+            'name'          => __('Invoicing > Subscriptions History', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-checkout-class',
-                'description' => esc_html__('Displays subscriptions history.','invoicing'),
+                'description' => esc_html__('Displays subscriptions history.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -43,7 +43,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -55,13 +55,13 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    ob_start();
 
-	    do_action( 'wpinv_before_user_subscriptions' );
-	    wpinv_get_template_part( 'wpinv-subscriptions-history' );
-	    do_action( 'wpinv_after_user_subscriptions' );
+	    do_action('wpinv_before_user_subscriptions');
+	    wpinv_get_template_part('wpinv-subscriptions-history');
+	    do_action('wpinv_after_user_subscriptions');
 
 	    $output = ob_get_clean();
 	    return trim($output);

widgets/invoice-receipt.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -22,15 +22,15 @@ 
             'block-keywords'=> "['invoicing','receipt']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_receipt',
-            'name'          => __('Invoicing > Invoice Receipt','invoicing'),
+            'name'          => __('Invoicing > Invoice Receipt', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-receipt-class',
-                'description' => esc_html__('Displays invoice receipt after checkout.','invoicing'),
+                'description' => esc_html__('Displays invoice receipt after checkout.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
@@ -41,7 +41,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -53,13 +53,13 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    ob_start();
 
-	    do_action( 'wpinv_success_content_before' );
-	    echo wpinv_payment_receipt( $args );
-	    do_action( 'wpinv_success_content_after' );
+	    do_action('wpinv_success_content_before');
+	    echo wpinv_payment_receipt($args);
+	    do_action('wpinv_success_content_after');
 
 	    $output = ob_get_clean();
 	    return trim($output);

includes/wpinv-address-functions.php

Spacing +994 added lines, -994 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 wpi_select2',
-			'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,10 +1563,10 @@ 
 	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);
 }
 
 /**
@@ -1589,7 +1589,7 @@ 
 	 *
 	 * @param string $format  The address format to use.
 	 */
-    return apply_filters( 'wpinv_get_full_address_format', $format );
+    return apply_filters('wpinv_get_full_address_format', $format);
 }
 
 /**
@@ -1600,7 +1600,7 @@ 
  * @param array $billing_details customer's billing details
  * @return array
  */
-function wpinv_get_invoice_address_replacements( $billing_details ) {
+function wpinv_get_invoice_address_replacements($billing_details) {
 
     $replacements = array(
         'address'        => '',
@@ -1611,26 +1611,26 @@ 
         'zip'            => '',
     );
 
-    if( ! empty( $billing_details['address'] ) ) {
-        $replacements['address'] = sanitize_text_field( $billing_details['address'] );
+    if (!empty($billing_details['address'])) {
+        $replacements['address'] = sanitize_text_field($billing_details['address']);
     }
 
-    if( ! empty( $billing_details['city'] ) ) {
-        $replacements['city'] = sanitize_text_field( $billing_details['city'] );
+    if (!empty($billing_details['city'])) {
+        $replacements['city'] = sanitize_text_field($billing_details['city']);
     }
 
-    if( ! empty( $billing_details['zip'] ) ) {
-        $replacements['zip'] = sanitize_text_field( $billing_details['zip'] );
+    if (!empty($billing_details['zip'])) {
+        $replacements['zip'] = sanitize_text_field($billing_details['zip']);
     }
     
-    $billing_country = !empty( $billing_details['country'] ) ? $billing_details['country'] : '';
-    if ( !empty( $billing_details['state'] ) ) {
-        $replacements['state'] = sanitize_text_field( wpinv_state_name( $billing_details['state'], $billing_country ) );
+    $billing_country = !empty($billing_details['country']) ? $billing_details['country'] : '';
+    if (!empty($billing_details['state'])) {
+        $replacements['state'] = sanitize_text_field(wpinv_state_name($billing_details['state'], $billing_country));
     }
 
-    if ( !empty( $billing_country ) ) {
-        $replacements['country']      = wpinv_country_name( $billing_country );
-        $replacements['country_code'] = sanitize_text_field( $billing_country );
+    if (!empty($billing_country)) {
+        $replacements['country']      = wpinv_country_name($billing_country);
+        $replacements['country_code'] = sanitize_text_field($billing_country);
     }
     
     /**
@@ -1642,5 +1642,5 @@ 
 	 * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
 	 */
-    return apply_filters( 'wpinv_get_invoice_address_replacements', $replacements, $billing_details );
+    return apply_filters('wpinv_get_invoice_address_replacements', $replacements, $billing_details);
 }
\ No newline at end of file

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

Spacing +18 added lines, -18 removed lines

@@ -1,41 +1,41 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_before_billing_details', $invoice ); ?>
+do_action('wpinv_email_before_billing_details', $invoice); ?>
 <div id="wpinv-email-billing">
-    <h3 class="wpinv-address-t"><?php echo apply_filters( 'wpinv_email_billing_title', __( 'Billing Details', 'invoicing' ) ); ?></h3>
+    <h3 class="wpinv-address-t"><?php echo apply_filters('wpinv_email_billing_title', __('Billing Details', 'invoicing')); ?></h3>
 
     <table class="table table-bordered table-sm wpi-billing-details">
         <tbody>
-            <?php do_action( 'wpinv_email_billing_fields_first', $invoice ); ?>
+            <?php do_action('wpinv_email_billing_fields_first', $invoice); ?>
             <tr class="wpi-receipt-name">
-                <th class="text-left"><?php _e( 'Name', 'invoicing' ); ?></th>
-                <td><?php if ( $sent_to_admin && $invoice->user_id ) { ?><a href="<?php echo esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), self_admin_url( 'user-edit.php' ) ) ) ;?>"><?php echo esc_html( $invoice->get_user_full_name() ); ?></a><?php } else { echo esc_html( $invoice->get_user_full_name() ); } ?></td>
+                <th class="text-left"><?php _e('Name', 'invoicing'); ?></th>
+                <td><?php if ($sent_to_admin && $invoice->user_id) { ?><a href="<?php echo esc_url(add_query_arg('user_id', $invoice->get_user_id(), self_admin_url('user-edit.php'))); ?>"><?php echo esc_html($invoice->get_user_full_name()); ?></a><?php } else { echo esc_html($invoice->get_user_full_name()); } ?></td>
             </tr>
             <tr class="wpi-receipt-email">
-                <th class="text-left"><?php _e( 'Email', 'invoicing' ); ?></th>
-                <td><?php echo $invoice->get_email() ;?></td>
+                <th class="text-left"><?php _e('Email', 'invoicing'); ?></th>
+                <td><?php echo $invoice->get_email(); ?></td>
             </tr>
-            <?php if ( $invoice->company ) { ?>
+            <?php if ($invoice->company) { ?>
             <tr class="wpi-receipt-company">
-                <th class="text-left"><?php _e( 'Company', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $invoice->company ) ;?></td>
+                <th class="text-left"><?php _e('Company', 'invoicing'); ?></th>
+                <td><?php echo esc_html($invoice->company); ?></td>
             </tr>
             <?php } ?>
             <tr class="wpi-receipt-address">
-                <th class="text-left"><?php _e( 'Address', 'invoicing' ); ?></th>
-                <td><?php echo wpinv_get_invoice_address_markup( $invoice->get_user_info() ) ;?></td>
+                <th class="text-left"><?php _e('Address', 'invoicing'); ?></th>
+                <td><?php echo wpinv_get_invoice_address_markup($invoice->get_user_info()); ?></td>
             </tr>
-            <?php if ( $invoice->phone ) { ?>
+            <?php if ($invoice->phone) { ?>
             <tr class="wpi-receipt-phone">
-                <th class="text-left"><?php _e( 'Phone', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $invoice->phone ) ;?></td>
+                <th class="text-left"><?php _e('Phone', 'invoicing'); ?></th>
+                <td><?php echo esc_html($invoice->phone); ?></td>
             </tr>
             <?php } ?>
-            <?php do_action( 'wpinv_email_billing_fields_last', $invoice ); ?>
+            <?php do_action('wpinv_email_billing_fields_last', $invoice); ?>
         </tbody>
     </table>
 </div>
-<?php do_action( 'wpinv_email_after_billing_details', $invoice ); ?>
\ No newline at end of file
+<?php do_action('wpinv_email_after_billing_details', $invoice); ?>
\ No newline at end of file

includes/class-wpinv.php

Spacing +203 added lines, -203 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -32,31 +32,31 @@ 
     }
     
     public function define_constants() {
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
     }
     
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        if ( class_exists( 'BuddyPress' ) ) {
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        if (class_exists('BuddyPress')) {
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
+        add_action('widgets_init', array(&$this, 'register_widgets'));
 
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_action('admin_body_class', array(&$this, 'admin_body_class'));
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -66,19 +66,19 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
     
     public function plugins_loaded() {
         /* Internationalize the text strings used. */
         $this->load_textdomain();
 
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
 
         // Fix oxygen page builder conflict
-        if ( function_exists( 'ct_css_output' ) ) {
+        if (function_exists('ct_css_output')) {
             wpinv_oxygen_fix_conflict();
         }
     }
@@ -88,228 +88,228 @@ 
      *
      * @since 1.0
      */
-    public function load_textdomain( $locale = NULL ) {
-        if ( empty( $locale ) ) {
-            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+    public function load_textdomain($locale = NULL) {
+        if (empty($locale)) {
+            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
         }
 
-        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+        $locale = apply_filters('plugin_locale', $locale, 'invoicing');
         
-        unload_textdomain( 'invoicing' );
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        unload_textdomain('invoicing');
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
         
         /**
          * Define language constants.
          */
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
     }
         
     public function includes() {
         global $wpinv_options;
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
         
-        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-
-        if ( !class_exists( 'WPInv_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+
+        if (!class_exists('WPInv_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
         
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
         
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
             // load the user class only on the users.php page
             global $pagenow;
-            if($pagenow=='users.php'){
+            if ($pagenow == 'users.php') {
                 new WPInv_Admin_Users();
             }
         }
 
         // Register cli commands
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        if (defined('WP_CLI') && WP_CLI) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+            WP_CLI::add_command('invoicing', 'WPInv_CLI');
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
     
     public function init() {
     }
     
     public function admin_init() {
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_front_style' );
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_front_style');
                
         // Register scripts
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  WPINV_VERSION );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), WPINV_VERSION);
 
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_separator();
         $localize['decimal_sep']          = wpinv_decimal_separator();
         $localize['decimals']             = wpinv_decimals();
-        $localize['txtComplete']          = __( 'Complete', 'invoicing' );
+        $localize['txtComplete']          = __('Complete', 'invoicing');
         $localize['UseTaxes']             = wpinv_use_taxes();
-        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
 
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
+        wp_enqueue_script('jquery-blockui');
         $autofill_api = wpinv_get_option('address_autofill_api');
         $autofill_active = wpinv_get_option('address_autofill_active');
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-                wp_dequeue_script( 'google-maps-api' );
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+            if (wp_script_is('google-maps-api', 'enqueued')) {
+                wp_dequeue_script('google-maps-api');
             }
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('wpinv-front-script');
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
     }
 
     public function admin_enqueue_scripts() {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
+        $suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
 
         $jquery_ui_css = false;
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $jquery_ui_css = true;
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
             $jquery_ui_css = true;
         }
-        if ( $jquery_ui_css ) {
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-            wp_enqueue_style( 'jquery-ui-css' );
+        if ($jquery_ui_css) {
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+            wp_enqueue_style('jquery-ui-css');
         }
 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_admin_style' );
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_admin_style');
 
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
+        if ($page == 'wpinv-subscriptions') {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
 
         if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $autofill_api = wpinv_get_option('address_autofill_api');
@@ -320,20 +320,20 @@ 
             }
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  WPINV_VERSION );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), WPINV_VERSION);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -341,69 +341,69 @@ 
         $localize['thousand_sep']               = wpinv_thousands_separator();
         $localize['decimal_sep']                = wpinv_decimal_separator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
-
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
-
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
-
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
+        $localize['action_edit']                = __('Edit', 'invoicing');
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
+
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
+
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
+
+        if ($page == 'wpinv-subscriptions') {
+            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION);
+            wp_enqueue_script('wpinv-sub-admin-script');
         }
     }
     
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow, $post, $current_screen;
         
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote' ) ) {
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote')) {
             $classes .= ' wpinv-cpt';
         }
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
-        if ( $add_class ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
+        if ($add_class) {
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
             return $classes .= ' wpinv';
         }
         
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
             $classes .= ' wpi-editable-n';
         }
 
@@ -415,21 +415,21 @@ 
     }
     
     public function wpinv_actions() {
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        if (isset($_REQUEST['wpi_action'])) {
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         return $wp_query;
     }
     
     public function bp_invoicing_init() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
     }
 
 	/**
@@ -437,11 +437,11 @@ 
 	 *
 	 */
 	public function register_widgets() {
-		register_widget( "WPInv_Checkout_Widget" );
-		register_widget( "WPInv_History_Widget" );
-		register_widget( "WPInv_Receipt_Widget" );
-		register_widget( "WPInv_Subscriptions_Widget" );
-		register_widget( "WPInv_Buy_Item_Widget" );
-		register_widget( "WPInv_Messages_Widget" );
+		register_widget("WPInv_Checkout_Widget");
+		register_widget("WPInv_History_Widget");
+		register_widget("WPInv_Receipt_Widget");
+		register_widget("WPInv_Subscriptions_Widget");
+		register_widget("WPInv_Buy_Item_Widget");
+		register_widget("WPInv_Messages_Widget");
 	}
 }
\ No newline at end of file