AyeCode / invoicing

widgets/checkout.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,15 +23,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 wpi-g',
-                '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'     => '',
@@ -42,7 +42,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -54,7 +54,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/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  wpi-g',
-                '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/invoice-history.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','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 wpi-g',
-                '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'     => '',
@@ -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_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-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  wpi-g',
-                '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/libraries/wpinv-euvat/class-wpinv-euvat.php

Spacing +723 added lines, -723 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 class WPInv_EUVat {
     private static $is_ajax = false;
@@ -8,7 +8,7 @@ 
     private static $instance = false;
     
     public static function get_instance() {
-        if ( !self::$instance ) {
+        if (!self::$instance) {
             self::$instance = new self();
             self::$instance->actions();
         }
@@ -17,137 +17,137 @@ 
     }
     
     public function __construct() {
-        self::$is_ajax          = defined( 'DOING_AJAX' ) && DOING_AJAX;
+        self::$is_ajax          = defined('DOING_AJAX') && DOING_AJAX;
         self::$default_country  = wpinv_get_default_country();
     }
     
     public static function actions() {
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( self::$instance, 'enqueue_admin_scripts' ) );
-            add_action( 'wpinv_settings_sections_taxes', array( self::$instance, 'section_vat_settings' ) ); 
-            add_action( 'wpinv_settings_taxes', array( self::$instance, 'vat_settings' ) );
-            add_filter( 'wpinv_settings_taxes-vat_sanitize', array( self::$instance, 'sanitize_vat_settings' ) );
-            add_filter( 'wpinv_settings_taxes-vat_rates_sanitize', array( self::$instance, 'sanitize_vat_rates' ) );
-            add_action( 'wp_ajax_wpinv_add_vat_class', array( self::$instance, 'add_class' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_add_vat_class', array( self::$instance, 'add_class' ) );
-            add_action( 'wp_ajax_wpinv_delete_vat_class', array( self::$instance, 'delete_class' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_delete_vat_class', array( self::$instance, 'delete_class' ) );
-            add_action( 'wp_ajax_wpinv_update_vat_rates', array( self::$instance, 'update_eu_rates' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_update_vat_rates', array( self::$instance, 'update_eu_rates' ) );
-            add_action( 'wp_ajax_wpinv_geoip2', array( self::$instance, 'geoip2_download_database' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_geoip2', array( self::$instance, 'geoip2_download_database' ) );
-        }
-        
-        add_action( 'wp_enqueue_scripts', array( self::$instance, 'enqueue_vat_scripts' ) );
-        add_filter( 'wpinv_default_billing_country', array( self::$instance, 'get_user_country' ), 10 );
-        add_filter( 'wpinv_get_user_country', array( self::$instance, 'set_user_country' ), 10 );
-        add_action( 'wp_ajax_wpinv_vat_validate', array( self::$instance, 'ajax_vat_validate' ) );
-        add_action( 'wp_ajax_nopriv_wpinv_vat_validate', array( self::$instance, 'ajax_vat_validate' ) );
-        add_action( 'wp_ajax_wpinv_vat_reset', array( self::$instance, 'ajax_vat_reset' ) );
-        add_action( 'wp_ajax_nopriv_wpinv_vat_reset', array( self::$instance, 'ajax_vat_reset' ) );
-        add_action( 'wpinv_invoice_print_after_line_items', array( self::$instance, 'show_vat_notice' ), 999, 1 );
-        if ( wpinv_use_taxes() ) {
-            add_action( 'wpinv_after_billing_fields', array( self::$instance, 'checkout_vat_fields' ) );
-            if ( self::allow_vat_rules() ) {
-                add_action( 'wpinv_checkout_error_checks', array( self::$instance, 'checkout_vat_validate' ), 10, 2 );
-                add_filter( 'wpinv_tax_rate', array( self::$instance, 'get_rate' ), 10, 4 );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(self::$instance, 'enqueue_admin_scripts'));
+            add_action('wpinv_settings_sections_taxes', array(self::$instance, 'section_vat_settings')); 
+            add_action('wpinv_settings_taxes', array(self::$instance, 'vat_settings'));
+            add_filter('wpinv_settings_taxes-vat_sanitize', array(self::$instance, 'sanitize_vat_settings'));
+            add_filter('wpinv_settings_taxes-vat_rates_sanitize', array(self::$instance, 'sanitize_vat_rates'));
+            add_action('wp_ajax_wpinv_add_vat_class', array(self::$instance, 'add_class'));
+            add_action('wp_ajax_nopriv_wpinv_add_vat_class', array(self::$instance, 'add_class'));
+            add_action('wp_ajax_wpinv_delete_vat_class', array(self::$instance, 'delete_class'));
+            add_action('wp_ajax_nopriv_wpinv_delete_vat_class', array(self::$instance, 'delete_class'));
+            add_action('wp_ajax_wpinv_update_vat_rates', array(self::$instance, 'update_eu_rates'));
+            add_action('wp_ajax_nopriv_wpinv_update_vat_rates', array(self::$instance, 'update_eu_rates'));
+            add_action('wp_ajax_wpinv_geoip2', array(self::$instance, 'geoip2_download_database'));
+            add_action('wp_ajax_nopriv_wpinv_geoip2', array(self::$instance, 'geoip2_download_database'));
+        }
+        
+        add_action('wp_enqueue_scripts', array(self::$instance, 'enqueue_vat_scripts'));
+        add_filter('wpinv_default_billing_country', array(self::$instance, 'get_user_country'), 10);
+        add_filter('wpinv_get_user_country', array(self::$instance, 'set_user_country'), 10);
+        add_action('wp_ajax_wpinv_vat_validate', array(self::$instance, 'ajax_vat_validate'));
+        add_action('wp_ajax_nopriv_wpinv_vat_validate', array(self::$instance, 'ajax_vat_validate'));
+        add_action('wp_ajax_wpinv_vat_reset', array(self::$instance, 'ajax_vat_reset'));
+        add_action('wp_ajax_nopriv_wpinv_vat_reset', array(self::$instance, 'ajax_vat_reset'));
+        add_action('wpinv_invoice_print_after_line_items', array(self::$instance, 'show_vat_notice'), 999, 1);
+        if (wpinv_use_taxes()) {
+            add_action('wpinv_after_billing_fields', array(self::$instance, 'checkout_vat_fields'));
+            if (self::allow_vat_rules()) {
+                add_action('wpinv_checkout_error_checks', array(self::$instance, 'checkout_vat_validate'), 10, 2);
+                add_filter('wpinv_tax_rate', array(self::$instance, 'get_rate'), 10, 4);
             }
         }
     }        
     
-    public static function get_eu_states( $sort = true ) {
-        $eu_states = array( 'AT', 'BE', 'BG', 'HR', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GB', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE' );
-        if ( $sort ) {
-            $sort = sort( $eu_states );
+    public static function get_eu_states($sort = true) {
+        $eu_states = array('AT', 'BE', 'BG', 'HR', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GB', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE');
+        if ($sort) {
+            $sort = sort($eu_states);
         }
         
-        return apply_filters( 'wpinv_get_eu_states', $eu_states, $sort );
+        return apply_filters('wpinv_get_eu_states', $eu_states, $sort);
     }
     
-    public static function get_gst_countries( $sort = true ) {
-        $gst_countries  = array( 'AU', 'NZ', 'CA', 'CN' );
+    public static function get_gst_countries($sort = true) {
+        $gst_countries = array('AU', 'NZ', 'CA', 'CN');
         
-        if ( $sort ) {
-            $sort = sort( $gst_countries );
+        if ($sort) {
+            $sort = sort($gst_countries);
         }
         
-        return apply_filters( 'wpinv_get_gst_countries', $gst_countries, $sort );
+        return apply_filters('wpinv_get_gst_countries', $gst_countries, $sort);
     }
     
-    public static function is_eu_state( $country_code ) {
-        $return = !empty( $country_code ) && in_array( strtoupper( $country_code ), self::get_eu_states() ) ? true : false;
+    public static function is_eu_state($country_code) {
+        $return = !empty($country_code) && in_array(strtoupper($country_code), self::get_eu_states()) ? true : false;
                 
-        return apply_filters( 'wpinv_is_eu_state', $return, $country_code );
+        return apply_filters('wpinv_is_eu_state', $return, $country_code);
     }
     
-    public static function is_gst_country( $country_code ) {
-        $return = !empty( $country_code ) && in_array( strtoupper( $country_code ), self::get_gst_countries() ) ? true : false;
+    public static function is_gst_country($country_code) {
+        $return = !empty($country_code) && in_array(strtoupper($country_code), self::get_gst_countries()) ? true : false;
                 
-        return apply_filters( 'wpinv_is_gst_country', $return, $country_code );
+        return apply_filters('wpinv_is_gst_country', $return, $country_code);
     }
     
     public static function enqueue_vat_scripts() {
-        if( wpinv_use_taxes() && wpinv_get_option( 'apply_vat_rules' ) ) {
+        if (wpinv_use_taxes() && wpinv_get_option('apply_vat_rules')) {
             self::load_vat_scripts();
         }
     }
 
-    public static function load_vat_scripts(){
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+    public static function load_vat_scripts() {
+        $suffix = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
-        wp_register_script( 'wpinv-vat-validation-script', WPINV_PLUGIN_URL . 'assets/js/jsvat' . $suffix . '.js', array( 'jquery' ),  WPINV_VERSION );
-        wp_register_script( 'wpinv-vat-script', WPINV_PLUGIN_URL . 'assets/js/euvat' . $suffix . '.js', array( 'jquery' ),  WPINV_VERSION );
+        wp_register_script('wpinv-vat-validation-script', WPINV_PLUGIN_URL . 'assets/js/jsvat' . $suffix . '.js', array('jquery'), WPINV_VERSION);
+        wp_register_script('wpinv-vat-script', WPINV_PLUGIN_URL . 'assets/js/euvat' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        $vat_name   = self::get_vat_name();
+        $vat_name = self::get_vat_name();
 
         $vars = array();
         $vars['UseTaxes'] = wpinv_use_taxes();
         $vars['EUStates'] = self::get_eu_states();
-        $vars['NoRateSet'] = __( 'You have not set a rate. Do you want to continue?', 'invoicing' );
-        $vars['EmptyCompany'] = __( 'Please enter your registered company name!', 'invoicing' );
-        $vars['EmptyVAT'] = wp_sprintf( __( 'Please enter your %s number!', 'invoicing' ), $vat_name );
-        $vars['TotalsRefreshed'] = wp_sprintf( __( 'The invoice totals will be refreshed to update the %s.', 'invoicing' ), $vat_name );
-        $vars['ErrValidateVAT'] = wp_sprintf( __( 'Fail to validate the %s number!', 'invoicing' ), $vat_name );
-        $vars['ErrResetVAT'] = wp_sprintf( __( 'Fail to reset the %s number!', 'invoicing' ), $vat_name );
-        $vars['ErrInvalidVat'] = wp_sprintf( __( 'The %s number supplied does not have a valid format!', 'invoicing' ), $vat_name );
-        $vars['ErrInvalidResponse'] = __( 'An invalid response has been received from the server!', 'invoicing' );
+        $vars['NoRateSet'] = __('You have not set a rate. Do you want to continue?', 'invoicing');
+        $vars['EmptyCompany'] = __('Please enter your registered company name!', 'invoicing');
+        $vars['EmptyVAT'] = wp_sprintf(__('Please enter your %s number!', 'invoicing'), $vat_name);
+        $vars['TotalsRefreshed'] = wp_sprintf(__('The invoice totals will be refreshed to update the %s.', 'invoicing'), $vat_name);
+        $vars['ErrValidateVAT'] = wp_sprintf(__('Fail to validate the %s number!', 'invoicing'), $vat_name);
+        $vars['ErrResetVAT'] = wp_sprintf(__('Fail to reset the %s number!', 'invoicing'), $vat_name);
+        $vars['ErrInvalidVat'] = wp_sprintf(__('The %s number supplied does not have a valid format!', 'invoicing'), $vat_name);
+        $vars['ErrInvalidResponse'] = __('An invalid response has been received from the server!', 'invoicing');
         $vars['ApplyVATRules'] = $vars['UseTaxes'] ? self::allow_vat_rules() : false;
         $vars['HideVatFields'] = $vars['ApplyVATRules'] ? self::hide_vat_fields() : true;
-        $vars['ErrResponse'] = __( 'The request response is invalid!', 'invoicing' );
-        $vars['ErrRateResponse'] = __( 'The get rate request response is invalid', 'invoicing' );
-        $vars['PageRefresh'] = __( 'The page will be refreshed in 10 seconds to show the new options.', 'invoicing' );
-        $vars['RequestResponseNotValidJSON'] = __( 'The get rate request response is not valid JSON', 'invoicing' );
-        $vars['GetRateRequestFailed'] = __( 'The get rate request failed: ', 'invoicing' );
-        $vars['NoRateInformationInResponse'] = __( 'The get rate request response does not contain any rate information', 'invoicing' );
-        $vars['RatesUpdated'] = __( 'The rates have been updated. Press the save button to record these new rates.', 'invoicing' );
-        $vars['IPAddressInformation'] = __( 'IP Address Information', 'invoicing' );
-        $vars['VatValidating'] = wp_sprintf( __( 'Validating %s number...', 'invoicing' ), $vat_name );
-        $vars['VatReseting'] = __( 'Reseting...', 'invoicing' );
-        $vars['VatValidated'] = wp_sprintf( __( '%s number validated', 'invoicing' ), $vat_name );
-        $vars['VatNotValidated'] = wp_sprintf( __( '%s number not validated', 'invoicing' ), $vat_name );
-        $vars['ConfirmDeleteClass'] = __( 'Are you sure you wish to delete this rates class?', 'invoicing' );
+        $vars['ErrResponse'] = __('The request response is invalid!', 'invoicing');
+        $vars['ErrRateResponse'] = __('The get rate request response is invalid', 'invoicing');
+        $vars['PageRefresh'] = __('The page will be refreshed in 10 seconds to show the new options.', 'invoicing');
+        $vars['RequestResponseNotValidJSON'] = __('The get rate request response is not valid JSON', 'invoicing');
+        $vars['GetRateRequestFailed'] = __('The get rate request failed: ', 'invoicing');
+        $vars['NoRateInformationInResponse'] = __('The get rate request response does not contain any rate information', 'invoicing');
+        $vars['RatesUpdated'] = __('The rates have been updated. Press the save button to record these new rates.', 'invoicing');
+        $vars['IPAddressInformation'] = __('IP Address Information', 'invoicing');
+        $vars['VatValidating'] = wp_sprintf(__('Validating %s number...', 'invoicing'), $vat_name);
+        $vars['VatReseting'] = __('Reseting...', 'invoicing');
+        $vars['VatValidated'] = wp_sprintf(__('%s number validated', 'invoicing'), $vat_name);
+        $vars['VatNotValidated'] = wp_sprintf(__('%s number not validated', 'invoicing'), $vat_name);
+        $vars['ConfirmDeleteClass'] = __('Are you sure you wish to delete this rates class?', 'invoicing');
         $vars['isFront'] = is_admin() ? false : true;
         $vars['baseCountry'] = wpinv_get_default_country();
-        $vars['disableVATSameCountry'] = ( self::same_country_rule() == 'no' ? true : false );
-        $vars['disableVATSimpleCheck'] = wpinv_get_option( 'vat_offline_check' ) ? true : false;
+        $vars['disableVATSameCountry'] = (self::same_country_rule() == 'no' ? true : false);
+        $vars['disableVATSimpleCheck'] = wpinv_get_option('vat_offline_check') ? true : false;
 
-        wp_enqueue_script( 'wpinv-vat-validation-script' );
-        wp_enqueue_script( 'wpinv-vat-script' );
-        wp_localize_script( 'wpinv-vat-script', 'WPInv_VAT_Vars', $vars );
+        wp_enqueue_script('wpinv-vat-validation-script');
+        wp_enqueue_script('wpinv-vat-script');
+        wp_localize_script('wpinv-vat-script', 'WPInv_VAT_Vars', $vars);
     }
 
     public static function enqueue_admin_scripts() {
-        if( isset( $_GET['page'] ) && 'wpinv-settings' == $_GET['page'] ) {
+        if (isset($_GET['page']) && 'wpinv-settings' == $_GET['page']) {
             self::load_vat_scripts();
         }
     }
     
-    public static function section_vat_settings( $sections ) {
-        if ( !empty( $sections ) ) {
-            $sections['vat'] = __( 'EU VAT Settings', 'invoicing' );
+    public static function section_vat_settings($sections) {
+        if (!empty($sections)) {
+            $sections['vat'] = __('EU VAT Settings', 'invoicing');
             
-            if ( self::allow_vat_classes() ) {
-                $sections['vat_rates'] = __( 'EU VAT Rates', 'invoicing' );
+            if (self::allow_vat_classes()) {
+                $sections['vat_rates'] = __('EU VAT Rates', 'invoicing');
             }
         }
         return $sections;
@@ -156,52 +156,52 @@ 
     public static function vat_rates_settings() {
         $vat_classes = self::get_rate_classes();
         $vat_rates = array();
-        $vat_class = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '_new';
-        $current_url = remove_query_arg( 'wpi_sub' );
+        $vat_class = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '_new';
+        $current_url = remove_query_arg('wpi_sub');
         
         $vat_rates['vat_rates_header'] = array(
             'id' => 'vat_rates_header',
-            'name' => '<h3>' . __( 'Manage VAT Rates', 'invoicing' ) . '</h3>',
+            'name' => '<h3>' . __('Manage VAT Rates', 'invoicing') . '</h3>',
             'desc' => '',
             'type' => 'header',
             'size' => 'regular'
         );
         $vat_rates['vat_rates_class'] = array(
             'id'          => 'vat_rates_class',
-            'name'        => __( 'Edit VAT Rates', 'invoicing' ),
-            'desc'        => __( 'The standard rate will apply where no explicit rate is provided.', 'invoicing' ),
+            'name'        => __('Edit VAT Rates', 'invoicing'),
+            'desc'        => __('The standard rate will apply where no explicit rate is provided.', 'invoicing'),
             'type'        => 'select',
-            'options'     => array_merge( $vat_classes, array( '_new' => __( 'Add New Rate Class', 'invoicing' ) ) ),
-            'placeholder' => __( 'Select a VAT Rate', 'invoicing' ),
+            'options'     => array_merge($vat_classes, array('_new' => __('Add New Rate Class', 'invoicing'))),
+            'placeholder' => __('Select a VAT Rate', 'invoicing'),
             'selected'    => $vat_class,
             'class'       => 'wpi_select2',
             'onchange'    => 'document.location.href="' . $current_url . '&wpi_sub=" + this.value;',
         );
         
-        if ( $vat_class != '_standard' && $vat_class != '_new' ) {
+        if ($vat_class != '_standard' && $vat_class != '_new') {
             $vat_rates['vat_rate_delete'] = array(
                 'id'   => 'vat_rate_delete',
                 'type' => 'vat_rate_delete',
             );
         }
                     
-        if ( $vat_class == '_new' ) {
+        if ($vat_class == '_new') {
             $vat_rates['vat_rates_settings'] = array(
                 'id' => 'vat_rates_settings',
-                'name' => '<h3>' . __( 'Add New Rate Class', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Add New Rate Class', 'invoicing') . '</h3>',
                 'type' => 'header',
             );
             $vat_rates['vat_rate_name'] = array(
                 'id'   => 'vat_rate_name',
-                'name' => __( 'Name', 'invoicing' ),
-                'desc' => __( 'A short name for the new VAT Rate class', 'invoicing' ),
+                'name' => __('Name', 'invoicing'),
+                'desc' => __('A short name for the new VAT Rate class', 'invoicing'),
                 'type' => 'text',
                 'size' => 'regular',
             );
             $vat_rates['vat_rate_desc'] = array(
                 'id'   => 'vat_rate_desc',
-                'name' => __( 'Description', 'invoicing' ),
-                'desc' => __( 'Manage VAT Rate class', 'invoicing' ),
+                'name' => __('Description', 'invoicing'),
+                'desc' => __('Manage VAT Rate class', 'invoicing'),
                 'type' => 'text',
                 'size' => 'regular',
             );
@@ -213,7 +213,7 @@ 
             $vat_rates['vat_rates'] = array(
                 'id'   => 'vat_rates',
                 'name' => '<h3>' . $vat_classes[$vat_class] . '</h3>',
-                'desc' => self::get_class_desc( $vat_class ),
+                'desc' => self::get_class_desc($vat_class),
                 'type' => 'vat_rates',
             );
         }
@@ -221,12 +221,12 @@ 
         return $vat_rates;
     }
     
-    public static function vat_settings( $settings ) {
-        if ( !empty( $settings ) ) {    
+    public static function vat_settings($settings) {
+        if (!empty($settings)) {    
             $vat_settings = array();
             $vat_settings['vat_company_title'] = array(
                 'id' => 'vat_company_title',
-                'name' => '<h3>' . __( 'Your Company Details', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Your Company Details', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -234,22 +234,22 @@ 
             
             $vat_settings['vat_company_name'] = array(
                 'id' => 'vat_company_name',
-                'name' => __( 'Your Company Name', 'invoicing' ),
-                'desc' => wp_sprintf(__( 'Your company name as it appears on your VAT return, you can verify it via your VAT ID on the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                'name' => __('Your Company Name', 'invoicing'),
+                'desc' => wp_sprintf(__('Your company name as it appears on your VAT return, you can verify it via your VAT ID on the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                 'type' => 'text',
                 'size' => 'regular',
             );
             
             $vat_settings['vat_number'] = array(
                 'id'   => 'vat_number',
-                'name' => __( 'Your VAT Number', 'invoicing' ),
+                'name' => __('Your VAT Number', 'invoicing'),
                 'type' => 'vat_number',
                 'size' => 'regular',
             );
 
             $vat_settings['vat_settings_title'] = array(
                 'id' => 'vat_settings_title',
-                'name' => '<h3>' . __( 'Apply VAT Settings', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Apply VAT Settings', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -257,8 +257,8 @@ 
 
             $vat_settings['apply_vat_rules'] = array(
                 'id' => 'apply_vat_rules',
-                'name' => __( 'Enable VAT Rules', 'invoicing' ),
-                'desc' => __( 'Apply VAT to consumer sales from IP addresses within the EU, even if the billing address is outside the EU.', 'invoicing' ) . '<br><font style="color:red">' . __( 'Do not disable unless you know what you are doing.', 'invoicing' ) . '</font>',
+                'name' => __('Enable VAT Rules', 'invoicing'),
+                'desc' => __('Apply VAT to consumer sales from IP addresses within the EU, even if the billing address is outside the EU.', 'invoicing') . '<br><font style="color:red">' . __('Do not disable unless you know what you are doing.', 'invoicing') . '</font>',
                 'type' => 'checkbox',
                 'std' => '1'
             );
@@ -274,8 +274,8 @@ 
 
             $vat_settings['vat_prevent_b2c_purchase'] = array(
                 'id' => 'vat_prevent_b2c_purchase',
-                'name' => __( 'Prevent EU B2C Sales', 'invoicing' ),
-                'desc' => __( 'Enable this option if you are not registered for VAT in the EU.', 'invoicing' ),
+                'name' => __('Prevent EU B2C Sales', 'invoicing'),
+                'desc' => __('Enable this option if you are not registered for VAT in the EU.', 'invoicing'),
                 'type' => 'checkbox'
             );
 
@@ -283,22 +283,22 @@ 
 
             $vat_settings['vat_same_country_rule'] = array(
                 'id'          => 'vat_same_country_rule',
-                'name'        => __( 'Same Country Rule', 'invoicing' ),
-                'desc'        => __( 'Select how you want to handle VAT charge if sales are in the same country as the base country.', 'invoicing' ),
+                'name'        => __('Same Country Rule', 'invoicing'),
+                'desc'        => __('Select how you want to handle VAT charge if sales are in the same country as the base country.', 'invoicing'),
                 'type'        => 'select',
                 'options'     => array(
-                    ''          => __( 'Normal', 'invoicing' ),
-                    'no'        => __( 'No VAT', 'invoicing' ),
-                    'always'    => __( 'Always apply VAT', 'invoicing' ),
+                    ''          => __('Normal', 'invoicing'),
+                    'no'        => __('No VAT', 'invoicing'),
+                    'always'    => __('Always apply VAT', 'invoicing'),
                 ),
-                'placeholder' => __( 'Select an option', 'invoicing' ),
+                'placeholder' => __('Select an option', 'invoicing'),
                 'std'         => '',
                 'class'   => 'wpi_select2',
             );
 
             $vat_settings['vat_checkout_title'] = array(
                 'id' => 'vat_checkout_title',
-                'name' => '<h3>' . __( 'Checkout Fields', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Checkout Fields', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -306,14 +306,14 @@ 
 
             $vat_settings['vat_disable_fields'] = array(
                 'id' => 'vat_disable_fields',
-                'name' => __( 'Disable VAT Fields', 'invoicing' ),
-                'desc' => __( 'Disable VAT fields if Invoicing is being used for GST.', 'invoicing' ) . '<br><font style="color:red">' . __( 'Do not disable if you have enabled Prevent EU B2C sales, otherwise Prevent EU B2C sales setting will not work.', 'invoicing' ) . '</font>',
+                'name' => __('Disable VAT Fields', 'invoicing'),
+                'desc' => __('Disable VAT fields if Invoicing is being used for GST.', 'invoicing') . '<br><font style="color:red">' . __('Do not disable if you have enabled Prevent EU B2C sales, otherwise Prevent EU B2C sales setting will not work.', 'invoicing') . '</font>',
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_ip_lookup'] = array(
                 'id'   => 'vat_ip_lookup',
-                'name' => __( 'IP Country Look-up', 'invoicing' ),
+                'name' => __('IP Country Look-up', 'invoicing'),
                 'type' => 'vat_ip_lookup',
                 'size' => 'regular',
                 'std' => 'default',
@@ -322,21 +322,21 @@ 
 
             $vat_settings['hide_ip_address'] = array(
                 'id' => 'hide_ip_address',
-                'name' => __( 'Hide IP Info at Checkout', 'invoicing' ),
-                'desc' => __( 'Hide the user IP info at checkout.', 'invoicing' ),
+                'name' => __('Hide IP Info at Checkout', 'invoicing'),
+                'desc' => __('Hide the user IP info at checkout.', 'invoicing'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_ip_country_default'] = array(
                 'id' => 'vat_ip_country_default',
-                'name' => __( 'Enable IP Country as Default', 'invoicing' ),
-                'desc' => __( 'Show the country of the users IP as the default country, otherwise the site default country will be used.', 'invoicing' ),
+                'name' => __('Enable IP Country as Default', 'invoicing'),
+                'desc' => __('Show the country of the users IP as the default country, otherwise the site default country will be used.', 'invoicing'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vies_validation_title'] = array(
                 'id' => 'vies_validation_title',
-                'name' => '<h3>' . __( 'VIES Validation', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('VIES Validation', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -344,37 +344,37 @@ 
 
             $vat_settings['vat_vies_check'] = array(
                 'id' => 'vat_vies_check',
-                'name' => __( 'Disable VIES VAT ID Check', 'invoicing' ),
-                'desc' => wp_sprintf( __( 'Prevent VAT numbers from being validated by the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                'name' => __('Disable VIES VAT ID Check', 'invoicing'),
+                'desc' => wp_sprintf(__('Prevent VAT numbers from being validated by the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_disable_company_name_check'] = array(
                 'id' => 'vat_disable_company_name_check',
-                'name' => __( 'Disable VIES Name Check', 'invoicing' ),
-                'desc' => wp_sprintf( __( 'Prevent company name from being validated by the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                'name' => __('Disable VIES Name Check', 'invoicing'),
+                'desc' => wp_sprintf(__('Prevent company name from being validated by the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_offline_check'] = array(
                 'id' => 'vat_offline_check',
-                'name' => __( 'Disable Basic Checks', 'invoicing' ),
-                'desc' => __( 'Disable basic JS checks for correct format of VAT number. (Not Recommended)', 'invoicing' ),
+                'name' => __('Disable Basic Checks', 'invoicing'),
+                'desc' => __('Disable basic JS checks for correct format of VAT number. (Not Recommended)', 'invoicing'),
                 'type' => 'checkbox'
             );
             
 
             $settings['vat'] = $vat_settings;
             
-            if ( self::allow_vat_classes() ) {
+            if (self::allow_vat_classes()) {
                 $settings['vat_rates'] = self::vat_rates_settings();
             }
             
             $eu_fallback_rate = array(
                 'id'   => 'eu_fallback_rate',
-                'name' => '<h3>' . __( 'VAT rate for EU member states', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('VAT rate for EU member states', 'invoicing') . '</h3>',
                 'type' => 'eu_fallback_rate',
-                'desc' => __( 'Enter the VAT rate to be charged for EU member states. You can edit the rates for each member state when a country rate has been set up by pressing this button.', 'invoicing' ),
+                'desc' => __('Enter the VAT rate to be charged for EU member states. You can edit the rates for each member state when a country rate has been set up by pressing this button.', 'invoicing'),
                 'std'  => '20',
                 'size' => 'small'
             );
@@ -390,11 +390,11 @@ 
         $database_url       = 'http' . (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === 'on' ? 's' : '') . '://geolite.maxmind.com/download/geoip/database/';
         $destination_dir    = $upload_dir['basedir'] . '/invoicing';
         
-        if ( !is_dir( $destination_dir ) ) { 
-            mkdir( $destination_dir );
+        if (!is_dir($destination_dir)) { 
+            mkdir($destination_dir);
         }
         
-        $database_files     = array(
+        $database_files = array(
             'country'   => array(
                 'source'        => $database_url . 'GeoLite2-Country.mmdb.gz',
                 'destination'   => $destination_dir . '/GeoLite2-Country.mmdb',
@@ -405,57 +405,57 @@ 
             )
         );
 
-        foreach( $database_files as $database => $files ) {
-            $result = self::geoip2_download_file( $files['source'], $files['destination'] );
+        foreach ($database_files as $database => $files) {
+            $result = self::geoip2_download_file($files['source'], $files['destination']);
             
-            if ( empty( $result['success'] ) ) {
+            if (empty($result['success'])) {
                 echo $result['message'];
                 exit;
             }
             
-            wpinv_update_option( 'wpinv_geoip2_date_updated', current_time( 'timestamp' ) );
-            echo sprintf(__( 'GeoIP2 %s database updated successfully.', 'invoicing' ), $database ) . ' ';
+            wpinv_update_option('wpinv_geoip2_date_updated', current_time('timestamp'));
+            echo sprintf(__('GeoIP2 %s database updated successfully.', 'invoicing'), $database) . ' ';
         }
         
         exit;
     }
     
-    public static function geoip2_download_file( $source_url, $destination_file ) {
+    public static function geoip2_download_file($source_url, $destination_file) {
         $success    = false;
         $message    = '';
         
-        if ( !function_exists( 'download_url' ) ) {
-            require_once( ABSPATH . 'wp-admin/includes/file.php' );
+        if (!function_exists('download_url')) {
+            require_once(ABSPATH . 'wp-admin/includes/file.php');
         }
 
-        $temp_file  = download_url( $source_url );
+        $temp_file = download_url($source_url);
         
-        if ( is_wp_error( $temp_file ) ) {
-            $message = sprintf( __( 'Error while downloading GeoIp2 database( %s ): %s', 'invoicing' ), $source_url, $temp_file->get_error_message() );
+        if (is_wp_error($temp_file)) {
+            $message = sprintf(__('Error while downloading GeoIp2 database( %s ): %s', 'invoicing'), $source_url, $temp_file->get_error_message());
         } else {
-            $handle = gzopen( $temp_file, 'rb' );
+            $handle = gzopen($temp_file, 'rb');
             
-            if ( $handle ) {
-                $fopen  = fopen( $destination_file, 'wb' );
-                if ( $fopen ) {
-                    while ( ( $data = gzread( $handle, 4096 ) ) != false ) {
-                        fwrite( $fopen, $data );
+            if ($handle) {
+                $fopen = fopen($destination_file, 'wb');
+                if ($fopen) {
+                    while (($data = gzread($handle, 4096)) != false) {
+                        fwrite($fopen, $data);
                     }
 
-                    gzclose( $handle );
-                    fclose( $fopen );
+                    gzclose($handle);
+                    fclose($fopen);
                         
                     $success = true;
                 } else {
-                    gzclose( $handle );
-                    $message = sprintf( __( 'Error could not open destination GeoIp2 database file for writing: %s', 'invoicing' ), $destination_file );
+                    gzclose($handle);
+                    $message = sprintf(__('Error could not open destination GeoIp2 database file for writing: %s', 'invoicing'), $destination_file);
                 }
             } else {
-                $message = sprintf( __( 'Error could not open GeoIp2 database file for reading: %s', 'invoicing' ), $temp_file );
+                $message = sprintf(__('Error could not open GeoIp2 database file for reading: %s', 'invoicing'), $temp_file);
             }
             
-            if ( file_exists( $temp_file ) ) {
-                unlink( $temp_file );
+            if (file_exists($temp_file)) {
+                unlink($temp_file);
             }
         }
         
@@ -467,11 +467,11 @@ 
     }
     
     public static function load_geoip2() {
-        if ( defined( 'WPINV_GEOIP2_LODDED' ) ) {
+        if (defined('WPINV_GEOIP2_LODDED')) {
             return;
         }
         
-        if ( !class_exists( '\MaxMind\Db\Reader' ) ) {
+        if (!class_exists('\MaxMind\Db\Reader')) {
             $maxmind_db_files = array(
                 'Reader/Decoder.php',
                 'Reader/InvalidDatabaseException.php',
@@ -480,12 +480,12 @@ 
                 'Reader.php',
             );
             
-            foreach ( $maxmind_db_files as $key => $file ) {
-                require_once( WPINV_PLUGIN_DIR . 'includes/libraries/MaxMind/Db/' . $file );
+            foreach ($maxmind_db_files as $key => $file) {
+                require_once(WPINV_PLUGIN_DIR . 'includes/libraries/MaxMind/Db/' . $file);
             }
         }
         
-        if ( !class_exists( '\GeoIp2\Database\Reader' ) ) {        
+        if (!class_exists('\GeoIp2\Database\Reader')) {        
             $geoip2_files = array(
                 'ProviderInterface.php',
                 'Compat/JsonSerializable.php',
@@ -519,23 +519,23 @@ 
                 'WebService/Client.php',
             );
             
-            foreach ( $geoip2_files as $key => $file ) {
-                require_once( WPINV_PLUGIN_DIR . 'includes/libraries/GeoIp2/' . $file );
+            foreach ($geoip2_files as $key => $file) {
+                require_once(WPINV_PLUGIN_DIR . 'includes/libraries/GeoIp2/' . $file);
             }
         }
 
-        define( 'WPINV_GEOIP2_LODDED', true );
+        define('WPINV_GEOIP2_LODDED', true);
     }
 
     public static function geoip2_country_dbfile() {
         $upload_dir = wp_upload_dir();
 
-        if ( !isset( $upload_dir['basedir'] ) ) {
+        if (!isset($upload_dir['basedir'])) {
             return false;
         }
 
         $filename = $upload_dir['basedir'] . '/invoicing/GeoLite2-Country.mmdb';
-        if ( !file_exists( $filename ) ) {
+        if (!file_exists($filename)) {
             return false;
         }
         
@@ -545,12 +545,12 @@ 
     public static function geoip2_city_dbfile() {
         $upload_dir = wp_upload_dir();
 
-        if ( !isset( $upload_dir['basedir'] ) ) {
+        if (!isset($upload_dir['basedir'])) {
             return false;
         }
 
         $filename = $upload_dir['basedir'] . '/invoicing/GeoLite2-City.mmdb';
-        if ( !file_exists( $filename ) ) {
+        if (!file_exists($filename)) {
             return false;
         }
         
@@ -561,10 +561,10 @@ 
         try {
             self::load_geoip2();
 
-            if ( $filename = self::geoip2_country_dbfile() ) {
-                return new \GeoIp2\Database\Reader( $filename );
+            if ($filename = self::geoip2_country_dbfile()) {
+                return new \GeoIp2\Database\Reader($filename);
             }
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
         
@@ -575,183 +575,183 @@ 
         try {
             self::load_geoip2();
 
-            if ( $filename = self::geoip2_city_dbfile() ) {
-                return new \GeoIp2\Database\Reader( $filename );
+            if ($filename = self::geoip2_city_dbfile()) {
+                return new \GeoIp2\Database\Reader($filename);
             }
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
         
         return false;
     }
 
-    public static function geoip2_country_record( $ip_address ) {
+    public static function geoip2_country_record($ip_address) {
         try {
             $reader = self::geoip2_country_reader();
 
-            if ( $reader ) {
-                $record = $reader->country( $ip_address );
+            if ($reader) {
+                $record = $reader->country($ip_address);
                 
-                if ( !empty( $record->country->isoCode ) ) {
+                if (!empty($record->country->isoCode)) {
                     return $record;
                 }
             }
-        } catch(\InvalidArgumentException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\InvalidArgumentException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
             
             return false;
-        } catch(\GeoIp2\Exception\AddressNotFoundException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\GeoIp2\Exception\AddressNotFoundException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
             
             return false;
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
         
         return false;
     }
 
-    public static function geoip2_city_record( $ip_address ) {
+    public static function geoip2_city_record($ip_address) {
         try {
             $reader = self::geoip2_city_reader();
 
-            if ( $reader ) {
-                $record = $reader->city( $ip_address );
+            if ($reader) {
+                $record = $reader->city($ip_address);
                 
-                if ( !empty( $record->country->isoCode ) ) {
+                if (!empty($record->country->isoCode)) {
                     return $record;
                 }
             }
-        } catch(\InvalidArgumentException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\InvalidArgumentException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
             
             return false;
-        } catch(\GeoIp2\Exception\AddressNotFoundException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\GeoIp2\Exception\AddressNotFoundException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
             
             return false;
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
         
         return false;
     }
 
-    public static function geoip2_country_code( $ip_address ) {
-        $record = self::geoip2_country_record( $ip_address );
-        return !empty( $record->country->isoCode ) ? $record->country->isoCode : wpinv_get_default_country();
+    public static function geoip2_country_code($ip_address) {
+        $record = self::geoip2_country_record($ip_address);
+        return !empty($record->country->isoCode) ? $record->country->isoCode : wpinv_get_default_country();
     }
 
     // Find country by IP address.
-    public static function get_country_by_ip( $ip = '' ) {
+    public static function get_country_by_ip($ip = '') {
         global $wpinv_ip_address_country;
         
-        if ( !empty( $wpinv_ip_address_country ) ) {
+        if (!empty($wpinv_ip_address_country)) {
             return $wpinv_ip_address_country;
         }
         
-        if ( empty( $ip ) ) {
+        if (empty($ip)) {
             $ip = wpinv_get_ip();
         }
 
-        $ip_country_service = wpinv_get_option( 'vat_ip_lookup' );
-        $is_default         = empty( $ip_country_service ) || $ip_country_service === 'default' ? true : false;
+        $ip_country_service = wpinv_get_option('vat_ip_lookup');
+        $is_default         = empty($ip_country_service) || $ip_country_service === 'default' ? true : false;
 
-        if ( !empty( $ip ) && $ip !== '127.0.0.1' ) { // For 127.0.0.1(localhost) use default country.
-            if ( function_exists( 'geoip_country_code_by_name') && ( $ip_country_service === 'geoip' || $is_default ) ) {
+        if (!empty($ip) && $ip !== '127.0.0.1') { // For 127.0.0.1(localhost) use default country.
+            if (function_exists('geoip_country_code_by_name') && ($ip_country_service === 'geoip' || $is_default)) {
                 try {
-                    $wpinv_ip_address_country = geoip_country_code_by_name( $ip );
-                } catch( Exception $e ) {
-                    wpinv_error_log( $e->getMessage(), 'GeoIP Lookup( ' . $ip . ' )' );
+                    $wpinv_ip_address_country = geoip_country_code_by_name($ip);
+                } catch (Exception $e) {
+                    wpinv_error_log($e->getMessage(), 'GeoIP Lookup( ' . $ip . ' )');
                 }
-            } else if ( self::geoip2_country_dbfile() && ( $ip_country_service === 'geoip2' || $is_default ) ) {
-                $wpinv_ip_address_country = self::geoip2_country_code( $ip );
-            } else if ( function_exists( 'simplexml_load_file' ) && ini_get('allow_url_fopen') && ( $ip_country_service === 'geoplugin' || $is_default ) ) {
-                $load_xml = simplexml_load_file( 'http://www.geoplugin.net/xml.gp?ip=' . $ip );
+            } else if (self::geoip2_country_dbfile() && ($ip_country_service === 'geoip2' || $is_default)) {
+                $wpinv_ip_address_country = self::geoip2_country_code($ip);
+            } else if (function_exists('simplexml_load_file') && ini_get('allow_url_fopen') && ($ip_country_service === 'geoplugin' || $is_default)) {
+                $load_xml = simplexml_load_file('http://www.geoplugin.net/xml.gp?ip=' . $ip);
                 
-                if ( !empty( $load_xml ) && !empty( $load_xml->geoplugin_countryCode ) ) {
-                    $wpinv_ip_address_country = (string)$load_xml->geoplugin_countryCode;
+                if (!empty($load_xml) && !empty($load_xml->geoplugin_countryCode)) {
+                    $wpinv_ip_address_country = (string) $load_xml->geoplugin_countryCode;
                 }
-            }elseif(!empty( $ip )){
+            }elseif (!empty($ip)) {
                 $url = 'http://ip-api.com/json/' . $ip;
                 $response = wp_remote_get($url);
 
-                if ( is_array( $response ) && wp_remote_retrieve_response_code( $response ) == '200' ) {
-                    $data = json_decode(wp_remote_retrieve_body( $response ),true);
-                    if(!empty($data['countryCode'])){
-                        $wpinv_ip_address_country = (string)$data['countryCode'];
+                if (is_array($response) && wp_remote_retrieve_response_code($response) == '200') {
+                    $data = json_decode(wp_remote_retrieve_body($response), true);
+                    if (!empty($data['countryCode'])) {
+                        $wpinv_ip_address_country = (string) $data['countryCode'];
                     }
                 }
             }
         }
 
-        if ( empty( $wpinv_ip_address_country ) ) {
+        if (empty($wpinv_ip_address_country)) {
             $wpinv_ip_address_country = wpinv_get_default_country();
         }
 
         return $wpinv_ip_address_country;
     }
     
-    public static function sanitize_vat_settings( $input ) {
+    public static function sanitize_vat_settings($input) {
         global $wpinv_options;
         
         $valid      = false;
         $message    = '';
         
-        if ( !empty( $wpinv_options['vat_vies_check'] ) ) {
-            if ( empty( $wpinv_options['vat_offline_check'] ) ) {
-                $valid = self::offline_check( $input['vat_number'] );
+        if (!empty($wpinv_options['vat_vies_check'])) {
+            if (empty($wpinv_options['vat_offline_check'])) {
+                $valid = self::offline_check($input['vat_number']);
             } else {
                 $valid = true;
             }
             
-            $message = $valid ? '' : __( 'VAT number not validated', 'invoicing' );
+            $message = $valid ? '' : __('VAT number not validated', 'invoicing');
         } else {
-            $result = self::check_vat( $input['vat_number'] );
+            $result = self::check_vat($input['vat_number']);
             
-            if ( empty( $result['valid'] ) ) {
+            if (empty($result['valid'])) {
                 $valid      = false;
                 $message    = $result['message'];
             } else {
-                $valid      = ( isset( $result['company'] ) && ( $result['company'] == '---' || ( strcasecmp( trim( $result['company'] ), trim( $input['vat_company_name'] ) ) == 0 ) ) ) || !empty( $wpinv_options['vat_disable_company_name_check'] );
-                $message    = $valid ? '' : __( 'The company name associated with the VAT number provided is not the same as the company name provided.', 'invoicing' );
+                $valid      = (isset($result['company']) && ($result['company'] == '---' || (strcasecmp(trim($result['company']), trim($input['vat_company_name'])) == 0))) || !empty($wpinv_options['vat_disable_company_name_check']);
+                $message    = $valid ? '' : __('The company name associated with the VAT number provided is not the same as the company name provided.', 'invoicing');
             }
         }
 
-        if ( $message && self::is_vat_validated() != $valid ) {
-            add_settings_error( 'wpinv-notices', '', $message, ( $valid ? 'updated' : 'error' ) );
+        if ($message && self::is_vat_validated() != $valid) {
+            add_settings_error('wpinv-notices', '', $message, ($valid ? 'updated' : 'error'));
         }
 
         $input['vat_valid'] = $valid;
         return $input;
     }
     
-    public static function sanitize_vat_rates( $input ) {
-        if( !wpinv_current_user_can_manage_invoicing() ) {
-            add_settings_error( 'wpinv-notices', '', __( 'Your account does not have permission to add rate classes.', 'invoicing' ), 'error' );
+    public static function sanitize_vat_rates($input) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
+            add_settings_error('wpinv-notices', '', __('Your account does not have permission to add rate classes.', 'invoicing'), 'error');
             return $input;
         }
         
         $vat_classes = self::get_rate_classes();
-        $vat_class = !empty( $_REQUEST['wpi_vat_class'] ) && isset( $vat_classes[$_REQUEST['wpi_vat_class']] )? sanitize_text_field( $_REQUEST['wpi_vat_class'] ) : '';
+        $vat_class = !empty($_REQUEST['wpi_vat_class']) && isset($vat_classes[$_REQUEST['wpi_vat_class']]) ? sanitize_text_field($_REQUEST['wpi_vat_class']) : '';
         
-        if ( empty( $vat_class ) ) {
-            add_settings_error( 'wpinv-notices', '', __( 'No valid VAT rates class contained in the request to save rates.', 'invoicing' ), 'error' );
+        if (empty($vat_class)) {
+            add_settings_error('wpinv-notices', '', __('No valid VAT rates class contained in the request to save rates.', 'invoicing'), 'error');
             
             return $input;
         }
 
-        $new_rates = ! empty( $_POST['vat_rates'] ) ? array_values( $_POST['vat_rates'] ) : array();
+        $new_rates = !empty($_POST['vat_rates']) ? array_values($_POST['vat_rates']) : array();
 
-        if ( $vat_class === '_standard' ) {
+        if ($vat_class === '_standard') {
             // Save the active rates in the invoice settings
-            update_option( 'wpinv_tax_rates', $new_rates );
+            update_option('wpinv_tax_rates', $new_rates);
         } else {
             // Get the existing set of rates
             $rates = self::get_non_standard_rates();
             $rates[$vat_class] = $new_rates;
 
-            update_option( 'wpinv_vat_rates', $rates );
+            update_option('wpinv_vat_rates', $rates);
         }
         
         return $input;
@@ -761,71 +761,71 @@ 
         $response = array();
         $response['success'] = false;
         
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing()) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
         
-        $vat_class_name = !empty( $_POST['name'] ) ? sanitize_text_field( $_POST['name'] ) : false;
-        $vat_class_desc = !empty( $_POST['desc'] ) ? sanitize_text_field( $_POST['desc'] ) : false;
+        $vat_class_name = !empty($_POST['name']) ? sanitize_text_field($_POST['name']) : false;
+        $vat_class_desc = !empty($_POST['desc']) ? sanitize_text_field($_POST['desc']) : false;
         
-        if ( empty( $vat_class_name ) ) {
-            $response['error'] = __( 'Select the VAT rate name', 'invoicing' );
-            wp_send_json( $response );
+        if (empty($vat_class_name)) {
+            $response['error'] = __('Select the VAT rate name', 'invoicing');
+            wp_send_json($response);
         }
         
-        $vat_classes = (array)self::get_rate_classes();
+        $vat_classes = (array) self::get_rate_classes();
 
-        if ( !empty( $vat_classes ) && in_array( strtolower( $vat_class_name ), array_map( 'strtolower', array_values( $vat_classes ) ) ) ) {
-            $response['error'] = wp_sprintf( __( 'A VAT Rate name "%s" already exists', 'invoicing' ), $vat_class_name );
-            wp_send_json( $response );
+        if (!empty($vat_classes) && in_array(strtolower($vat_class_name), array_map('strtolower', array_values($vat_classes)))) {
+            $response['error'] = wp_sprintf(__('A VAT Rate name "%s" already exists', 'invoicing'), $vat_class_name);
+            wp_send_json($response);
         }
         
-        $rate_class_key = normalize_whitespace( 'wpi-' . $vat_class_name );
-        $rate_class_key = sanitize_key( str_replace( " ", "-", $rate_class_key ) );
+        $rate_class_key = normalize_whitespace('wpi-' . $vat_class_name);
+        $rate_class_key = sanitize_key(str_replace(" ", "-", $rate_class_key));
         
-        $vat_classes = (array)self::get_rate_classes( true );
-        $vat_classes[$rate_class_key] = array( 'name' => $vat_class_name, 'desc' => $vat_class_desc );
+        $vat_classes = (array) self::get_rate_classes(true);
+        $vat_classes[$rate_class_key] = array('name' => $vat_class_name, 'desc' => $vat_class_desc);
         
-        update_option( '_wpinv_vat_rate_classes', $vat_classes );
+        update_option('_wpinv_vat_rate_classes', $vat_classes);
         
         $response['success'] = true;
-        $response['redirect'] = admin_url( 'admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=' . $rate_class_key );
+        $response['redirect'] = admin_url('admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=' . $rate_class_key);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function delete_class() {
         $response = array();
         $response['success'] = false;
         
-        if ( !wpinv_current_user_can_manage_invoicing() || !isset( $_POST['class'] ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing() || !isset($_POST['class'])) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
         
-        $vat_class = isset( $_POST['class'] ) && $_POST['class'] !== '' ? sanitize_text_field( $_POST['class'] ) : false;
-        $vat_classes = (array)self::get_rate_classes();
+        $vat_class = isset($_POST['class']) && $_POST['class'] !== '' ? sanitize_text_field($_POST['class']) : false;
+        $vat_classes = (array) self::get_rate_classes();
 
-        if ( !isset( $vat_classes[$vat_class] ) ) {
-            $response['error'] = __( 'Requested class does not exists', 'invoicing' );
-            wp_send_json( $response );
+        if (!isset($vat_classes[$vat_class])) {
+            $response['error'] = __('Requested class does not exists', 'invoicing');
+            wp_send_json($response);
         }
         
-        if ( $vat_class == '_new' || $vat_class == '_standard' ) {
-            $response['error'] = __( 'You can not delete standard rates class', 'invoicing' );
-            wp_send_json( $response );
+        if ($vat_class == '_new' || $vat_class == '_standard') {
+            $response['error'] = __('You can not delete standard rates class', 'invoicing');
+            wp_send_json($response);
         }
             
-        $vat_classes = (array)self::get_rate_classes( true );
-        unset( $vat_classes[$vat_class] );
+        $vat_classes = (array) self::get_rate_classes(true);
+        unset($vat_classes[$vat_class]);
         
-        update_option( '_wpinv_vat_rate_classes', $vat_classes );
+        update_option('_wpinv_vat_rate_classes', $vat_classes);
         
         $response['success'] = true;
-        $response['redirect'] = admin_url( 'admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=_new' );
+        $response['redirect'] = admin_url('admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=_new');
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function update_eu_rates() {        
@@ -834,72 +834,72 @@ 
         $response['error']      = null;
         $response['data']       = null;
         
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing()) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
         
-        $group      = !empty( $_POST['group'] ) ? sanitize_text_field( $_POST['group'] ) : '';
-        $euvatrates = self::request_euvatrates( $group );
+        $group      = !empty($_POST['group']) ? sanitize_text_field($_POST['group']) : '';
+        $euvatrates = self::request_euvatrates($group);
         
-        if ( !empty( $euvatrates ) ) {
-            if ( !empty( $euvatrates['success'] ) && !empty( $euvatrates['rates'] ) ) {
+        if (!empty($euvatrates)) {
+            if (!empty($euvatrates['success']) && !empty($euvatrates['rates'])) {
                 $response['success']        = true;
                 $response['data']['rates']  = $euvatrates['rates'];
-            } else if ( !empty( $euvatrates['error'] ) ) {
+            } else if (!empty($euvatrates['error'])) {
                 $response['error']          = $euvatrates['error'];
             }
         }
             
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function hide_vat_fields() {
-        $hide = wpinv_get_option( 'vat_disable_fields' );
+        $hide = wpinv_get_option('vat_disable_fields');
         
-        return apply_filters( 'wpinv_hide_vat_fields', $hide );
+        return apply_filters('wpinv_hide_vat_fields', $hide);
     }
     
     public static function same_country_rule() {
-        $same_country_rule = wpinv_get_option( 'vat_same_country_rule' );
+        $same_country_rule = wpinv_get_option('vat_same_country_rule');
         
-        return apply_filters( 'wpinv_vat_same_country_rule', $same_country_rule );
+        return apply_filters('wpinv_vat_same_country_rule', $same_country_rule);
     }
     
     public static function get_vat_name() {
-        $vat_name   = wpinv_get_option( 'vat_name' );
-        $vat_name   = !empty( $vat_name ) ? $vat_name : 'VAT';
+        $vat_name   = wpinv_get_option('vat_name');
+        $vat_name   = !empty($vat_name) ? $vat_name : 'VAT';
         
-        return apply_filters( 'wpinv_get_owner_vat_name', $vat_name );
+        return apply_filters('wpinv_get_owner_vat_name', $vat_name);
     }
     
     public static function get_company_name() {
-        $company_name = wpinv_get_option( 'vat_company_name' );
+        $company_name = wpinv_get_option('vat_company_name');
         
-        return apply_filters( 'wpinv_get_owner_company_name', $company_name );
+        return apply_filters('wpinv_get_owner_company_name', $company_name);
     }
     
     public static function get_vat_number() {
-        $vat_number = wpinv_get_option( 'vat_number' );
+        $vat_number = wpinv_get_option('vat_number');
         
-        return apply_filters( 'wpinv_get_owner_vat_number', $vat_number );
+        return apply_filters('wpinv_get_owner_vat_number', $vat_number);
     }
     
     public static function is_vat_validated() {
-        $validated = self::get_vat_number() && wpinv_get_option( 'vat_valid' );
+        $validated = self::get_vat_number() && wpinv_get_option('vat_valid');
         
-        return apply_filters( 'wpinv_is_owner_vat_validated', $validated );
+        return apply_filters('wpinv_is_owner_vat_validated', $validated);
     }
     
-    public static function sanitize_vat( $vat_number, $country_code = '' ) {        
-        $vat_number = str_replace( array(' ', '.', '-', '_', ',' ), '', strtoupper( trim( $vat_number ) ) );
+    public static function sanitize_vat($vat_number, $country_code = '') {        
+        $vat_number = str_replace(array(' ', '.', '-', '_', ','), '', strtoupper(trim($vat_number)));
         
-        if ( empty( $country_code ) ) {
-            $country_code = substr( $vat_number, 0, 2 );
+        if (empty($country_code)) {
+            $country_code = substr($vat_number, 0, 2);
         }
         
-        if ( strpos( $vat_number , $country_code ) === 0 ) {
-            $vat = str_replace( $country_code, '', $vat_number );
+        if (strpos($vat_number, $country_code) === 0) {
+            $vat = str_replace($country_code, '', $vat_number);
         } else {
             $vat = $country_code . $vat_number;
         }
@@ -912,140 +912,140 @@ 
         return $return;
     }
     
-    public static function offline_check( $vat_number, $country_code = '', $formatted = false ) {
-        $vat            = self::sanitize_vat( $vat_number, $country_code );
+    public static function offline_check($vat_number, $country_code = '', $formatted = false) {
+        $vat            = self::sanitize_vat($vat_number, $country_code);
         $vat_number     = $vat['vat_number'];
         $country_code   = $vat['iso'];
         $regex          = array();
         
-        switch ( $country_code ) {
+        switch ($country_code) {
             case 'AT':
-                $regex[] = '/^(AT)U(\d{8})$/';                           // Austria
+                $regex[] = '/^(AT)U(\d{8})$/'; // Austria
                 break;
             case 'BE':
-                $regex[] = '/^(BE)(0?\d{9})$/';                          // Belgium
+                $regex[] = '/^(BE)(0?\d{9})$/'; // Belgium
                 break;
             case 'BG':
-                $regex[] = '/^(BG)(\d{9,10})$/';                         // Bulgaria
+                $regex[] = '/^(BG)(\d{9,10})$/'; // Bulgaria
                 break;
             case 'CH':
             case 'CHE':
-                $regex[] = '/^(CHE)(\d{9})MWST$/';                       // Switzerland (Not EU)
+                $regex[] = '/^(CHE)(\d{9})MWST$/'; // Switzerland (Not EU)
                 break;
             case 'CY':
-                $regex[] = '/^(CY)([0-5|9]\d{7}[A-Z])$/';                // Cyprus
+                $regex[] = '/^(CY)([0-5|9]\d{7}[A-Z])$/'; // Cyprus
                 break;
             case 'CZ':
-                $regex[] = '/^(CZ)(\d{8,13})$/';                         // Czech Republic
+                $regex[] = '/^(CZ)(\d{8,13})$/'; // Czech Republic
                 break;
             case 'DE':
-                $regex[] = '/^(DE)([1-9]\d{8})$/';                       // Germany
+                $regex[] = '/^(DE)([1-9]\d{8})$/'; // Germany
                 break;
             case 'DK':
-                $regex[] = '/^(DK)(\d{8})$/';                            // Denmark
+                $regex[] = '/^(DK)(\d{8})$/'; // Denmark
                 break;
             case 'EE':
-                $regex[] = '/^(EE)(10\d{7})$/';                          // Estonia
+                $regex[] = '/^(EE)(10\d{7})$/'; // Estonia
                 break;
             case 'EL':
-                $regex[] = '/^(EL)(\d{9})$/';                            // Greece
+                $regex[] = '/^(EL)(\d{9})$/'; // Greece
                 break;
             case 'ES':
-                $regex[] = '/^(ES)([A-Z]\d{8})$/';                       // Spain (National juridical entities)
-                $regex[] = '/^(ES)([A-H|N-S|W]\d{7}[A-J])$/';            // Spain (Other juridical entities)
-                $regex[] = '/^(ES)([0-9|Y|Z]\d{7}[A-Z])$/';              // Spain (Personal entities type 1)
-                $regex[] = '/^(ES)([K|L|M|X]\d{7}[A-Z])$/';              // Spain (Personal entities type 2)
+                $regex[] = '/^(ES)([A-Z]\d{8})$/'; // Spain (National juridical entities)
+                $regex[] = '/^(ES)([A-H|N-S|W]\d{7}[A-J])$/'; // Spain (Other juridical entities)
+                $regex[] = '/^(ES)([0-9|Y|Z]\d{7}[A-Z])$/'; // Spain (Personal entities type 1)
+                $regex[] = '/^(ES)([K|L|M|X]\d{7}[A-Z])$/'; // Spain (Personal entities type 2)
                 break;
             case 'EU':
-                $regex[] = '/^(EU)(\d{9})$/';                            // EU-type
+                $regex[] = '/^(EU)(\d{9})$/'; // EU-type
                 break;
             case 'FI':
-                $regex[] = '/^(FI)(\d{8})$/';                            // Finland
+                $regex[] = '/^(FI)(\d{8})$/'; // Finland
                 break;
             case 'FR':
-                $regex[] = '/^(FR)(\d{11})$/';                           // France (1)
-                $regex[] = '/^(FR)[(A-H)|(J-N)|(P-Z)](\d{10})$/';        // France (2)
-                $regex[] = '/^(FR)\d[(A-H)|(J-N)|(P-Z)](\d{9})$/';       // France (3)
-                $regex[] = '/^(FR)[(A-H)|(J-N)|(P-Z)]{2}(\d{9})$/';      // France (4)
+                $regex[] = '/^(FR)(\d{11})$/'; // France (1)
+                $regex[] = '/^(FR)[(A-H)|(J-N)|(P-Z)](\d{10})$/'; // France (2)
+                $regex[] = '/^(FR)\d[(A-H)|(J-N)|(P-Z)](\d{9})$/'; // France (3)
+                $regex[] = '/^(FR)[(A-H)|(J-N)|(P-Z)]{2}(\d{9})$/'; // France (4)
                 break;
             case 'GB':
-                $regex[] = '/^(GB)?(\d{9})$/';                           // UK (Standard)
-                $regex[] = '/^(GB)?(\d{12})$/';                          // UK (Branches)
-                $regex[] = '/^(GB)?(GD\d{3})$/';                         // UK (Government)
-                $regex[] = '/^(GB)?(HA\d{3})$/';                         // UK (Health authority)
+                $regex[] = '/^(GB)?(\d{9})$/'; // UK (Standard)
+                $regex[] = '/^(GB)?(\d{12})$/'; // UK (Branches)
+                $regex[] = '/^(GB)?(GD\d{3})$/'; // UK (Government)
+                $regex[] = '/^(GB)?(HA\d{3})$/'; // UK (Health authority)
                 break;
             case 'GR':
-                $regex[] = '/^(GR)(\d{8,9})$/';                          // Greece
+                $regex[] = '/^(GR)(\d{8,9})$/'; // Greece
                 break;
             case 'HR':
-                $regex[] = '/^(HR)(\d{11})$/';                           // Croatia
+                $regex[] = '/^(HR)(\d{11})$/'; // Croatia
                 break;
             case 'HU':
-                $regex[] = '/^(HU)(\d{8})$/';                            // Hungary
+                $regex[] = '/^(HU)(\d{8})$/'; // Hungary
                 break;
             case 'IE':
-                $regex[] = '/^(IE)(\d{7}[A-W])$/';                       // Ireland (1)
-                $regex[] = '/^(IE)([7-9][A-Z\*\+)]\d{5}[A-W])$/';        // Ireland (2)
-                $regex[] = '/^(IE)(\d{7}[A-Z][AH])$/';                   // Ireland (3) (new format from 1 Jan 2013)
+                $regex[] = '/^(IE)(\d{7}[A-W])$/'; // Ireland (1)
+                $regex[] = '/^(IE)([7-9][A-Z\*\+)]\d{5}[A-W])$/'; // Ireland (2)
+                $regex[] = '/^(IE)(\d{7}[A-Z][AH])$/'; // Ireland (3) (new format from 1 Jan 2013)
                 break;
             case 'IT':
-                $regex[] = '/^(IT)(\d{11})$/';                           // Italy
+                $regex[] = '/^(IT)(\d{11})$/'; // Italy
                 break;
             case 'LV':
-                $regex[] = '/^(LV)(\d{11})$/';                           // Latvia
+                $regex[] = '/^(LV)(\d{11})$/'; // Latvia
                 break;
             case 'LT':
-                $regex[] = '/^(LT)(\d{9}|\d{12})$/';                     // Lithuania
+                $regex[] = '/^(LT)(\d{9}|\d{12})$/'; // Lithuania
                 break;
             case 'LU':
-                $regex[] = '/^(LU)(\d{8})$/';                            // Luxembourg
+                $regex[] = '/^(LU)(\d{8})$/'; // Luxembourg
                 break;
             case 'MT':
-                $regex[] = '/^(MT)([1-9]\d{7})$/';                       // Malta
+                $regex[] = '/^(MT)([1-9]\d{7})$/'; // Malta
                 break;
             case 'NL':
-                $regex[] = '/^(NL)(\d{9})B\d{2}$/';                      // Netherlands
+                $regex[] = '/^(NL)(\d{9})B\d{2}$/'; // Netherlands
                 break;
             case 'NO':
-                $regex[] = '/^(NO)(\d{9})$/';                            // Norway (Not EU)
+                $regex[] = '/^(NO)(\d{9})$/'; // Norway (Not EU)
                 break;
             case 'PL':
-                $regex[] = '/^(PL)(\d{10})$/';                           // Poland
+                $regex[] = '/^(PL)(\d{10})$/'; // Poland
                 break;
             case 'PT':
-                $regex[] = '/^(PT)(\d{9})$/';                            // Portugal
+                $regex[] = '/^(PT)(\d{9})$/'; // Portugal
                 break;
             case 'RO':
-                $regex[] = '/^(RO)([1-9]\d{1,9})$/';                     // Romania
+                $regex[] = '/^(RO)([1-9]\d{1,9})$/'; // Romania
                 break;
             case 'RS':
-                $regex[] = '/^(RS)(\d{9})$/';                            // Serbia (Not EU)
+                $regex[] = '/^(RS)(\d{9})$/'; // Serbia (Not EU)
                 break;
             case 'SI':
-                $regex[] = '/^(SI)([1-9]\d{7})$/';                       // Slovenia
+                $regex[] = '/^(SI)([1-9]\d{7})$/'; // Slovenia
                 break;
             case 'SK':
-                $regex[] = '/^(SK)([1-9]\d[(2-4)|(6-9)]\d{7})$/';        // Slovakia Republic
+                $regex[] = '/^(SK)([1-9]\d[(2-4)|(6-9)]\d{7})$/'; // Slovakia Republic
                 break;
             case 'SE':
-                $regex[] = '/^(SE)(\d{10}01)$/';                         // Sweden
+                $regex[] = '/^(SE)(\d{10}01)$/'; // Sweden
                 break;
             default:
                 $regex = array();
             break;
         }
         
-        if ( empty( $regex ) ) {
+        if (empty($regex)) {
             return false;
         }
         
-        foreach ( $regex as $pattern ) {
+        foreach ($regex as $pattern) {
             $matches = null;
-            preg_match_all( $pattern, $vat_number, $matches );
+            preg_match_all($pattern, $vat_number, $matches);
             
-            if ( !empty( $matches[1][0] ) && !empty( $matches[2][0] ) ) {
-                if ( $formatted ) {
-                    return array( 'code' => $matches[1][0], 'number' => $matches[2][0] );
+            if (!empty($matches[1][0]) && !empty($matches[2][0])) {
+                if ($formatted) {
+                    return array('code' => $matches[1][0], 'number' => $matches[2][0]);
                 } else {
                     return true;
                 }
@@ -1055,75 +1055,75 @@ 
         return false;
     }
     
-    public static function vies_check( $vat_number, $country_code = '', $result = false ) {
-        $vat            = self::sanitize_vat( $vat_number, $country_code );
+    public static function vies_check($vat_number, $country_code = '', $result = false) {
+        $vat            = self::sanitize_vat($vat_number, $country_code);
         $vat_number     = $vat['vat'];
         $iso            = $vat['iso'];
         
-        $url = 'http://ec.europa.eu/taxation_customs/vies/viesquer.do?ms=' . urlencode( $iso ) . '&iso=' . urlencode( $iso ) . '&vat=' . urlencode( $vat_number );
+        $url = 'http://ec.europa.eu/taxation_customs/vies/viesquer.do?ms=' . urlencode($iso) . '&iso=' . urlencode($iso) . '&vat=' . urlencode($vat_number);
         
-        if ( ini_get( 'allow_url_fopen' ) ) {
-            $response = file_get_contents( $url );
-        } else if ( function_exists( 'curl_init' ) ) {
+        if (ini_get('allow_url_fopen')) {
+            $response = file_get_contents($url);
+        } else if (function_exists('curl_init')) {
             $ch = curl_init();
             
-            curl_setopt( $ch, CURLOPT_URL, $url );
-            curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, 30 );
-            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-            curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, 0 );
-            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, 0 );
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
             
-            $response = curl_exec( $ch );
+            $response = curl_exec($ch);
             
-            if ( curl_errno( $ch ) ) {
-                wpinv_error_log( curl_error( $ch ), 'VIES CHECK ERROR' );
+            if (curl_errno($ch)) {
+                wpinv_error_log(curl_error($ch), 'VIES CHECK ERROR');
                 $response = '';
             }
             
-            curl_close( $ch );
+            curl_close($ch);
         } else {
-            wpinv_error_log( 'To use VIES CHECK you must have allow_url_fopen is ON or cURL installed & active on your server.', 'VIES CHECK ERROR' );
+            wpinv_error_log('To use VIES CHECK you must have allow_url_fopen is ON or cURL installed & active on your server.', 'VIES CHECK ERROR');
         }
         
-        if ( empty( $response ) ) {
+        if (empty($response)) {
             return $result;
         }
 
-        if ( preg_match( '/invalid VAT number/i', $response ) ) {
+        if (preg_match('/invalid VAT number/i', $response)) {
             return false;
-        } else if ( preg_match( '/valid VAT number/i', $response, $matches ) ) {
-            $content = explode( "valid VAT number", htmlentities( $response ) );
+        } else if (preg_match('/valid VAT number/i', $response, $matches)) {
+            $content = explode("valid VAT number", htmlentities($response));
             
-            if ( !empty( $content[1] ) ) {
-                preg_match_all( '/<tr>(.*?)<td.*?>(.*?)<\/td>(.*?)<\/tr>/si', html_entity_decode( $content[1] ), $matches );
+            if (!empty($content[1])) {
+                preg_match_all('/<tr>(.*?)<td.*?>(.*?)<\/td>(.*?)<\/tr>/si', html_entity_decode($content[1]), $matches);
                 
-                if ( !empty( $matches[2] ) && $matches[3] ) {
+                if (!empty($matches[2]) && $matches[3]) {
                     $return = array();
                     
-                    foreach ( $matches[2] as $key => $label ) {
-                        $label = trim( $label );
+                    foreach ($matches[2] as $key => $label) {
+                        $label = trim($label);
                         
-                        switch ( strtolower( $label ) ) {
+                        switch (strtolower($label)) {
                             case 'member state':
-                                $return['state'] = trim( strip_tags( $matches[3][$key] ) );
+                                $return['state'] = trim(strip_tags($matches[3][$key]));
                             break;
                             case 'vat number':
-                                $return['number'] = trim( strip_tags( $matches[3][$key] ) );
+                                $return['number'] = trim(strip_tags($matches[3][$key]));
                             break;
                             case 'name':
-                                $return['company'] = trim( strip_tags( $matches[3][$key] ) );
+                                $return['company'] = trim(strip_tags($matches[3][$key]));
                             break;
                             case 'address':
-                                $address           = str_replace( array( "<br><br>", "<br /><br />", "<br/><br/>" ), "<br>", html_entity_decode( trim( $matches[3][$key] ) ) );
-                                $return['address'] = trim( strip_tags( $address, '<br>' ) );
+                                $address           = str_replace(array("<br><br>", "<br /><br />", "<br/><br/>"), "<br>", html_entity_decode(trim($matches[3][$key])));
+                                $return['address'] = trim(strip_tags($address, '<br>'));
                             break;
                             case 'consultation number':
-                                $return['consultation'] = trim( strip_tags( $matches[3][$key] ) );
+                                $return['consultation'] = trim(strip_tags($matches[3][$key]));
                             break;
                         }
                     }
                     
-                    if ( !empty( $return ) ) {
+                    if (!empty($return)) {
                         return $return;
                     }
                 }
@@ -1135,63 +1135,63 @@ 
         }
     }
     
-    public static function check_vat( $vat_number, $country_code = '' ) {        
+    public static function check_vat($vat_number, $country_code = '') {        
         $vat_name           = self::get_vat_name();
         
         $return             = array();
         $return['valid']    = false;
-        $return['message']  = wp_sprintf( __( '%s number not validated', 'invoicing' ), $vat_name );
+        $return['message']  = wp_sprintf(__('%s number not validated', 'invoicing'), $vat_name);
                 
-        if ( !wpinv_get_option( 'vat_offline_check' ) && !self::offline_check( $vat_number, $country_code ) ) {
+        if (!wpinv_get_option('vat_offline_check') && !self::offline_check($vat_number, $country_code)) {
             return $return;
         }
             
-        $response = self::vies_check( $vat_number, $country_code );
+        $response = self::vies_check($vat_number, $country_code);
         
-        if ( $response ) {
-            $return['valid']    = true;
+        if ($response) {
+            $return['valid'] = true;
             
-            if ( is_array( $response ) ) {
-                $return['company'] = isset( $response['company'] ) ? $response['company'] : '';
-                $return['address'] = isset( $response['address'] ) ? $response['address'] : '';
+            if (is_array($response)) {
+                $return['company'] = isset($response['company']) ? $response['company'] : '';
+                $return['address'] = isset($response['address']) ? $response['address'] : '';
                 $return['message'] = $return['company'] . '<br/>' . $return['address'];
             }
         } else {
             $return['valid']    = false;
-            $return['message']  = wp_sprintf( __( 'Fail to validate the %s number: EU Commission VAT server (VIES) check fails.', 'invoicing' ), $vat_name );
+            $return['message']  = wp_sprintf(__('Fail to validate the %s number: EU Commission VAT server (VIES) check fails.', 'invoicing'), $vat_name);
         }
         
         return $return;
     }
     
-    public static function request_euvatrates( $group ) {
+    public static function request_euvatrates($group) {
         $response               = array();
         $response['success']    = false;
         $response['error']      = null;
         $response['eurates']    = null;
         
         $euvatrates_url = 'https://euvatrates.com/rates.json';
-        $euvatrates_url = apply_filters( 'wpinv_euvatrates_url', $euvatrates_url );
-        $api_response   = wp_remote_get( $euvatrates_url );
+        $euvatrates_url = apply_filters('wpinv_euvatrates_url', $euvatrates_url);
+        $api_response   = wp_remote_get($euvatrates_url);
     
         try {
-            if ( is_wp_error( $api_response ) ) {
-                $response['error']      = __( $api_response->get_error_message(), 'invoicing' );
+            if (is_wp_error($api_response)) {
+                $response['error'] = __($api_response->get_error_message(), 'invoicing');
             } else {
-                $body = json_decode( $api_response['body'] );
+                $body = json_decode($api_response['body']);
                 
-                if ( isset( $body->rates ) ) {
+                if (isset($body->rates)) {
                     $rates = array();
                     
-                    foreach ( $body->rates as $country_code => $rate ) {
+                    foreach ($body->rates as $country_code => $rate) {
                         $vat_rate = array();
                         $vat_rate['country']        = $rate->country;
-                        $vat_rate['standard']       = (float)$rate->standard_rate;
-                        $vat_rate['reduced']        = (float)$rate->reduced_rate;
-                        $vat_rate['superreduced']   = (float)$rate->super_reduced_rate;
-                        $vat_rate['parking']        = (float)$rate->parking_rate;
+                        $vat_rate['standard']       = (float) $rate->standard_rate;
+                        $vat_rate['reduced']        = (float) $rate->reduced_rate;
+                        $vat_rate['superreduced']   = (float) $rate->super_reduced_rate;
+                        $vat_rate['parking']        = (float) $rate->parking_rate;
                         
-                        if ( $group !== '' && in_array( $group, array( 'standard', 'reduced', 'superreduced', 'parking' ) ) ) {
+                        if ($group !== '' && in_array($group, array('standard', 'reduced', 'superreduced', 'parking'))) {
                             $vat_rate_group = array();
                             $vat_rate_group['country'] = $rate->country;
                             $vat_rate_group[$group]    = $vat_rate[$group];
@@ -1203,79 +1203,79 @@ 
                     }
                     
                     $response['success']    = true;                                
-                    $response['rates']      = apply_filters( 'wpinv_process_euvatrates', $rates, $api_response, $group );
+                    $response['rates']      = apply_filters('wpinv_process_euvatrates', $rates, $api_response, $group);
                 } else {
-                    $response['error']      = __( 'No EU rates found!', 'invoicing' );
+                    $response['error']      = __('No EU rates found!', 'invoicing');
                 }
             }
-        } catch ( Exception $e ) {
-            $response['error'] = __( $e->getMessage(), 'invoicing' );
+        } catch (Exception $e) {
+            $response['error'] = __($e->getMessage(), 'invoicing');
         }
         
-        return apply_filters( 'wpinv_response_euvatrates', $response, $group );
+        return apply_filters('wpinv_response_euvatrates', $response, $group);
     }    
     
-    public static function requires_vat( $requires_vat = false, $user_id = 0, $is_digital = null ) {
+    public static function requires_vat($requires_vat = false, $user_id = 0, $is_digital = null) {
         global $wpi_item_id, $wpi_country;
         
-        if ( !empty( $_POST['wpinv_country'] ) ) {
-            $country_code = trim( $_POST['wpinv_country'] );
-        } else if ( !empty( $_POST['country'] ) ) {
-            $country_code = trim( $_POST['country'] );
-        } else if ( !empty( $wpi_country ) ) {
+        if (!empty($_POST['wpinv_country'])) {
+            $country_code = trim($_POST['wpinv_country']);
+        } else if (!empty($_POST['country'])) {
+            $country_code = trim($_POST['country']);
+        } else if (!empty($wpi_country)) {
             $country_code = $wpi_country;
         } else {
-            $country_code = self::get_user_country( '', $user_id );
+            $country_code = self::get_user_country('', $user_id);
         }
         
-        if ( $is_digital === null && $wpi_item_id ) {
-            $is_digital = $wpi_item_id ? self::item_has_digital_rule( $wpi_item_id ) : self::allow_vat_rules();
+        if ($is_digital === null && $wpi_item_id) {
+            $is_digital = $wpi_item_id ? self::item_has_digital_rule($wpi_item_id) : self::allow_vat_rules();
         }
         
-        if ( !empty( $country_code ) ) {
-            $requires_vat = ( self::is_eu_state( $country_code ) && ( self::is_eu_state( self::$default_country ) || $is_digital ) ) || ( self::is_gst_country( $country_code ) && self::is_gst_country( self::$default_country ) );
+        if (!empty($country_code)) {
+            $requires_vat = (self::is_eu_state($country_code) && (self::is_eu_state(self::$default_country) || $is_digital)) || (self::is_gst_country($country_code) && self::is_gst_country(self::$default_country));
         }
         
-        return apply_filters( 'wpinv_requires_vat', $requires_vat, $user_id );
+        return apply_filters('wpinv_requires_vat', $requires_vat, $user_id);
     }
     
-    public static function tax_label( $label = '' ) {
+    public static function tax_label($label = '') {
         global $wpi_requires_vat;
         
-        if ( !( $wpi_requires_vat !== 0 && $wpi_requires_vat ) ) {
-            $wpi_requires_vat = self::requires_vat( 0, false );
+        if (!($wpi_requires_vat !== 0 && $wpi_requires_vat)) {
+            $wpi_requires_vat = self::requires_vat(0, false);
         }
         
-        return $wpi_requires_vat ? __( self::get_vat_name(), 'invoicing' ) : ( $label ? $label : __( 'Tax', 'invoicing' ) );
+        return $wpi_requires_vat ? __(self::get_vat_name(), 'invoicing') : ($label ? $label : __('Tax', 'invoicing'));
     }
     
     public static function standard_rates_label() {
-        return __( 'Standard Rates', 'invoicing' );
+        return __('Standard Rates', 'invoicing');
     }
     
-    public static function get_rate_classes( $with_desc = false ) {        
-        $rate_classes_option = get_option( '_wpinv_vat_rate_classes', true );
-        $classes = maybe_unserialize( $rate_classes_option );
+    public static function get_rate_classes($with_desc = false) {        
+        $rate_classes_option = get_option('_wpinv_vat_rate_classes', true);
+        $classes = maybe_unserialize($rate_classes_option);
         
-        if ( empty( $classes ) || !is_array( $classes ) ) {
+        if (empty($classes) || !is_array($classes)) {
             $classes = array();
         }
 
         $rate_classes = array();
-        if ( !array_key_exists( '_standard', $classes ) ) {
-            if ( $with_desc ) {
-                $rate_classes['_standard'] = array( 'name' => self::standard_rates_label(), 'desc' => __( 'EU member states standard VAT rates', 'invoicing' ) );
+        if (!array_key_exists('_standard', $classes)) {
+            if ($with_desc) {
+                $rate_classes['_standard'] = array('name' => self::standard_rates_label(), 'desc' => __('EU member states standard VAT rates', 'invoicing'));
             } else {
                 $rate_classes['_standard'] = self::standard_rates_label();
             }
         }
         
-        foreach ( $classes as $key => $class ) {
-            $name = !empty( $class['name'] ) ? __( $class['name'], 'invoicing' ) : $key;
-            $desc = !empty( $class['desc'] ) ? __( $class['desc'], 'invoicing' ) : '';
+        foreach ($classes as $key => $class) {
+            $name = !empty($class['name']) ? __($class['name'], 'invoicing') : $key;
+            $desc = !empty($class['desc']) ? __($class['desc'], 'invoicing') : '';
             
-            if ( $with_desc ) {
-                $rate_classes[$key] = array( 'name' => $name, 'desc' => $desc );
+            if ($with_desc) {
+                $rate_classes[$key] = array('name' => $name, 'desc' => $desc);
             } else {
                 $rate_classes[$key] = $name;
             }
@@ -1286,15 +1286,15 @@ 
     
     public static function get_all_classes() {        
         $classes            = self::get_rate_classes();
-        $classes['_exempt'] = __( 'Exempt (0%)', 'invoicing' );
+        $classes['_exempt'] = __('Exempt (0%)', 'invoicing');
         
-        return apply_filters( 'wpinv_vat_get_all_classes', $classes );
+        return apply_filters('wpinv_vat_get_all_classes', $classes);
     }
     
-    public static function get_class_desc( $rate_class ) {        
-        $rate_classes = self::get_rate_classes( true );
+    public static function get_class_desc($rate_class) {        
+        $rate_classes = self::get_rate_classes(true);
 
-        if ( !empty( $rate_classes ) && isset( $rate_classes[$rate_class] ) && isset( $rate_classes[$rate_class]['desc'] ) ) {
+        if (!empty($rate_classes) && isset($rate_classes[$rate_class]) && isset($rate_classes[$rate_class]['desc'])) {
             return $rate_classes[$rate_class]['desc'];
         }
         
@@ -1310,106 +1310,106 @@ 
             'increased'     => 'Increased'
         );
         
-        return apply_filters( 'wpinv_get_vat_groups', $vat_groups );
+        return apply_filters('wpinv_get_vat_groups', $vat_groups);
     }
 
     public static function get_rules() {
         $vat_rules = array(
-            'digital' => __( 'Digital Product', 'invoicing' ),
-            'physical' => __( 'Physical Product', 'invoicing' )
+            'digital' => __('Digital Product', 'invoicing'),
+            'physical' => __('Physical Product', 'invoicing')
         );
-        return apply_filters( 'wpinv_get_vat_rules', $vat_rules );
+        return apply_filters('wpinv_get_vat_rules', $vat_rules);
     }
 
-    public static function get_vat_rates( $class ) {
-        if ( $class === '_standard' ) {
+    public static function get_vat_rates($class) {
+        if ($class === '_standard') {
             return wpinv_get_tax_rates();
         }
 
         $rates = self::get_non_standard_rates();
 
-        return array_key_exists( $class, $rates ) ? $rates[$class] : array();
+        return array_key_exists($class, $rates) ? $rates[$class] : array();
     }
 
     public static function get_non_standard_rates() {
-        $option = get_option( 'wpinv_vat_rates', array());
-        return is_array( $option ) ? $option : array();
+        $option = get_option('wpinv_vat_rates', array());
+        return is_array($option) ? $option : array();
     }
     
     public static function allow_vat_rules() {
-        return ( wpinv_use_taxes() && wpinv_get_option( 'apply_vat_rules' ) ? true : false );
+        return (wpinv_use_taxes() && wpinv_get_option('apply_vat_rules') ? true : false);
     }
     
     public static function allow_vat_classes() {
         return false; // TODO
-        return ( wpinv_get_option( 'vat_allow_classes' ) ? true : false );
+        return (wpinv_get_option('vat_allow_classes') ? true : false);
     }
     
-    public static function get_item_class( $postID ) {
-        $class = get_post_meta( $postID, '_wpinv_vat_class', true );
+    public static function get_item_class($postID) {
+        $class = get_post_meta($postID, '_wpinv_vat_class', true);
 
-        if ( empty( $class ) ) {
+        if (empty($class)) {
             $class = '_standard';
         }
         
-        return apply_filters( 'wpinv_get_item_vat_class', $class, $postID );
+        return apply_filters('wpinv_get_item_vat_class', $class, $postID);
     }
     
-    public static function item_class_label( $postID ) {        
+    public static function item_class_label($postID) {        
         $vat_classes = self::get_all_classes();
         
-        $class = self::get_item_class( $postID );
-        $class = isset( $vat_classes[$class] ) ? $vat_classes[$class] : __( $class, 'invoicing' );
+        $class = self::get_item_class($postID);
+        $class = isset($vat_classes[$class]) ? $vat_classes[$class] : __($class, 'invoicing');
         
-        return apply_filters( 'wpinv_item_class_label', $class, $postID );
+        return apply_filters('wpinv_item_class_label', $class, $postID);
     }
     
-    public static function get_item_rule( $postID ) {        
-        $rule_type = get_post_meta( $postID, '_wpinv_vat_rule', true );
+    public static function get_item_rule($postID) {        
+        $rule_type = get_post_meta($postID, '_wpinv_vat_rule', true);
         
-        if ( empty( $rule_type ) ) {        
+        if (empty($rule_type)) {        
             $rule_type = self::allow_vat_rules() ? 'digital' : 'physical';
         }
         
-        return apply_filters( 'wpinv_item_get_vat_rule', $rule_type, $postID );
+        return apply_filters('wpinv_item_get_vat_rule', $rule_type, $postID);
     }
     
-    public static function item_rule_label( $postID ) {
+    public static function item_rule_label($postID) {
         $vat_rules  = self::get_rules();
-        $vat_rule   = self::get_item_rule( $postID );
-        $vat_rule   = isset( $vat_rules[$vat_rule] ) ? $vat_rules[$vat_rule] : $vat_rule;
+        $vat_rule   = self::get_item_rule($postID);
+        $vat_rule   = isset($vat_rules[$vat_rule]) ? $vat_rules[$vat_rule] : $vat_rule;
         
-        return apply_filters( 'wpinv_item_rule_label', $vat_rule, $postID );
+        return apply_filters('wpinv_item_rule_label', $vat_rule, $postID);
     }
     
-    public static function item_has_digital_rule( $item_id = 0 ) {        
-        return self::get_item_rule( $item_id ) == 'digital' ? true : false;
+    public static function item_has_digital_rule($item_id = 0) {        
+        return self::get_item_rule($item_id) == 'digital' ? true : false;
     }
     
-    public static function invoice_has_digital_rule( $invoice = 0 ) {        
-        if ( !self::allow_vat_rules() ) {
+    public static function invoice_has_digital_rule($invoice = 0) {        
+        if (!self::allow_vat_rules()) {
             return false;
         }
         
-        if ( empty( $invoice ) ) {
+        if (empty($invoice)) {
             return true;
         }
         
-        if ( is_int( $invoice ) ) {
-            $invoice = new WPInv_Invoice( $invoice );
+        if (is_int($invoice)) {
+            $invoice = new WPInv_Invoice($invoice);
         }
         
-        if ( !( is_object( $invoice ) && is_a( $invoice, 'WPInv_Invoice' ) ) ) {
+        if (!(is_object($invoice) && is_a($invoice, 'WPInv_Invoice'))) {
             return true;
         }
         
-        $cart_items  = $invoice->get_cart_details();
+        $cart_items = $invoice->get_cart_details();
         
-        if ( !empty( $cart_items ) ) {
+        if (!empty($cart_items)) {
             $has_digital_rule = false;
             
-            foreach ( $cart_items as $key => $item ) {
-                if ( self::item_has_digital_rule( $item['id'] ) ) {
+            foreach ($cart_items as $key => $item) {
+                if (self::item_has_digital_rule($item['id'])) {
                     $has_digital_rule = true;
                     break;
                 }
@@ -1421,67 +1421,67 @@ 
         return $has_digital_rule;
     }
     
-    public static function item_is_taxable( $item_id = 0, $country = false, $state = false ) {        
-        if ( !wpinv_use_taxes() ) {
+    public static function item_is_taxable($item_id = 0, $country = false, $state = false) {        
+        if (!wpinv_use_taxes()) {
             return false;
         }
         
         $is_taxable = true;
 
-        if ( !empty( $item_id ) && self::get_item_class( $item_id ) == '_exempt' ) {
+        if (!empty($item_id) && self::get_item_class($item_id) == '_exempt') {
             $is_taxable = false;
         }
         
-        return apply_filters( 'wpinv_item_is_taxable', $is_taxable, $item_id, $country , $state );
+        return apply_filters('wpinv_item_is_taxable', $is_taxable, $item_id, $country, $state);
     }
     
-    public static function find_rate( $country, $state, $rate, $class ) {
+    public static function find_rate($country, $state, $rate, $class) {
         global $wpi_zero_tax;
 
-        if ( $class === '_exempt' || $wpi_zero_tax ) {
+        if ($class === '_exempt' || $wpi_zero_tax) {
             return 0;
         }
 
-        $tax_rates   = wpinv_get_tax_rates();
+        $tax_rates = wpinv_get_tax_rates();
         
-        if ( $class !== '_standard' ) {
-            $class_rates = self::get_vat_rates( $class );
+        if ($class !== '_standard') {
+            $class_rates = self::get_vat_rates($class);
             
-            if ( is_array( $class_rates ) ) {
+            if (is_array($class_rates)) {
                 $indexed_class_rates = array();
                 
-                foreach ( $class_rates as $key => $cr ) {
+                foreach ($class_rates as $key => $cr) {
                     $indexed_class_rates[$cr['country']] = $cr;
                 }
 
-                $tax_rates = array_map( function( $tr ) use( $indexed_class_rates ) {
+                $tax_rates = array_map(function($tr) use($indexed_class_rates) {
                     $tr_country = $tr['country'];
-                    if ( !isset( $indexed_class_rates[$tr_country] ) ) {
+                    if (!isset($indexed_class_rates[$tr_country])) {
                         return $tr;
                     }
                     $icr = $indexed_class_rates[$tr_country];
-                    return ( empty( $icr['rate'] ) && $icr['rate'] !== '0' ) ? $tr : $icr;
+                    return (empty($icr['rate']) && $icr['rate'] !== '0') ? $tr : $icr;
 
-                }, $tax_rates, $class_rates );
+                }, $tax_rates, $class_rates);
             }
         }
 
-        if ( !empty( $tax_rates ) ) {
-            foreach ( $tax_rates as $key => $tax_rate ) {
-                if ( $country != $tax_rate['country'] )
+        if (!empty($tax_rates)) {
+            foreach ($tax_rates as $key => $tax_rate) {
+                if ($country != $tax_rate['country'])
                     continue;
 
-                if ( !empty( $tax_rate['global'] ) ) {
-                    if ( 0 !== $tax_rate['rate'] || !empty( $tax_rate['rate'] ) ) {
-                        $rate = number_format( $tax_rate['rate'], 4 );
+                if (!empty($tax_rate['global'])) {
+                    if (0 !== $tax_rate['rate'] || !empty($tax_rate['rate'])) {
+                        $rate = number_format($tax_rate['rate'], 4);
                     }
                 } else {
-                    if ( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) )
+                    if (empty($tax_rate['state']) || strtolower($state) != strtolower($tax_rate['state']))
                         continue;
 
                     $state_rate = $tax_rate['rate'];
-                    if ( 0 !== $state_rate || !empty( $state_rate ) ) {
-                        $rate = number_format( $state_rate, 4 );
+                    if (0 !== $state_rate || !empty($state_rate)) {
+                        $rate = number_format($state_rate, 4);
                     }
                 }
             }
@@ -1490,84 +1490,84 @@ 
         return $rate;
     }
     
-    public static function get_rate( $rate = 1, $country = '', $state = '', $item_id = 0 ) {
+    public static function get_rate($rate = 1, $country = '', $state = '', $item_id = 0) {
         global $wpinv_options, $wpi_session, $wpi_item_id, $wpi_zero_tax;
         
         $item_id = $item_id > 0 ? $item_id : $wpi_item_id;
         $allow_vat_classes = self::allow_vat_classes();
-        $class = $item_id ? self::get_item_class( $item_id ) : '_standard';
+        $class = $item_id ? self::get_item_class($item_id) : '_standard';
 
-        if ( $class === '_exempt' || $wpi_zero_tax ) {
+        if ($class === '_exempt' || $wpi_zero_tax) {
             return 0;
-        } else if ( !$allow_vat_classes ) {
+        } else if (!$allow_vat_classes) {
             $class = '_standard';
         }
 
-        if( !empty( $_POST['wpinv_country'] ) ) {
+        if (!empty($_POST['wpinv_country'])) {
             $post_country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['wpinv_country'] ) ) {
+        } elseif (!empty($_POST['wpinv_country'])) {
             $post_country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['country'] ) ) {
+        } elseif (!empty($_POST['country'])) {
             $post_country = $_POST['country'];
         } else {
             $post_country = '';
         }
 
-        $country        = !empty( $post_country ) ? $post_country : wpinv_default_billing_country( $country );
-        $base_country   = wpinv_is_base_country( $country );
+        $country        = !empty($post_country) ? $post_country : wpinv_default_billing_country($country);
+        $base_country   = wpinv_is_base_country($country);
         
-        $requires_vat   = self::requires_vat( 0, false );
-        $is_digital     = self::get_item_rule( $item_id ) == 'digital' ;
-        $rate           = $requires_vat && isset( $wpinv_options['eu_fallback_rate'] ) ? $wpinv_options['eu_fallback_rate'] : $rate;
+        $requires_vat   = self::requires_vat(0, false);
+        $is_digital     = self::get_item_rule($item_id) == 'digital';
+        $rate           = $requires_vat && isset($wpinv_options['eu_fallback_rate']) ? $wpinv_options['eu_fallback_rate'] : $rate;
           
-        if ( self::same_country_rule() == 'no' && $base_country ) { // Disable VAT to same country
+        if (self::same_country_rule() == 'no' && $base_country) { // Disable VAT to same country
             $rate = 0;
-        } else if ( $requires_vat ) {
-            $vat_number = self::get_user_vat_number( '', 0, true );
+        } else if ($requires_vat) {
+            $vat_number = self::get_user_vat_number('', 0, true);
             $vat_info   = self::current_vat_data();
             
-            if ( is_array( $vat_info ) ) {
-                $vat_number = isset( $vat_info['number'] ) && !empty( $vat_info['valid'] ) ? $vat_info['number'] : "";
+            if (is_array($vat_info)) {
+                $vat_number = isset($vat_info['number']) && !empty($vat_info['valid']) ? $vat_info['number'] : "";
             }
             
-            if ( $country == 'UK' ) {
+            if ($country == 'UK') {
                 $country = 'GB';
             }
 
-            if ( !empty( $vat_number ) ) {
+            if (!empty($vat_number)) {
                 $rate = 0;
             } else {
-                $rate = self::find_rate( $country, $state, $rate, $class ); // Fix if there are no tax rated and you try to pay an invoice it does not add the fallback tax rate
+                $rate = self::find_rate($country, $state, $rate, $class); // Fix if there are no tax rated and you try to pay an invoice it does not add the fallback tax rate
             }
 
-            if ( empty( $vat_number ) && !$is_digital ) {
-                if ( $base_country ) {
-                    $rate = self::find_rate( $country, null, $rate, $class );
+            if (empty($vat_number) && !$is_digital) {
+                if ($base_country) {
+                    $rate = self::find_rate($country, null, $rate, $class);
                 } else {
-                    if ( empty( $country ) && isset( $wpinv_options['eu_fallback_rate'] ) ) {
+                    if (empty($country) && isset($wpinv_options['eu_fallback_rate'])) {
                         $rate = $wpinv_options['eu_fallback_rate'];
-                    } else if( !empty( $country ) ) {
-                        $rate = self::find_rate( $country, $state, $rate, $class );
+                    } else if (!empty($country)) {
+                        $rate = self::find_rate($country, $state, $rate, $class);
                     }
                 }
-            } else if ( empty( $vat_number ) || ( self::same_country_rule() == 'always' && $base_country ) ) {
-                if ( empty( $country ) && isset( $wpinv_options['eu_fallback_rate'] ) ) {
+            } else if (empty($vat_number) || (self::same_country_rule() == 'always' && $base_country)) {
+                if (empty($country) && isset($wpinv_options['eu_fallback_rate'])) {
                     $rate = $wpinv_options['eu_fallback_rate'];
-                } else if( !empty( $country ) ) {
-                    $rate = self::find_rate( $country, $state, $rate, $class );
+                } else if (!empty($country)) {
+                    $rate = self::find_rate($country, $state, $rate, $class);
                 }
             }
         } else {
-            if ( $is_digital ) {
+            if ($is_digital) {
                 $ip_country_code = self::get_country_by_ip();
                 
-                if ( $ip_country_code && self::is_eu_state( $ip_country_code ) ) {
-                    $rate = self::find_rate( $ip_country_code, '', 0, $class );
+                if ($ip_country_code && self::is_eu_state($ip_country_code)) {
+                    $rate = self::find_rate($ip_country_code, '', 0, $class);
                 } else {
-                    $rate = self::find_rate( $country, $state, $rate, $class );
+                    $rate = self::find_rate($country, $state, $rate, $class);
                 }
             } else {
-                $rate = self::find_rate( $country, $state, $rate, $class );
+                $rate = self::find_rate($country, $state, $rate, $class);
             }
         }
 
@@ -1577,48 +1577,48 @@ 
     public static function current_vat_data() {
         global $wpi_session;
         
-        return $wpi_session->get( 'user_vat_data' );
+        return $wpi_session->get('user_vat_data');
     }
     
-    public static function get_user_country( $country = '', $user_id = 0 ) {
-        $user_address = wpinv_get_user_address( $user_id, false );
+    public static function get_user_country($country = '', $user_id = 0) {
+        $user_address = wpinv_get_user_address($user_id, false);
         
-        if ( wpinv_get_option( 'vat_ip_country_default' ) ) {
+        if (wpinv_get_option('vat_ip_country_default')) {
             $country = '';
         }
         
-        $country    = empty( $user_address ) || !isset( $user_address['country'] ) || empty( $user_address['country'] ) ? $country : $user_address['country'];
-        $result     = apply_filters( 'wpinv_get_user_country', $country, $user_id );
+        $country    = empty($user_address) || !isset($user_address['country']) || empty($user_address['country']) ? $country : $user_address['country'];
+        $result     = apply_filters('wpinv_get_user_country', $country, $user_id);
 
-        if ( empty( $result ) ) {
+        if (empty($result)) {
             $result = self::get_country_by_ip();
         }
 
         return $result;
     }
     
-    public static function set_user_country( $country = '', $user_id = 0 ) {
+    public static function set_user_country($country = '', $user_id = 0) {
         global $wpi_userID;
         
-        if ( empty($country) && !empty($wpi_userID) && get_current_user_id() != $wpi_userID ) {
+        if (empty($country) && !empty($wpi_userID) && get_current_user_id() != $wpi_userID) {
             $country = wpinv_get_default_country();
         }
         
         return $country;
     }
     
-    public static function get_user_vat_number( $vat_number = '', $user_id = 0, $is_valid = false ) {
+    public static function get_user_vat_number($vat_number = '', $user_id = 0, $is_valid = false) {
         global $wpi_current_id, $wpi_userID;
         
-        if ( !empty( $_POST['new_user'] ) ) {
+        if (!empty($_POST['new_user'])) {
             return '';
         }
         
-        if ( empty( $user_id ) ) {
-            $user_id = !empty( $wpi_userID ) ? $wpi_userID : ( $wpi_current_id ? wpinv_get_user_id( $wpi_current_id ) : get_current_user_id() );
+        if (empty($user_id)) {
+            $user_id = !empty($wpi_userID) ? $wpi_userID : ($wpi_current_id ? wpinv_get_user_id($wpi_current_id) : get_current_user_id());
         }
 
-        $vat_number = empty( $user_id ) ? '' : get_user_meta( $user_id, '_wpinv_vat_number', true );
+        $vat_number = empty($user_id) ? '' : get_user_meta($user_id, '_wpinv_vat_number', true);
         
         /* TODO
         if ( $is_valid && $vat_number ) {
@@ -1629,38 +1629,38 @@ 
         }
         */
 
-        return apply_filters('wpinv_get_user_vat_number', $vat_number, $user_id, $is_valid );
+        return apply_filters('wpinv_get_user_vat_number', $vat_number, $user_id, $is_valid);
     }
     
-    public static function get_user_company( $company = '', $user_id = 0 ) {
+    public static function get_user_company($company = '', $user_id = 0) {
         global $wpi_current_id, $wpi_userID;
         
-        if ( empty( $user_id ) ) {
-            $user_id = !empty( $wpi_userID ) ? $wpi_userID : ( $wpi_current_id ? wpinv_get_user_id( $wpi_current_id ) : get_current_user_id() );
+        if (empty($user_id)) {
+            $user_id = !empty($wpi_userID) ? $wpi_userID : ($wpi_current_id ? wpinv_get_user_id($wpi_current_id) : get_current_user_id());
         }
 
-        $company = empty( $user_id ) ? "" : get_user_meta( $user_id, '_wpinv_company', true );
+        $company = empty($user_id) ? "" : get_user_meta($user_id, '_wpinv_company', true);
 
-        return apply_filters( 'wpinv_user_company', $company, $user_id );
+        return apply_filters('wpinv_user_company', $company, $user_id);
     }
     
-    public static function save_user_vat_details( $company = '', $vat_number = '' ) {
-        $save = apply_filters( 'wpinv_allow_save_user_vat_details', true );
+    public static function save_user_vat_details($company = '', $vat_number = '') {
+        $save = apply_filters('wpinv_allow_save_user_vat_details', true);
 
-        if ( is_user_logged_in() && $save ) {
+        if (is_user_logged_in() && $save) {
             $user_id = get_current_user_id();
 
-            if ( !empty( $vat_number ) ) {
-                update_user_meta( $user_id, '_wpinv_vat_number', $vat_number );
+            if (!empty($vat_number)) {
+                update_user_meta($user_id, '_wpinv_vat_number', $vat_number);
             } else {
-                delete_user_meta( $user_id, '_wpinv_vat_number');
+                delete_user_meta($user_id, '_wpinv_vat_number');
             }
 
-            if ( !empty( $company ) ) {
-                update_user_meta( $user_id, '_wpinv_company', $company );
+            if (!empty($company)) {
+                update_user_meta($user_id, '_wpinv_company', $company);
             } else {
-                delete_user_meta( $user_id, '_wpinv_company');
-                delete_user_meta( $user_id, '_wpinv_vat_number');
+                delete_user_meta($user_id, '_wpinv_company');
+                delete_user_meta($user_id, '_wpinv_vat_number');
             }
         }
 
@@ -1670,113 +1670,113 @@ 
     public static function ajax_vat_validate() {
         global $wpinv_options, $wpi_session;
         
-        $is_checkout            = ( !empty( $_POST['source'] ) && $_POST['source'] == 'checkout' ) ? true : false;
+        $is_checkout            = (!empty($_POST['source']) && $_POST['source'] == 'checkout') ? true : false;
         $response               = array();
         $response['success']    = false;
         
-        if ( empty( $_REQUEST['_wpi_nonce'] ) || ( !empty( $_REQUEST['_wpi_nonce'] ) && !wp_verify_nonce( $_REQUEST['_wpi_nonce'], 'vat_validation' ) ) ) {
-            $response['error'] = __( 'Invalid security nonce', 'invoicing' );
-            wp_send_json( $response );
+        if (empty($_REQUEST['_wpi_nonce']) || (!empty($_REQUEST['_wpi_nonce']) && !wp_verify_nonce($_REQUEST['_wpi_nonce'], 'vat_validation'))) {
+            $response['error'] = __('Invalid security nonce', 'invoicing');
+            wp_send_json($response);
         }
         
-        $vat_name   = self::get_vat_name();
+        $vat_name = self::get_vat_name();
         
-        if ( $is_checkout ) {
+        if ($is_checkout) {
             $invoice = wpinv_get_invoice_cart();
             
-            if ( !self::requires_vat( false, 0, self::invoice_has_digital_rule( $invoice ) ) ) {
+            if (!self::requires_vat(false, 0, self::invoice_has_digital_rule($invoice))) {
                 $vat_info = array();
-                $wpi_session->set( 'user_vat_data', $vat_info );
+                $wpi_session->set('user_vat_data', $vat_info);
 
                 self::save_user_vat_details();
                 
                 $response['success'] = true;
-                $response['message'] = wp_sprintf( __( 'Ignore %s', 'invoicing' ), $vat_name );
-                wp_send_json( $response );
+                $response['message'] = wp_sprintf(__('Ignore %s', 'invoicing'), $vat_name);
+                wp_send_json($response);
             }
         }
         
-        $company    = !empty( $_POST['company'] ) ? sanitize_text_field( $_POST['company'] ) : '';
-        $vat_number = !empty( $_POST['number'] ) ? sanitize_text_field( $_POST['number'] ) : '';
+        $company    = !empty($_POST['company']) ? sanitize_text_field($_POST['company']) : '';
+        $vat_number = !empty($_POST['number']) ? sanitize_text_field($_POST['number']) : '';
         
-        $vat_info = $wpi_session->get( 'user_vat_data' );
-        if ( !is_array( $vat_info ) || empty( $vat_info ) ) {
-            $vat_info = array( 'company'=> $company, 'number' => '', 'valid' => true );
+        $vat_info = $wpi_session->get('user_vat_data');
+        if (!is_array($vat_info) || empty($vat_info)) {
+            $vat_info = array('company'=> $company, 'number' => '', 'valid' => true);
         }
         
-        if ( empty( $vat_number ) ) {
-            if ( $is_checkout ) {
+        if (empty($vat_number)) {
+            if ($is_checkout) {
                 $response['success'] = true;
-                $response['message'] = wp_sprintf( __( 'No %s number has been applied. %s will be added to invoice totals', 'invoicing' ), $vat_name, $vat_name );
+                $response['message'] = wp_sprintf(__('No %s number has been applied. %s will be added to invoice totals', 'invoicing'), $vat_name, $vat_name);
                 
-                $vat_info = $wpi_session->get( 'user_vat_data' );
+                $vat_info = $wpi_session->get('user_vat_data');
                 $vat_info['number'] = "";
                 $vat_info['valid'] = true;
                 
-                self::save_user_vat_details( $company );
+                self::save_user_vat_details($company);
             } else {
-                $response['error'] = wp_sprintf( __( 'Please enter your %s number!', 'invoicing' ), $vat_name );
+                $response['error'] = wp_sprintf(__('Please enter your %s number!', 'invoicing'), $vat_name);
                 
                 $vat_info['valid'] = false;
             }
 
-            $wpi_session->set( 'user_vat_data', $vat_info );
-            wp_send_json( $response );
+            $wpi_session->set('user_vat_data', $vat_info);
+            wp_send_json($response);
         }
         
-        if ( empty( $company ) ) {
+        if (empty($company)) {
             $vat_info['valid'] = false;
-            $wpi_session->set( 'user_vat_data', $vat_info );
+            $wpi_session->set('user_vat_data', $vat_info);
             
-            $response['error'] = __( 'Please enter your registered company name!', 'invoicing' );
-            wp_send_json( $response );
+            $response['error'] = __('Please enter your registered company name!', 'invoicing');
+            wp_send_json($response);
         }
         
-        if ( !empty( $wpinv_options['vat_vies_check'] ) ) {
-            if ( empty( $wpinv_options['vat_offline_check'] ) && !self::offline_check( $vat_number ) ) {
+        if (!empty($wpinv_options['vat_vies_check'])) {
+            if (empty($wpinv_options['vat_offline_check']) && !self::offline_check($vat_number)) {
                 $vat_info['valid'] = false;
-                $wpi_session->set( 'user_vat_data', $vat_info );
+                $wpi_session->set('user_vat_data', $vat_info);
                 
-                $response['error'] = wp_sprintf( __( '%s number not validated', 'invoicing' ), $vat_name );
-                wp_send_json( $response );
+                $response['error'] = wp_sprintf(__('%s number not validated', 'invoicing'), $vat_name);
+                wp_send_json($response);
             }
             
             $response['success'] = true;
-            $response['message'] = wp_sprintf( __( '%s number validated', 'invoicing' ), $vat_name );
+            $response['message'] = wp_sprintf(__('%s number validated', 'invoicing'), $vat_name);
         } else {
-            $result = self::check_vat( $vat_number );
+            $result = self::check_vat($vat_number);
             
-            if ( empty( $result['valid'] ) ) {
+            if (empty($result['valid'])) {
                 $response['error'] = $result['message'];
-                wp_send_json( $response );
+                wp_send_json($response);
             }
             
-            $vies_company = !empty( $result['company'] ) ? $result['company'] : '';
-            $vies_company = apply_filters( 'wpinv_vies_company_name', $vies_company );
+            $vies_company = !empty($result['company']) ? $result['company'] : '';
+            $vies_company = apply_filters('wpinv_vies_company_name', $vies_company);
             
-            $valid_company = $vies_company && $company && ( $vies_company == '---' || strcasecmp( trim( $vies_company ), trim( $company ) ) == 0 ) ? true : false;
+            $valid_company = $vies_company && $company && ($vies_company == '---' || strcasecmp(trim($vies_company), trim($company)) == 0) ? true : false;
 
-            if ( !empty( $wpinv_options['vat_disable_company_name_check'] ) || $valid_company ) {
+            if (!empty($wpinv_options['vat_disable_company_name_check']) || $valid_company) {
                 $response['success'] = true;
-                $response['message'] = wp_sprintf( __( '%s number validated', 'invoicing' ), $vat_name );
+                $response['message'] = wp_sprintf(__('%s number validated', 'invoicing'), $vat_name);
             } else {           
                 $vat_info['valid'] = false;
-                $wpi_session->set( 'user_vat_data', $vat_info );
+                $wpi_session->set('user_vat_data', $vat_info);
                 
                 $response['success'] = false;
-                $response['message'] = wp_sprintf( __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ), $vat_name );
-                wp_send_json( $response );
+                $response['message'] = wp_sprintf(__('The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing'), $vat_name);
+                wp_send_json($response);
             }
         }
         
-        if ( $is_checkout ) {
-            self::save_user_vat_details( $company, $vat_number );
+        if ($is_checkout) {
+            self::save_user_vat_details($company, $vat_number);
 
-            $vat_info = array('company' => $company, 'number' => $vat_number, 'valid' => true );
-            $wpi_session->set( 'user_vat_data', $vat_info );
+            $vat_info = array('company' => $company, 'number' => $vat_number, 'valid' => true);
+            $wpi_session->set('user_vat_data', $vat_info);
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function ajax_vat_reset() {
@@ -1785,161 +1785,161 @@ 
         $company    = is_user_logged_in() ? self::get_user_company() : '';
         $vat_number = self::get_user_vat_number();
         
-        $vat_info   = array('company' => $company, 'number' => $vat_number, 'valid' => false );
-        $wpi_session->set( 'user_vat_data', $vat_info );
+        $vat_info   = array('company' => $company, 'number' => $vat_number, 'valid' => false);
+        $wpi_session->set('user_vat_data', $vat_info);
         
         $response                       = array();
         $response['success']            = true;
         $response['data']['company']    = $company;
         $response['data']['number']     = $vat_number;
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
-    public static function checkout_vat_validate( $valid_data, $post ) {
+    public static function checkout_vat_validate($valid_data, $post) {
         global $wpinv_options, $wpi_session;
         
-        $vat_name  = __( self::get_vat_name(), 'invoicing' );
+        $vat_name = __(self::get_vat_name(), 'invoicing');
         
-        if ( !isset( $_POST['_wpi_nonce'] ) || !wp_verify_nonce( $_POST['_wpi_nonce'], 'vat_validation' ) ) {
-            wpinv_set_error( 'vat_validation', wp_sprintf( __( "Invalid %s validation request.", 'invoicing' ), $vat_name ) );
+        if (!isset($_POST['_wpi_nonce']) || !wp_verify_nonce($_POST['_wpi_nonce'], 'vat_validation')) {
+            wpinv_set_error('vat_validation', wp_sprintf(__("Invalid %s validation request.", 'invoicing'), $vat_name));
             return;
         }
         
-        $vat_saved = $wpi_session->get( 'user_vat_data' );
-        $wpi_session->set( 'user_vat_data', null );
+        $vat_saved = $wpi_session->get('user_vat_data');
+        $wpi_session->set('user_vat_data', null);
         
         $invoice        = wpinv_get_invoice_cart();
         $amount         = $invoice->get_total();
-        $is_digital     = self::invoice_has_digital_rule( $invoice );
-        $no_vat         = !self::requires_vat( 0, false, $is_digital );
+        $is_digital     = self::invoice_has_digital_rule($invoice);
+        $no_vat         = !self::requires_vat(0, false, $is_digital);
         
-        $company        = !empty( $_POST['wpinv_company'] ) ? $_POST['wpinv_company'] : null;
-        $vat_number     = !empty( $_POST['wpinv_vat_number'] ) ? $_POST['wpinv_vat_number'] : null;
-        $country        = !empty( $_POST['wpinv_country'] ) ? $_POST['wpinv_country'] : $invoice->country;
-        if ( empty( $country ) ) {
+        $company        = !empty($_POST['wpinv_company']) ? $_POST['wpinv_company'] : null;
+        $vat_number     = !empty($_POST['wpinv_vat_number']) ? $_POST['wpinv_vat_number'] : null;
+        $country        = !empty($_POST['wpinv_country']) ? $_POST['wpinv_country'] : $invoice->country;
+        if (empty($country)) {
             $country = wpinv_default_billing_country();
         }
         
-        if ( !$is_digital && $no_vat ) {
+        if (!$is_digital && $no_vat) {
             return;
         }
             
-        $vat_data           = array( 'company' => '', 'number' => '', 'valid' => false );
+        $vat_data           = array('company' => '', 'number' => '', 'valid' => false);
         
         $ip_country_code    = self::get_country_by_ip();
-        $is_eu_state        = self::is_eu_state( $country );
-        $is_eu_state_ip     = self::is_eu_state( $ip_country_code );
+        $is_eu_state        = self::is_eu_state($country);
+        $is_eu_state_ip     = self::is_eu_state($ip_country_code);
         $is_non_eu_user     = !$is_eu_state && !$is_eu_state_ip;
         
-        if ( $is_digital && !$is_non_eu_user && empty( $vat_number ) && apply_filters( 'wpinv_checkout_requires_country', true, $amount ) ) {
+        if ($is_digital && !$is_non_eu_user && empty($vat_number) && apply_filters('wpinv_checkout_requires_country', true, $amount)) {
             $vat_data['adddress_confirmed'] = false;
             
-            if ( !isset( $_POST['wpinv_adddress_confirmed'] ) ) {
-                if ( $ip_country_code != $country ) {
-                    wpinv_set_error( 'vat_validation', sprintf( __( 'The country of your current location must be the same as the country of your billing location or you must %s confirm %s the billing address is your home country.', 'invoicing' ), '<a href="#wpinv_adddress_confirm">', '</a>' ) );
+            if (!isset($_POST['wpinv_adddress_confirmed'])) {
+                if ($ip_country_code != $country) {
+                    wpinv_set_error('vat_validation', sprintf(__('The country of your current location must be the same as the country of your billing location or you must %s confirm %s the billing address is your home country.', 'invoicing'), '<a href="#wpinv_adddress_confirm">', '</a>'));
                 }
             } else {
                 $vat_data['adddress_confirmed'] = true;
             }
         }
         
-        if ( !empty( $wpinv_options['vat_prevent_b2c_purchase'] ) && !$is_non_eu_user && ( empty( $vat_number ) || $no_vat ) ) {
-            if ( $is_eu_state ) {
-                wpinv_set_error( 'vat_validation', wp_sprintf( __( 'Please enter and validate your %s number to verify your purchase is by an EU business.', 'invoicing' ), $vat_name ) );
-            } else if ( $is_digital && $is_eu_state_ip ) {
-                wpinv_set_error( 'vat_validation', wp_sprintf( __( 'Sales to non-EU countries cannot be completed because %s must be applied.', 'invoicing' ), $vat_name ) );
+        if (!empty($wpinv_options['vat_prevent_b2c_purchase']) && !$is_non_eu_user && (empty($vat_number) || $no_vat)) {
+            if ($is_eu_state) {
+                wpinv_set_error('vat_validation', wp_sprintf(__('Please enter and validate your %s number to verify your purchase is by an EU business.', 'invoicing'), $vat_name));
+            } else if ($is_digital && $is_eu_state_ip) {
+                wpinv_set_error('vat_validation', wp_sprintf(__('Sales to non-EU countries cannot be completed because %s must be applied.', 'invoicing'), $vat_name));
             }
         }
         
-        if ( !$is_eu_state || $no_vat || empty( $vat_number ) ) {
+        if (!$is_eu_state || $no_vat || empty($vat_number)) {
             return;
         }
 
-        if ( !empty( $vat_saved ) && isset( $vat_saved['valid'] ) ) {
-            $vat_data['valid']  = $vat_saved['valid'];
+        if (!empty($vat_saved) && isset($vat_saved['valid'])) {
+            $vat_data['valid'] = $vat_saved['valid'];
         }
             
-        if ( $company !== null ) {
+        if ($company !== null) {
             $vat_data['company'] = $company;
         }
 
         $message = '';
-        if ( $vat_number !== null ) {
+        if ($vat_number !== null) {
             $vat_data['number'] = $vat_number;
             
-            if ( !$vat_data['valid'] || ( $vat_saved['number'] !== $vat_data['number'] ) || ( $vat_saved['company'] !== $vat_data['company'] ) ) {
-                if ( !empty( $wpinv_options['vat_vies_check'] ) ) {            
-                    if ( empty( $wpinv_options['vat_offline_check'] ) && !self::offline_check( $vat_number ) ) {
+            if (!$vat_data['valid'] || ($vat_saved['number'] !== $vat_data['number']) || ($vat_saved['company'] !== $vat_data['company'])) {
+                if (!empty($wpinv_options['vat_vies_check'])) {            
+                    if (empty($wpinv_options['vat_offline_check']) && !self::offline_check($vat_number)) {
                         $vat_data['valid'] = false;
                     }
                 } else {
-                    $result = self::check_vat( $vat_number );
+                    $result = self::check_vat($vat_number);
                     
-                    if ( !empty( $result['valid'] ) ) {                
+                    if (!empty($result['valid'])) {                
                         $vat_data['valid'] = true;
-                        $vies_company = !empty( $result['company'] ) ? $result['company'] : '';
-                        $vies_company = apply_filters( 'wpinv_vies_company_name', $vies_company );
+                        $vies_company = !empty($result['company']) ? $result['company'] : '';
+                        $vies_company = apply_filters('wpinv_vies_company_name', $vies_company);
                     
-                        $valid_company = $vies_company && $company && ( $vies_company == '---' || strcasecmp( trim( $vies_company ), trim( $company ) ) == 0 ) ? true : false;
+                        $valid_company = $vies_company && $company && ($vies_company == '---' || strcasecmp(trim($vies_company), trim($company)) == 0) ? true : false;
 
-                        if ( !( !empty( $wpinv_options['vat_disable_company_name_check'] ) || $valid_company ) ) {         
+                        if (!(!empty($wpinv_options['vat_disable_company_name_check']) || $valid_company)) {         
                             $vat_data['valid'] = false;
                             
-                            $message = wp_sprintf( __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ), $vat_name );
+                            $message = wp_sprintf(__('The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing'), $vat_name);
                         }
                     } else {
-                        $message = wp_sprintf( __( 'Fail to validate the %s number: EU Commission VAT server (VIES) check fails.', 'invoicing' ), $vat_name );
+                        $message = wp_sprintf(__('Fail to validate the %s number: EU Commission VAT server (VIES) check fails.', 'invoicing'), $vat_name);
                     }
                 }
                 
-                if ( !$vat_data['valid'] ) {
-                    $error = wp_sprintf( __( 'The %s %s number %s you have entered has not been validated', 'invoicing' ), '<a href="#wpi-vat-details">', $vat_name, '</a>' ) . ( $message ? ' ( ' . $message . ' )' : '' );
-                    wpinv_set_error( 'vat_validation', $error );
+                if (!$vat_data['valid']) {
+                    $error = wp_sprintf(__('The %s %s number %s you have entered has not been validated', 'invoicing'), '<a href="#wpi-vat-details">', $vat_name, '</a>') . ($message ? ' ( ' . $message . ' )' : '');
+                    wpinv_set_error('vat_validation', $error);
                 }
             }
         }
 
-        $wpi_session->set( 'user_vat_data', $vat_data );
+        $wpi_session->set('user_vat_data', $vat_data);
     }
     
-    public static function checkout_vat_fields( $billing_details ) {
+    public static function checkout_vat_fields($billing_details) {
         global $wpi_session, $wpinv_options, $wpi_country, $wpi_requires_vat;
         
         $ip_address         = wpinv_get_ip();
         $ip_country_code    = self::get_country_by_ip();
         
-        $tax_label          = __( self::get_vat_name(), 'invoicing' );
+        $tax_label          = __(self::get_vat_name(), 'invoicing');
         $invoice            = wpinv_get_invoice_cart();
-        $is_digital         = self::invoice_has_digital_rule( $invoice );
+        $is_digital         = self::invoice_has_digital_rule($invoice);
         $wpi_country        = $invoice->country;
         
-        $requires_vat       = !self::hide_vat_fields() && !$invoice->is_free() && self::requires_vat( 0, false, $is_digital );
+        $requires_vat       = !self::hide_vat_fields() && !$invoice->is_free() && self::requires_vat(0, false, $is_digital);
         $wpi_requires_vat   = $requires_vat;
         
         $company            = self::get_user_company();
         $vat_number         = self::get_user_vat_number();
         
-        $validated          = $vat_number ? self::get_user_vat_number( '', 0, true ) : 1;
-        $vat_info           = $wpi_session->get( 'user_vat_data' );
+        $validated          = $vat_number ? self::get_user_vat_number('', 0, true) : 1;
+        $vat_info           = $wpi_session->get('user_vat_data');
 
-        if ( is_array( $vat_info ) ) {
-            $company    = isset( $vat_info['company'] ) ? $vat_info['company'] : '';
-            $vat_number = isset( $vat_info['number'] ) ? $vat_info['number'] : '';
-            $validated  = isset( $vat_info['valid'] ) ? $vat_info['valid'] : false;
+        if (is_array($vat_info)) {
+            $company    = isset($vat_info['company']) ? $vat_info['company'] : '';
+            $vat_number = isset($vat_info['number']) ? $vat_info['number'] : '';
+            $validated  = isset($vat_info['valid']) ? $vat_info['valid'] : false;
         }
         
         $selected_country = $invoice->country ? $invoice->country : wpinv_default_billing_country();
 
-        if ( $ip_country_code == 'UK' ) {
+        if ($ip_country_code == 'UK') {
             $ip_country_code = 'GB';
         }
         
-        if ( $selected_country == 'UK' ) {
+        if ($selected_country == 'UK') {
             $selected_country = 'GB';
         }
         
-        if ( $requires_vat && ( self::same_country_rule() == 'no' && wpinv_is_base_country( $selected_country ) || !self::allow_vat_rules() ) ) {
+        if ($requires_vat && (self::same_country_rule() == 'no' && wpinv_is_base_country($selected_country) || !self::allow_vat_rules())) {
             $requires_vat = false;
         }
 
@@ -1947,52 +1947,52 @@ 
         $display_validate_btn   = 'none';
         $display_reset_btn      = 'none';
         
-        if ( !empty( $vat_number ) && $validated ) {
-            $vat_vailidated_text    = wp_sprintf( __( '%s number validated', 'invoicing' ), $tax_label );
+        if (!empty($vat_number) && $validated) {
+            $vat_vailidated_text    = wp_sprintf(__('%s number validated', 'invoicing'), $tax_label);
             $vat_vailidated_class   = 'wpinv-vat-stat-1';
             $display_reset_btn      = 'block';
         } else {
-            $vat_vailidated_text    = empty( $vat_number ) ? '' : wp_sprintf( __( '%s number not validated', 'invoicing' ), $tax_label );
-            $vat_vailidated_class   = empty( $vat_number ) ? '' : 'wpinv-vat-stat-0';
+            $vat_vailidated_text    = empty($vat_number) ? '' : wp_sprintf(__('%s number not validated', 'invoicing'), $tax_label);
+            $vat_vailidated_class   = empty($vat_number) ? '' : 'wpinv-vat-stat-0';
             $display_validate_btn   = 'block';
         }
         
-        $show_ip_country        = $is_digital && ( empty( $vat_number ) || !$requires_vat ) && $ip_country_code != $selected_country ? 'block' : 'none';
+        $show_ip_country = $is_digital && (empty($vat_number) || !$requires_vat) && $ip_country_code != $selected_country ? 'block' : 'none';
         ?>
         <div id="wpi-vat-details" class="wpi-vat-details clearfix" style="display:<?php echo $display_vat_details; ?>">
             <div id="wpi_vat_info" class="clearfix panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php echo wp_sprintf( __( '%s Details', 'invoicing' ), $tax_label );?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php echo wp_sprintf(__('%s Details', 'invoicing'), $tax_label); ?></h3></div>
                 <div id="wpinv-fields-box" class="panel-body">
                     <p id="wpi_show_vat_note">
-                        <?php echo wp_sprintf( __( 'Validate your registered %s number to exclude tax.', 'invoicing' ), $tax_label ); ?>
+                        <?php echo wp_sprintf(__('Validate your registered %s number to exclude tax.', 'invoicing'), $tax_label); ?>
                     </p>
                     <div id="wpi_vat_fields" class="wpi_vat_info">
                         <p class="wpi-cart-field wpi-col2 wpi-colf">
-                            <label for="wpinv_company" class="wpi-label"><?php _e( 'Company Name', 'invoicing' );?></label>
+                            <label for="wpinv_company" class="wpi-label"><?php _e('Company Name', 'invoicing'); ?></label>
                             <?php
-                            echo wpinv_html_text( array(
+                            echo wpinv_html_text(array(
                                     'id'            => 'wpinv_company',
                                     'name'          => 'wpinv_company',
                                     'value'         => $company,
                                     'class'         => 'wpi-input form-control',
-                                    'placeholder'   => __( 'Company name', 'invoicing' ),
-                                ) );
+                                    'placeholder'   => __('Company name', 'invoicing'),
+                                ));
                             ?>
                         </p>
                         <p class="wpi-cart-field wpi-col2 wpi-coll wpi-cart-field-vat">
-                            <label for="wpinv_vat_number" class="wpi-label"><?php echo wp_sprintf( __( '%s Number', 'invoicing' ), $tax_label );?></label>
+                            <label for="wpinv_vat_number" class="wpi-label"><?php echo wp_sprintf(__('%s Number', 'invoicing'), $tax_label); ?></label>
                             <span id="wpinv_vat_number-wrap">
                                 <label for="wpinv_vat_number" class="wpinv-label"></label>
-                                <input type="text" class="wpi-input form-control" placeholder="<?php echo esc_attr( wp_sprintf( __( '%s number', 'invoicing' ), $tax_label ) );?>" value="<?php esc_attr_e( $vat_number );?>" id="wpinv_vat_number" name="wpinv_vat_number">
-                                <span class="wpinv-vat-stat <?php echo $vat_vailidated_class;?>"><i class="fa"></i>&nbsp;<font><?php echo $vat_vailidated_text;?></font></span>
+                                <input type="text" class="wpi-input form-control" placeholder="<?php echo esc_attr(wp_sprintf(__('%s number', 'invoicing'), $tax_label)); ?>" value="<?php esc_attr_e($vat_number); ?>" id="wpinv_vat_number" name="wpinv_vat_number">
+                                <span class="wpinv-vat-stat <?php echo $vat_vailidated_class; ?>"><i class="fa"></i>&nbsp;<font><?php echo $vat_vailidated_text; ?></font></span>
                             </span>
                         </p>
                         <p class="wpi-cart-field wpi-col wpi-colf wpi-cart-field-actions">
-                            <button class="btn btn-success btn-sm wpinv-vat-validate" type="button" id="wpinv_vat_validate" style="display:<?php echo $display_validate_btn; ?>"><?php echo wp_sprintf( __("Validate %s Number", 'invoicing'), $tax_label ); ?></button>
-                            <button class="btn btn-danger btn-sm wpinv-vat-reset" type="button" id="wpinv_vat_reset" style="display:<?php echo $display_reset_btn; ?>"><?php echo wp_sprintf( __("Reset %s", 'invoicing'), $tax_label ); ?></button>
+                            <button class="btn btn-success btn-sm wpinv-vat-validate" type="button" id="wpinv_vat_validate" style="display:<?php echo $display_validate_btn; ?>"><?php echo wp_sprintf(__("Validate %s Number", 'invoicing'), $tax_label); ?></button>
+                            <button class="btn btn-danger btn-sm wpinv-vat-reset" type="button" id="wpinv_vat_reset" style="display:<?php echo $display_reset_btn; ?>"><?php echo wp_sprintf(__("Reset %s", 'invoicing'), $tax_label); ?></button>
                             <span class="wpi-vat-box wpi-vat-box-info"><span id="text"></span></span>
                             <span class="wpi-vat-box wpi-vat-box-error"><span id="text"></span></span>
-                            <input type="hidden" name="_wpi_nonce" value="<?php echo wp_create_nonce( 'vat_validation' ) ?>" />
+                            <input type="hidden" name="_wpi_nonce" value="<?php echo wp_create_nonce('vat_validation') ?>" />
                         </p>
                     </div>
                 </div>
@@ -2006,32 +2006,32 @@ 
                 </span>
             </div>
         </div>
-        <?php if ( empty( $wpinv_options['hide_ip_address'] ) ) { 
-            $ip_link = '<a title="' . esc_attr( __( 'View more details on map', 'invoicing' ) ) . '" target="_blank" href="' . esc_url( admin_url( 'admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $ip_address ) ) . '" class="wpi-ip-address-link">' . $ip_address . '&nbsp;&nbsp;<i class="fa fa-external-link-square" aria-hidden="true"></i></a>';
+        <?php if (empty($wpinv_options['hide_ip_address'])) { 
+            $ip_link = '<a title="' . esc_attr(__('View more details on map', 'invoicing')) . '" target="_blank" href="' . esc_url(admin_url('admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $ip_address)) . '" class="wpi-ip-address-link">' . $ip_address . '&nbsp;&nbsp;<i class="fa fa-external-link-square" aria-hidden="true"></i></a>';
         ?>
         <div class="wpi-ip-info clearfix panel panel-info">
             <div id="wpinv-fields-box" class="panel-body">
-                <span><?php echo wp_sprintf( __( "Your IP address is: %s", 'invoicing' ), $ip_link ); ?></span>
+                <span><?php echo wp_sprintf(__("Your IP address is: %s", 'invoicing'), $ip_link); ?></span>
             </div>
         </div>
         <?php }
     }
     
-    public static function show_vat_notice( $invoice ) {
-        if ( empty( $invoice ) ) {
+    public static function show_vat_notice($invoice) {
+        if (empty($invoice)) {
             return NULL;
         }
         
-        $label      = wpinv_get_option( 'vat_invoice_notice_label' );
-        $notice     = wpinv_get_option( 'vat_invoice_notice' );
-        if ( $label || $notice ) {
+        $label      = wpinv_get_option('vat_invoice_notice_label');
+        $notice     = wpinv_get_option('vat_invoice_notice');
+        if ($label || $notice) {
         ?>
         <div class="row wpinv-vat-notice">
             <div class="col-sm-12">
-                <?php if ( $label ) { ?>
-                <strong><?php _e( $label, 'invoicing' ); ?></strong>
-                <?php } if ( $notice ) { ?>
-                <?php echo wpautop( wptexturize( __( $notice, 'invoicing' ) ) ) ?>
+                <?php if ($label) { ?>
+                <strong><?php _e($label, 'invoicing'); ?></strong>
+                <?php } if ($notice) { ?>
+                <?php echo wpautop(wptexturize(__($notice, 'invoicing'))) ?>
                 <?php } ?>
             </div>
         </div>

vendor/ayecode/wp-super-duper/wp-super-duper.php

Spacing +440 added lines, -440 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
 
 	/**
@@ -36,27 +36,27 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name']
 			);
-			$this->base_id                     = $options['base_id'];
+			$this->base_id = $options['base_id'];
 			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
+			$options       = apply_filters("wp_super_duper_options", $options);
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
+			$options       = $this->add_name_from_key($options);
 			$this->options = $options;
 
 			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
 
 			// init parent
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
 
-			if ( isset( $options['class_name'] ) ) {
+			if (isset($options['class_name'])) {
 				// register widget
 				$this->class_name = $options['class_name'];
 
@@ -64,54 +64,54 @@ 
 				$this->register_shortcode();
 
 				// Fusion Builder (avada) support
-				if( function_exists('fusion_builder_map') ){ $this->register_fusion_element(); }
+				if (function_exists('fusion_builder_map')) { $this->register_fusion_element(); }
 
 				// register block
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				add_action('admin_enqueue_scripts', array($this, 'register_block'));
 			}
 
 			// add the CSS and JS we need ONCE
 			global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+			if (!$sd_widget_scripts) {
+				wp_add_inline_script('admin-widgets', $this->widget_js());
+				wp_add_inline_script('customize-controls', $this->widget_js());
+				wp_add_inline_style('widgets', $this->widget_css());
 
 				$sd_widget_scripts = true;
 
 				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
 				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				if (function_exists('generate_sections_sections_metabox')) {
+					add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 				}
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+				if ($this->is_preview()) {
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
 					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
+					add_action('elementor/editor/after_enqueue_scripts', array(
 						$this,
 						'shortcode_insert_button_script'
-					) ); // for elementor
+					)); // for elementor
 				}
 				// this makes the insert button work for cornerstone
-				add_action('wp_print_footer_scripts',array( __CLASS__, 'maybe_cornerstone_builder' ));
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'maybe_cornerstone_builder'));
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
+				add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 
 				// add generator text to admin head
-				add_action( 'admin_head', array( $this, 'generator' ) );
+				add_action('admin_head', array($this, 'generator'));
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
-		public function register_fusion_element(){
+		public function register_fusion_element() {
 
 			$options = $this->options;
 
-			if($this->base_id){
+			if ($this->base_id) {
 
 				$params = $this->get_fusion_params();
 
@@ -122,7 +122,7 @@ 
 					'allow_generator' => true,
 				);
 
-				if(!empty($params)){
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
@@ -131,12 +131,12 @@ 
 
 		}
 
-		public function get_fusion_params(){
+		public function get_fusion_params() {
 			$params = array();
 			$arguments = $this->get_arguments();
 
-			if(!empty($arguments)){
-				foreach($arguments as $key => $val){
+			if (!empty($arguments)) {
+				foreach ($arguments as $key => $val) {
 					$param = array();
 					// type
 					$param['type'] = str_replace(
@@ -170,19 +170,19 @@ 
 					$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 					// Group
-					if(isset($val['group'])){
+					if (isset($val['group'])) {
 						$param['group'] = $val['group'];
 					}
 
 					// value
-					if($val['type'] == 'checkbox'){
-						if(isset($val['default']) && $val['default'] == '0'){
+					if ($val['type'] == 'checkbox') {
+						if (isset($val['default']) && $val['default'] == '0') {
 							unset($param['default']);
 						}
-						$param['value'] = array(''=>__("No"),'1'=>__("Yes"));
-					}elseif($param['type'] == 'select'){
+						$param['value'] = array(''=>__("No"), '1'=>__("Yes"));
+					}elseif ($param['type'] == 'select') {
 						$param['value'] = isset($val['options']) ? $val['options'] : array();
-					}else{
+					} else {
 						$param['value'] = isset($val['default']) ? $val['default'] : '';
 					}
 
@@ -199,8 +199,8 @@ 
 		/**
 		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
 		 */
-		public static function maybe_cornerstone_builder(){
-			if(did_action('cornerstone_before_boot_app')){
+		public static function maybe_cornerstone_builder() {
+			if (did_action('cornerstone_before_boot_app')) {
 				self::shortcode_insert_button_script();
 			}
 		}
@@ -212,12 +212,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function get_picker( $editor_id = '' ) {
+		public static function get_picker($editor_id = '') {
 
 			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
+			if (isset($_POST['editor_id'])) {
+				$editor_id = esc_attr($_POST['editor_id']);
+			} elseif (isset($_REQUEST['et_fb'])) {
 				$editor_id = 'main_content_content_vb_tiny_mce';
 			}
 
@@ -226,13 +226,13 @@ 
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -245,37 +245,37 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
+					<?php if ($editor_id != '') { ?>
 						<button class="button sd-insert-shortcode-button"
-						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
+						        onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
 							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+						        } ?>)"><?php _e('Insert shortcode'); ?></button>
 					<?php } ?>
 					<button class="button"
-					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
+					        onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 
 			$html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 
 				// some builder get the editor via ajax so we should not die on those ocasions
 				$dont_die = array(
-					'parent_tag',// WP Bakery
+					'parent_tag', // WP Bakery
 					'avia_request' // enfold
 				);
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
+				foreach ($dont_die as $request) {
+					if (isset($_REQUEST[$request])) {
 						$should_die = false;
 					}
 				}
 
-				if ( $should_die ) {
+				if ($should_die) {
 					wp_die();
 				}
 
@@ -302,16 +302,16 @@ 
 		public static function get_widget_settings() {
 			global $sd_widgets;
 
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
+			$shortcode = isset($_REQUEST['shortcode']) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes($_REQUEST['shortcode']) : '';
+			if (!$shortcode) {
 				wp_die();
 			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
+			$widget_args = isset($sd_widgets[$shortcode]) ? $sd_widgets[$shortcode] : '';
+			if (!$widget_args) {
 				wp_die();
 			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
+			$class_name = isset($widget_args['class_name']) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+			if (!$class_name) {
 				wp_die();
 			}
 
@@ -319,7 +319,7 @@ 
 			$widget = new $class_name;
 
 			ob_start();
-			$widget->form( array() );
+			$widget->form(array());
 			$form = ob_get_clean();
 			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
 			echo "<style>" . $widget->widget_css() . "</style>";
@@ -337,9 +337,9 @@ 
 		 * @param string $editor_id Optional. Shortcode editor id. Default null.
 		 * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
+			if ($shortcode_insert_button_once) {
 				return;
 			}
 			add_thickbox();
@@ -349,21 +349,21 @@ 
 			 * Cornerstone makes us play dirty tricks :/
 			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
 			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '<span id="insert-media-button">';
 			}
 
-			echo self::shortcode_button( 'this', 'true' );
+			echo self::shortcode_button('this', 'true');
 
 			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '</span>'; // end #insert-media-button
 			}
 
 			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+			if (function_exists('generate_sections_sections_metabox') && did_action('generate_sections_metabox')) {
 			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+				self::shortcode_insert_button_script($editor_id, $insert_shortcode_function);
 			}
 
 			$shortcode_insert_button_once = true;
@@ -377,12 +377,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
+		public static function shortcode_button($id = '', $search_for_id = '') {
 			ob_start();
 			?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
+				if ($search_for_id) {
 					echo "," . $search_for_id;
 				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
@@ -398,7 +398,7 @@ 
 			$html = ob_get_clean();
 
 			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
+			return preg_replace("/\r|\n/", "", trim($html));
 		}
 
 		/**
@@ -456,7 +456,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -493,10 +493,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -507,7 +507,7 @@ 
 		 * @param string $editor_id
 		 * @param string $insert_shortcode_function
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 			?>
 			<style>
 				.sd-shortcode-left-wrap {
@@ -625,22 +625,22 @@ 
 					height: 250px;
 					width: 100%;
 				}
-				<?php if ( function_exists( 'generate_sections_sections_metabox' ) ) { ?>
+				<?php if (function_exists('generate_sections_sections_metabox')) { ?>
 				.generate-sections-modal #custom-media-buttons > .sd-lable-shortcode-inserter {
 					display: inline;
 				}
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
+			if (class_exists('SiteOrigin_Panels')) {
 				echo "<script>" . self::siteorigin_js() . "</script>";
 			}
 			?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
+				if (!empty($insert_shortcode_function)) {
 					echo $insert_shortcode_function;
-				}else{
+				} else {
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -653,9 +653,9 @@ 
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
+							if (isset($_REQUEST['et_fb'])) {
 								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+							} elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') {
 								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
 							} else {
 								echo '$editor_id = "#wp-content-editor-container textarea";';
@@ -740,11 +740,11 @@ 
 							'shortcode': $short_code,
 							'attributes': 123,
 							'post_id': 321,
-							'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+							'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 						};
 
 						if (typeof ajaxurl === 'undefined') {
-							var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' );?>";
+							var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 						}
 
 						jQuery.post(ajaxurl, data, function (response) {
@@ -953,11 +953,11 @@ 
 					var data = {
 						'action': 'super_duper_get_picker',
 						'editor_id': $id,
-						'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_picker' );?>'
+						'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_picker'); ?>'
 					};
 
 					if (!ajaxurl) {
-						var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' ); ?>";
+						var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 					}
 
 					jQuery.post(ajaxurl, data, function (response) {
@@ -978,9 +978,9 @@ 
 				 */
 				function sd_shortcode_button($id) {
 					if ($id) {
-						return '<?php echo self::shortcode_button( "\\''+\$id+'\\'" );?>';
+						return '<?php echo self::shortcode_button("\\''+\$id+'\\'"); ?>';
 					} else {
-						return '<?php echo self::shortcode_button();?>';
+						return '<?php echo self::shortcode_button(); ?>';
 					}
 				}
 
@@ -1036,10 +1036,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -1109,7 +1109,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1201,7 +1201,7 @@ 
 					});
 
 				}
-				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
+				<?php do_action('wp_super_duper_widget_js', $this); ?>
 			</script>
 			<?php
 			$output = ob_get_clean();
@@ -1210,10 +1210,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
@@ -1224,14 +1224,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
+		private function add_name_from_key($options, $arguments = false) {
+			if (!empty($options['arguments'])) {
+				foreach ($options['arguments'] as $key => $val) {
+					$options['arguments'][$key]['name'] = $key;
 				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
+			} elseif ($arguments && is_array($options) && !empty($options)) {
+				foreach ($options as $key => $val) {
+					$options[$key]['name'] = $key;
 				}
 			}
 
@@ -1244,8 +1244,8 @@ 
 		 * @since 1.0.0
 		 */
 		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
+			add_action('wp_ajax_super_duper_output_shortcode', array(__CLASS__, 'render_shortcode'));
 		}
 
 		/**
@@ -1255,33 +1255,33 @@ 
 		 */
 		public static function render_shortcode() {
 
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
+			check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
+			if (!current_user_can('manage_options')) {
 				wp_die();
 			}
 
 			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
+			if (isset($_POST['post_id']) && $_POST['post_id']) {
+				$post_obj = get_post(absint($_POST['post_id']));
+				if (!empty($post_obj) && empty($post)) {
 					global $post;
 					$post = $post_obj;
 				}
 			}
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
+				$shortcode_name   = sanitize_title_with_dashes($_POST['shortcode']);
+				$attributes_array = isset($_POST['attributes']) && $_POST['attributes'] ? $_POST['attributes'] : array();
 				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
+				if (!empty($attributes_array)) {
+					foreach ($attributes_array as $key => $value) {
+						$attributes .= " " . sanitize_title_with_dashes($key) . "='" . wp_slash($value) . "' ";
 					}
 				}
 
 				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
 
-				echo do_shortcode( $shortcode );
+				echo do_shortcode($shortcode);
 
 			}
 			wp_die();
@@ -1295,42 +1295,42 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$args = self::argument_values( $args );
+		public function shortcode_output($args = array(), $content = '') {
+			$args = self::argument_values($args);
 
 			// add extra argument so we know its a output to gutenberg
 			//$args
-			$args = $this->string_to_bool( $args );
+			$args = $this->string_to_bool($args);
 
 			// if we have a enclosed shortcode we add it to the special `html` argument
-			if(!empty($content)){
+			if (!empty($content)) {
 				$args['html'] = $content;
 			}
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+			$class = isset($this->options['widget_ops']['classname']) ? esc_attr($this->options['widget_ops']['classname']) : '';
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+			$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+			$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this ); //@todo this does not seem right @kiran?
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this); //@todo this does not seem right @kiran?
 
 			$shortcode_args = array();
 			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if( isset( $args['no_wrap'] ) && $args['no_wrap'] ){ $no_wrap = true; }
-			$main_content   = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
+			$no_wrap        = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+			if (isset($args['no_wrap']) && $args['no_wrap']) { $no_wrap = true; }
+			$main_content   = $this->output($args, $shortcode_args, $content);
+			if ($main_content && !$no_wrap) {
 				// wrap the shortcode in a div with the same class as the widget
 				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
+				if (!empty($args['title'])) {
 					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
+					$shortcode_args = array('before_title' => '', 'after_title' => '');
+					if (empty($instance)) {
 						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
+						if (!empty($wp_registered_sidebars)) {
+							foreach ($wp_registered_sidebars as $sidebar) {
+								if (!empty($sidebar['before_title'])) {
 									$shortcode_args['before_title'] = $sidebar['before_title'];
 									$shortcode_args['after_title']  = $sidebar['after_title'];
 									break;
@@ -1338,20 +1338,20 @@ 
 							}
 						}
 					}
-					$output .= $this->output_title( $shortcode_args, $args );
+					$output .= $this->output_title($shortcode_args, $args);
 				}
 				$output .= $main_content;
 				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
+			} elseif ($main_content && $no_wrap) {
 				$output .= $main_content;
 			}
 
 			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "[{" . $this->base_id . "}]" );
+			if ($this->is_preview() && $output == '') {
+				$output = $this->preview_placeholder_text("[{" . $this->base_id . "}]");
 			}
 
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+			return apply_filters('wp_super_duper_widget_output', $output, $args, $shortcode_args, $this);
 		}
 
 		/**
@@ -1361,8 +1361,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf(__('Placeholder for: %s'), $name) . "</div>";
 		}
 
 		/**
@@ -1372,13 +1372,13 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function string_to_bool( $options ) {
+		public function string_to_bool($options) {
 			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
+			foreach ($options as $key => $val) {
+				if ($val == 'false') {
+					$options[$key] = false;
+				} elseif ($val == 'true') {
+					$options[$key] = true;
 				}
 			}
 
@@ -1394,27 +1394,27 @@ 
 		 *
 		 * @return array
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if($args['type']=='checkbox' && $argument_values[ $key ] == ''){
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
 					}
-					elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -1441,12 +1441,12 @@ 
 		 * @return array Get arguments.
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 
 			return $this->arguments;
 		}
@@ -1458,7 +1458,7 @@ 
 		 * @param array $widget_args
 		 * @param string $content
 		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
+		public function output($args = array(), $widget_args = array(), $content = '') {
 
 		}
 
@@ -1466,10 +1466,10 @@ 
 		 * Add the dynamic block code inline when the wp-block in enqueued.
 		 */
 		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
+			wp_add_inline_script('wp-blocks', $this->block());
+			if (class_exists('SiteOrigin_Panels')) {
 
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+				wp_add_inline_script('wp-blocks', $this->siteorigin_js());
 
 			}
 		}
@@ -1484,13 +1484,13 @@ 
 			$show      = false;
 			$arguments = $this->arguments;
 
-			if ( empty( $arguments ) ) {
+			if (empty($arguments)) {
 				$arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $argument) {
+					if (isset($argument['advanced']) && $argument['advanced']) {
 						$show = true;
 						break; // no need to continue if we know we have it
 					}
@@ -1509,15 +1509,15 @@ 
 
 			$url = $this->url;
 
-			if(!$url){
+			if (!$url) {
 				// check if we are inside a plugin
-				$file_dir = str_replace("/includes","", dirname( __FILE__ ));
+				$file_dir = str_replace("/includes", "", dirname(__FILE__));
 
-				$dir_parts = explode("/wp-content/",$file_dir);
-				$url_parts = explode("/wp-content/",plugins_url());
+				$dir_parts = explode("/wp-content/", $file_dir);
+				$url_parts = explode("/wp-content/", plugins_url());
 
-				if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-					$url = trailingslashit( $url_parts[0]."/wp-content/".$dir_parts[1] );
+				if (!empty($url_parts[0]) && !empty($dir_parts[1])) {
+					$url = trailingslashit($url_parts[0] . "/wp-content/" . $dir_parts[1]);
 					$this->url = $url;
 				}
 			}
@@ -1536,46 +1536,46 @@ 
 		 * @since 1.1.0
 		 * @return string
 		 */
-		public function get_block_icon($icon){
+		public function get_block_icon($icon) {
 
 			// check if we have a Font Awesome icon
 			$fa_type = '';
-			if(substr( $icon, 0, 7 ) === "fas fa-"){
+			if (substr($icon, 0, 7) === "fas fa-") {
 				$fa_type = 'solid';
-			}elseif(substr( $icon, 0, 7 ) === "far fa-"){
+			}elseif (substr($icon, 0, 7) === "far fa-") {
 				$fa_type = 'regular';
-			}elseif(substr( $icon, 0, 7 ) === "fab fa-"){
+			}elseif (substr($icon, 0, 7) === "fab fa-") {
 				$fa_type = 'brands';
-			}else{
-				$icon = "'".$icon."'";
+			} else {
+				$icon = "'" . $icon . "'";
 			}
 
 			// set the icon if we found one
-			if($fa_type){
-				$fa_icon = str_replace(array("fas fa-","far fa-","fab fa-"),"",$icon);
-				$icon  = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '".$this->get_url()."icons/".$fa_type.".svg#".$fa_icon."','href': '".$this->get_url()."icons/".$fa_type.".svg#".$fa_icon."'}))";
+			if ($fa_type) {
+				$fa_icon = str_replace(array("fas fa-", "far fa-", "fab fa-"), "", $icon);
+				$icon = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 			}
 
 			return $icon;
 		}
 
-		public function group_arguments($arguments){
+		public function group_arguments($arguments) {
 //			echo '###';print_r($arguments);
-			if(!empty($arguments)){
+			if (!empty($arguments)) {
 				$temp_arguments = array();
 				$general = __("General");
 				$add_sections = false;
-				foreach($arguments as $key => $args){
-					if(isset($args['group'])){
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
 						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections = true;
-					}else{
+					} else {
 						$temp_arguments[$general][$key] = $args;
 					}
 				}
 
 				// only add sections if more than one
-				if($add_sections){
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1627,28 +1627,28 @@ 
 					 * @return {?WPBlock}          The block, if it has been successfully
 					 *                             registered; otherwise `undefined`.
 					 */
-					registerBlockType('<?php echo str_replace( "_", "-", sanitize_title_with_dashes( $this->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->options['class_name'] ) );  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
-						title: '<?php echo $this->options['name'];?>', // Block title.
-						description: '<?php echo esc_attr( $this->options['widget_ops']['description'] )?>', // Block title.
-						icon: <?php echo $this->get_block_icon($this->options['block-icon']);?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
+					registerBlockType('<?php echo str_replace("_", "-", sanitize_title_with_dashes($this->options['textdomain']) . '/' . sanitize_title_with_dashes($this->options['class_name'])); ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
+						title: '<?php echo $this->options['name']; ?>', // Block title.
+						description: '<?php echo esc_attr($this->options['widget_ops']['description'])?>', // Block title.
+						icon: <?php echo $this->get_block_icon($this->options['block-icon']); ?>,//'<?php echo isset($this->options['block-icon']) ? esc_attr($this->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if(isset($this->options['block-supports'])){
-								echo $this->array_to_attributes( $this->options['block-supports'] );
+							if (isset($this->options['block-supports'])) {
+								echo $this->array_to_attributes($this->options['block-supports']);
 							}
 							?>
 						},
-						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
-						<?php if ( isset( $this->options['block-keywords'] ) ) {
+						category: '<?php echo isset($this->options['block-category']) ? esc_attr($this->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+						<?php if (isset($this->options['block-keywords'])) {
 						echo "keywords : " . $this->options['block-keywords'] . ",";
 					}?>
 
 						<?php
 
 						// maybe set no_wrap
-						$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ){ $no_wrap = true; }
-						if( $no_wrap ){ $this->options['block-wrap'] = ''; }
+						$no_wrap = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+						if (isset($this->arguments['no_wrap']) && $this->arguments['no_wrap']) { $no_wrap = true; }
+						if ($no_wrap) { $this->options['block-wrap'] = ''; }
 
 						$show_advanced = $this->block_show_advanced();
 
@@ -1659,10 +1659,10 @@ 
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
+						if (!empty($this->arguments)) {
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "	type: 'boolean',";
 								echo "  default: false,";
@@ -1670,41 +1670,41 @@ 
 							}
 
 							// block wrap element
-							if ( !empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+							if (!empty($this->options['block-wrap'])) { //@todo we should validate this?
 								echo "block_wrap: {";
 								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "',";
 								echo "},";
 							}
 
-							foreach ( $this->arguments as $key => $args ) {
+							foreach ($this->arguments as $key => $args) {
 
 								// set if we should show alignment
-								if ( $key == 'alignment' ) {
+								if ($key == 'alignment') {
 									$show_alignment = true;
 								}
 
 								$extra = '';
 
-								if ( $args['type'] == 'checkbox' ) {
+								if ($args['type'] == 'checkbox') {
 									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
+									$default = isset($args['default']) && $args['default'] ? 'true' : 'false';
+								} elseif ($args['type'] == 'number') {
 									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+								} elseif ($args['type'] == 'select' && !empty($args['multiple'])) {
 									$type = 'array';
-									if ( is_array( $args['default'] ) ) {
-										$default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+									if (is_array($args['default'])) {
+										$default = isset($args['default']) ? "['" . implode("','", $args['default']) . "']" : "[]";
 									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 									}
-								} elseif ( $args['type'] == 'multiselect' ) {
+								} elseif ($args['type'] == 'multiselect') {
 									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								} else {
 									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								}
 								echo $key . " : {";
 								echo "type : '$type',";
@@ -1735,12 +1735,12 @@ 
 									is_fetching = true;
 									var data = {
 										'action': 'super_duper_output_shortcode',
-										'shortcode': '<?php echo $this->options['base_id'];?>',
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
 										'attributes': props.attributes,
-										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
+										'post_id': <?php global $post; if (isset($post->ID)) {
 										echo $post->ID;
 									}?>,
-										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+										'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 									};
 
 									jQuery.post(ajaxurl, data, function (response) {
@@ -1749,7 +1749,7 @@ 
 
 										// if the content is empty then we place some placeholder text
 										if (env == '') {
-											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for: ' );?>" + props.name + "</div>";
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for: '); ?>" + props.name + "</div>";
 										}
 
 										props.setAttributes({content: env});
@@ -1768,7 +1768,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -1786,9 +1786,9 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+									if (!empty($this->arguments)) {
 
-									if ( $show_advanced ) {
+									if ($show_advanced) {
 									?>
 									el(
 										wp.components.ToggleControl,
@@ -1810,17 +1810,17 @@ 
 									$has_sections = $arguments == $this->arguments ? false : true;
 
 
-									if($has_sections){
+									if ($has_sections) {
 									$panel_count = 0;
-									foreach($arguments as $key => $args){
+									foreach ($arguments as $key => $args) {
 									?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e($key); ?>',
-											initialOpen: <?php if($panel_count){echo "false";}else{echo "true";}?>
+											initialOpen: <?php if ($panel_count) {echo "false"; } else {echo "true"; }?>
 										},
 										<?php
 
-										foreach($args as $k => $a){
+										foreach ($args as $k => $a) {
 											$this->build_block_arguments($k, $a);
 										}
 										?>
@@ -1829,8 +1829,8 @@ 
 									$panel_count++;
 
 									}
-									}else{
-										foreach($this->arguments as $key => $args){
+									} else {
+										foreach ($this->arguments as $key => $args) {
 											$this->build_block_arguments($key, $args);
 										}
 									}
@@ -1844,9 +1844,9 @@ 
 
 								<?php
 								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}else{
+								if (!empty($this->options['block-output'])) {
+								$this->block_element($this->options['block-output']);
+							} else {
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								?>
 								el('div', {
@@ -1870,19 +1870,19 @@ 
 							var align = '';
 
 							// build the shortcode.
-							var content = "[<?php echo $this->options['base_id'];?>";
+							var content = "[<?php echo $this->options['base_id']; ?>";
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							if (!empty($this->arguments)) {
 
-							foreach($this->arguments as $key => $args){
+							foreach ($this->arguments as $key => $args) {
 							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-								if('<?php echo esc_attr( $key );?>' == 'html'){
-									$html = attr.<?php echo esc_attr( $key );?>;
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+								if('<?php echo esc_attr($key); ?>' == 'html'){
+									$html = attr.<?php echo esc_attr($key); ?>;
 								}else{
-									content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>+ "' ";
+									content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>+ "' ";
 								}
 							}
 							<?php
@@ -1894,7 +1894,7 @@ 
 							
 							// if has html element
 							if($html){
-								content += $html + "[/<?php echo $this->options['base_id'];?>]";
+								content += $html + "[/<?php echo $this->options['base_id']; ?>]";
 							}
 
 
@@ -1912,11 +1912,11 @@ 
 							}
 
 							<?php
-							if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							if (isset($this->options['block-wrap']) && $this->options['block-wrap'] == '') {
 							?>
 							return content;
 							<?php
-							}else{
+							} else {
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -1939,88 +1939,88 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
-		public function build_block_arguments($key,$args){
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+		public function build_block_arguments($key, $args) {
+			$custom_attributes = !empty($args['custom_attributes']) ? $this->array_to_attributes($args['custom_attributes']) : '';
 			$options = '';
 			$extra = '';
 			$require = '';
 
 			// `content` is a protected and special argument
-			if($key == 'content'){return;}
+			if ($key == 'content') {return; }
 
 			$onchange = "props.setAttributes({ $key: $key } )";
 			$value = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'color' );
-			if ( in_array( $args['type'], $text_type ) ) {
+			$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'color');
+			if (in_array($args['type'], $text_type)) {
 				$type = 'TextControl';
 				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
+				if ($args['type'] == 'number') {
 					$onchange = "props.setAttributes({ $key: Number($key) } )";
 				}
 			}
 			//									elseif ( $args['type'] == 'color' ) { //@todo ColorPicker labels are not shown yet, we use html5 color input for now https://github.com/WordPress/gutenberg/issues/14378
 			//										$type = 'ColorPicker';
 			//									}
-			elseif ( $args['type'] == 'checkbox' ) {
+			elseif ($args['type'] == 'checkbox') {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			}elseif ( $args['type'] == 'textarea' ) {
+			}elseif ($args['type'] == 'textarea') {
 				$type = 'TextareaControl';
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+			} elseif ($args['type'] == 'select' || $args['type'] == 'multiselect') {
 				$type = 'SelectControl';
-				if ( ! empty( $args['options'] ) ) {
+				if (!empty($args['options'])) {
 					$options .= "options  : [";
-					foreach ( $args['options'] as $option_val => $option_label ) {
-						$options .= "{ value : '" . esc_attr( $option_val ) . "',     label : '" . esc_attr( $option_label ) . "'     },";
+					foreach ($args['options'] as $option_val => $option_label) {
+						$options .= "{ value : '" . esc_attr($option_val) . "',     label : '" . esc_attr($option_label) . "'     },";
 					}
 					$options .= "],";
 				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+				if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
 					$extra .= ' multiple: true, ';
 					//$onchange = "props.setAttributes({ $key: ['edit'] } )";
 					//$value = "['edit', 'delete']";
 				}
-			} elseif ( $args['type'] == 'alignment' ) {
+			} elseif ($args['type'] == 'alignment') {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
 			} else {
-				return;// if we have not implemented the control then don't break the JS.
+				return; // if we have not implemented the control then don't break the JS.
 			}
 
 			// add show only if advanced
-			if ( ! empty( $args['advanced'] ) ) {
+			if (!empty($args['advanced'])) {
 				echo "props.attributes.show_advanced && ";
 			}
 			// add setting require if defined
-			if ( ! empty( $args['element_require'] ) ) {
-				echo $this->block_props_replace( $args['element_require'], true ) . " && ";
+			if (!empty($args['element_require'])) {
+				echo $this->block_props_replace($args['element_require'], true) . " && ";
 			}
 			?>
 			el(
-			wp.components.<?php echo esc_attr( $type );?>,
+			wp.components.<?php echo esc_attr($type); ?>,
 			{
-			label: '<?php echo esc_attr( $args['title'] );?>',
-			help: '<?php if ( isset( $args['desc'] ) ) {
-				echo esc_attr( $args['desc'] );
+			label: '<?php echo esc_attr($args['title']); ?>',
+			help: '<?php if (isset($args['desc'])) {
+				echo esc_attr($args['desc']);
 			}?>',
-			value: <?php echo $value;?>,
-			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . esc_attr( $args['type'] ) . "',";
+			value: <?php echo $value; ?>,
+			<?php if ($type == 'TextControl' && $args['type'] != 'text') {
+				echo "type: '" . esc_attr($args['type']) . "',";
 			}?>
-			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . esc_attr( $args['placeholder'] ) . "',";
+			<?php if (!empty($args['placeholder'])) {
+				echo "placeholder: '" . esc_attr($args['placeholder']) . "',";
 			}?>
-			<?php echo $options;?>
-			<?php echo $extra;?>
-			<?php echo $custom_attributes;?>
-			onChange: function ( <?php echo $key;?> ) {
-			<?php echo $onchange;?>
+			<?php echo $options; ?>
+			<?php echo $extra; ?>
+			<?php echo $custom_attributes; ?>
+			onChange: function ( <?php echo $key; ?> ) {
+			<?php echo $onchange; ?>
 			}
 			}
 			),
@@ -2036,16 +2036,16 @@ 
 		 *
 		 * @return string
 		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
+		public function array_to_attributes($custom_attributes, $html = false) {
 			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+			if (!empty($custom_attributes)) {
 
-				if ( $html ) {
-					foreach ( $custom_attributes as $key => $val ) {
+				if ($html) {
+					foreach ($custom_attributes as $key => $val) {
 						$attributes .= " $key='$val' ";
 					}
 				} else {
-					foreach ( $custom_attributes as $key => $val ) {
+					foreach ($custom_attributes as $key => $val) {
 						$attributes .= "'$key': '$val',";
 					}
 				}
@@ -2061,86 +2061,86 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args ) {
+		public function block_element($args) {
 
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+			if (!empty($args)) {
+				foreach ($args as $element => $new_args) {
 
-					if ( is_array( $new_args ) ) { // its an element
+					if (is_array($new_args)) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+						if (isset($new_args['element'])) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
+							if (isset($new_args['element_require'])) {
+								echo str_replace(array(
 										"'+",
 										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
+									), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
+								unset($new_args['element_require']);
 							}
 
 							echo "\n el( '" . $new_args['element'] . "', {";
 
 							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
+							foreach ($new_args as $new_key => $new_value) {
 
 
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
 									// do nothing
 								} else {
-									echo $this->block_element( array( $new_key => $new_value ) );
+									echo $this->block_element(array($new_key => $new_value));
 								}
 							}
 
-							echo "},";// end attributes
+							echo "},"; // end attributes
 
 							// get the content
 							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
+							foreach ($new_args as $new_key => $new_value) {
+								if ($new_key === 'content' || is_array($new_value)) {
 
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+									if ($new_key === 'content') {
+										echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
 									}
 
-									if ( is_array( $new_value ) ) {
+									if (is_array($new_value)) {
 
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
+										if (isset($new_value['element_require'])) {
+											echo str_replace(array(
 													"'+",
 													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
+												), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
+											unset($new_value['element_require']);
 										}
 
-										if ( isset( $new_value['element_repeat'] ) ) {
+										if (isset($new_value['element_repeat'])) {
 											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ) );
-												$x ++;
+											while ($x <= absint($new_value['element_repeat'])) {
+												$this->block_element(array('' => $new_value));
+												$x++;
 											}
 										} else {
-											$this->block_element( array( '' => $new_value ) );
+											$this->block_element(array('' => $new_value));
 										}
 									}
-									$first_item ++;
+									$first_item++;
 								}
 							}
 
-							echo ")";// end content
+							echo ")"; // end content
 
 							echo ", \n";
 
 						}
 					} else {
 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+						if (substr($element, 0, 3) === "if_") {
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+						} elseif ($element == 'style') {
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
 						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 						}
 
 					}
@@ -2155,12 +2155,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
+		public function block_props_replace($string, $no_wrap = false) {
 
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+			if ($no_wrap) {
+				$string = str_replace(array("[%", "%]"), array("props.attributes.", ""), $string);
 			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+				$string = str_replace(array("[%", "%]"), array("'+props.attributes.", "+'"), $string);
 			}
 
 			return $string;
@@ -2172,48 +2172,48 @@ 
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
+		public function widget($args, $instance) {
 
 			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
+			$argument_values = $this->argument_values($instance);
+			$argument_values = $this->string_to_bool($argument_values);
+			$output          = $this->output($argument_values, $args);
 
 			$no_wrap = false;
-			if( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ){ $no_wrap = true; }
+			if (isset($argument_values['no_wrap']) && $argument_values['no_wrap']) { $no_wrap = true; }
 
 			ob_start();
-			if ( $output && !$no_wrap) {
+			if ($output && !$no_wrap) {
 				// Before widget
 				$before_widget = $args['before_widget'];
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+				$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
+				$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this);
 
 				// After widget
 				$after_widget = $args['after_widget'];
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+				$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
+				$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this);
 
 				echo $before_widget;
 				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $this->options['widget_ops']['classname'] ) . "'>" : '';
+				if ($this->is_elementor_widget_output()) {
+					echo !empty($this->options['widget_ops']['classname']) ? "<span class='" . esc_attr($this->options['widget_ops']['classname']) . "'>" : '';
 				}
-				echo $this->output_title( $args, $instance );
+				echo $this->output_title($args, $instance);
 				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
+				if ($this->is_elementor_widget_output()) {
+					echo !empty($this->options['widget_ops']['classname']) ? "</span>" : '';
 				}
 				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			} elseif ($this->is_preview() && $output == '') {// if preview show a placeholder if empty
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 				echo $output;
-			} elseif($output && $no_wrap){
+			} elseif ($output && $no_wrap) {
 				echo $output;
 			}
 			$output = ob_get_clean();
 
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+			$output = apply_filters('wp_super_duper_widget_output', $output, $instance, $args, $this);
 
 			echo $output;
 		}
@@ -2226,7 +2226,7 @@ 
 		 */
 		public function is_elementor_widget_output() {
 			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+			if (defined('ELEMENTOR_VERSION') && isset($this->number) && $this->number == 'REPLACE_TO_ID') {
 				$result = true;
 			}
 
@@ -2241,7 +2241,7 @@ 
 		 */
 		public function is_elementor_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+			if (isset($_REQUEST['elementor-preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') || (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor_ajax')) {
 				$result = true;
 			}
 
@@ -2256,7 +2256,7 @@ 
 		 */
 		public function is_divi_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+			if (isset($_REQUEST['et_fb']) || isset($_REQUEST['et_pb_preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor')) {
 				$result = true;
 			}
 
@@ -2271,7 +2271,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -2286,7 +2286,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -2301,7 +2301,7 @@ 
 		 */
 		public function is_cornerstone_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+			if (!empty($_REQUEST['cornerstone_preview']) || basename($_SERVER['REQUEST_URI']) == 'cornerstone-endpoint') {
 				$result = true;
 			}
 
@@ -2316,7 +2316,7 @@ 
 		 */
 		public function is_fusion_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+			if (!empty($_REQUEST['fb-edit']) || !empty($_REQUEST['fusion_load_nonce'])) {
 				$result = true;
 			}
 
@@ -2331,17 +2331,17 @@ 
 		 */
 		public function is_preview() {
 			$preview = false;
-			if ( $this->is_divi_preview() ) {
+			if ($this->is_divi_preview()) {
 				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
+			} elseif ($this->is_elementor_preview()) {
 				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
+			} elseif ($this->is_beaver_preview()) {
 				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
+			} elseif ($this->is_siteorigin_preview()) {
 				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
+			} elseif ($this->is_cornerstone_preview()) {
 				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
+			} elseif ($this->is_fusion_preview()) {
 				$preview = true;
 			}
 
@@ -2356,11 +2356,11 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
+		public function output_title($args, $instance = array()) {
 			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
+			if (!empty($instance['title'])) {
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+				$title  = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
 				$output = $args['before_title'] . $title . $args['after_title'];
 			}
 
@@ -2372,7 +2372,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -2380,10 +2380,10 @@ 
 			// set it as a SD widget
 			echo $this->widget_advanced_toggle();
 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+			echo "<p>" . esc_attr($this->options['widget_ops']['description']) . "</p>";
 			$arguments_raw = $this->get_arguments();
 
-			if ( is_array( $arguments_raw ) ) {
+			if (is_array($arguments_raw)) {
 
 				$arguments = $this->group_arguments($arguments_raw);
 
@@ -2391,9 +2391,9 @@ 
 				$has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if($has_sections){
+				if ($has_sections) {
 					$panel_count = 0;
-					foreach($arguments as $key => $args){
+					foreach ($arguments as $key => $args) {
 
 						?>
 						<script>
@@ -2403,10 +2403,10 @@ 
 
 						$hide = $panel_count ? ' style="display:none;" ' : '';
 						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle".sanitize_title_with_dashes($key)."'>".esc_attr($key)." <i style='float:right;' class='".$icon_class."'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-".sanitize_title_with_dashes($key)."' $hide>";
+						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes($key) . "'>" . esc_attr($key) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes($key) . "' $hide>";
 
-						foreach($args as $k => $a){
+						foreach ($args as $k => $a) {
 							$this->widget_inputs($a, $instance);
 						}
 
@@ -2415,9 +2415,9 @@ 
 						$panel_count++;
 
 					}
-				}else{
-					foreach ( $arguments as $key => $args ) {
-						$this->widget_inputs( $args, $instance );
+				} else {
+					foreach ($arguments as $key => $args) {
+						$this->widget_inputs($args, $instance);
 					}
 				}
 
@@ -2432,7 +2432,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -2452,14 +2452,14 @@ 
 		 *
 		 * @return string $output
 		 */
-		public function convert_element_require( $input ) {
+		public function convert_element_require($input) {
 
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+			$input = str_replace("'", '"', $input); // we only want double quotes
 
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()"
-			), $input ) );
+			), $input));
 
 			return $output;
 		}
@@ -2470,54 +2470,54 @@ 
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
+		public function widget_inputs($args, $instance) {
 
 			$class             = "";
 			$element_require   = "";
 			$custom_attributes = "";
 
 			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			if (isset($instance[$args['name']])) {
+				$value = $instance[$args['name']];
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
 			} else {
 				$value = '';
 			}
 
 			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			if (!empty($args['placeholder'])) {
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
 			} else {
 				$placeholder = '';
 			}
 
 			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+			if (isset($args['advanced']) && $args['advanced']) {
 				$class .= " sd-advanced-setting ";
 			}
 
 			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+			if (isset($args['element_require']) && $args['element_require']) {
 				$element_require = $args['element_require'];
 			}
 
 			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
 			}
 
 			// before wrapper
 			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
-			   data-argument='<?php echo esc_attr( $args['name'] ); ?>'
-			   data-element_require='<?php if ( $element_require ) {
-				   echo $this->convert_element_require( $element_require );
+			<p class="sd-argument <?php echo esc_attr($class); ?>"
+			   data-argument='<?php echo esc_attr($args['name']); ?>'
+			   data-element_require='<?php if ($element_require) {
+				   echo $this->convert_element_require($element_require);
 			   } ?>'
 			>
 				<?php
 
-				switch ( $args['type'] ) {
+				switch ($args['type']) {
 					//array('text','password','number','email','tel','url','color')
 					case "text":
 					case "password":
@@ -2528,46 +2528,46 @@ 
 					case "color":
 						?>
 						<label
-							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+							for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo esc_attr($args['title']); ?><?php echo $this->widget_field_desc($args); ?></label>
 						<input <?php echo $placeholder; ?> class="widefat"
 							<?php echo $custom_attributes; ?>
-							                               id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-							                               name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-							                               type="<?php echo esc_attr( $args['type'] ); ?>"
-							                               value="<?php echo esc_attr( $value ); ?>">
+							                               id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+							                               name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+							                               type="<?php echo esc_attr($args['type']); ?>"
+							                               value="<?php echo esc_attr($value); ?>">
 						<?php
 
 						break;
 					case "select":
-						$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-						if ( $multiple ) {
-							if ( empty( $value ) ) {
+						$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
+						if ($multiple) {
+							if (empty($value)) {
 								$value = array();
 							}
 						}
 						?>
 						<label
-							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+							for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo esc_attr($args['title']); ?><?php echo $this->widget_field_desc($args); ?></label>
 						<select <?php echo $placeholder; ?> class="widefat"
 							<?php echo $custom_attributes; ?>
-							                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-							                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-							                                if ( $multiple ) {
+							                                id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+							                                name="<?php echo esc_attr($this->get_field_name($args['name']));
+							                                if ($multiple) {
 								                                echo "[]";
 							                                } ?>"
-							<?php if ( $multiple ) {
+							<?php if ($multiple) {
 								echo "multiple";
 							} //@todo not implemented yet due to gutenberg not supporting it
 							?>
 						>
 							<?php
 
-							if ( ! empty( $args['options'] ) ) {
-								foreach ( $args['options'] as $val => $label ) {
-									if ( $multiple ) {
-										$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+							if (!empty($args['options'])) {
+								foreach ($args['options'] as $val => $label) {
+									if ($multiple) {
+										$selected = in_array($val, $value) ? 'selected="selected"' : '';
 									} else {
-										$selected = selected( $value, $val, false );
+										$selected = selected($value, $val, false);
 									}
 									echo "<option value='$val' " . $selected . ">$label</option>";
 								}
@@ -2579,32 +2579,32 @@ 
 					case "checkbox":
 						?>
 						<input <?php echo $placeholder; ?>
-							<?php checked( 1, $value, true ) ?>
+							<?php checked(1, $value, true) ?>
 							<?php echo $custom_attributes; ?>
-							class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-							name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox"
+							class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+							name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox"
 							value="1">
 						<label
-							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+							for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo esc_attr($args['title']); ?><?php echo $this->widget_field_desc($args); ?></label>
 						<?php
 						break;
 					case "textarea":
 						?>
 						<label
-							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+							for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo esc_attr($args['title']); ?><?php echo $this->widget_field_desc($args); ?></label>
 						<textarea <?php echo $placeholder; ?> class="widefat"
 							<?php echo $custom_attributes; ?>
-							                               id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-							                               name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-							                               ><?php echo esc_attr( $value ); ?></textarea>
+							                               id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+							                               name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+							                               ><?php echo esc_attr($value); ?></textarea>
 						<?php
 
 						break;
 					case "hidden":
 						?>
-						<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
-						       value="<?php echo esc_attr( $value ); ?>">
+						<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						       name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden"
+						       value="<?php echo esc_attr($value); ?>">
 						<?php
 						break;
 					default:
@@ -2626,14 +2626,14 @@ 
 		 * @return string
 		 * @todo, need to make its own tooltip script
 		 */
-		public function widget_field_desc( $args ) {
+		public function widget_field_desc($args) {
 
 			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
+			if (isset($args['desc']) && $args['desc']) {
+				if (isset($args['desc_tip']) && $args['desc_tip']) {
+					$description = $this->desc_tip($args['desc']);
 				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+					$description = '<span class="description">' . wp_kses_post($args['desc']) . '</span>';
 				}
 			}
 
@@ -2648,11 +2648,11 @@ 
 		 *
 		 * @return string
 		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
+		function desc_tip($tip, $allow_html = false) {
+			if ($allow_html) {
+				$tip = $this->sanitize_tooltip($tip);
 			} else {
-				$tip = esc_attr( $tip );
+				$tip = esc_attr($tip);
 			}
 
 			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
@@ -2665,8 +2665,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+		public function sanitize_tooltip($var) {
+			return htmlspecialchars(wp_kses(html_entity_decode($var), array(
 				'br'     => array(),
 				'em'     => array(),
 				'strong' => array(),
@@ -2676,7 +2676,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -2688,23 +2688,23 @@ 
 		 * @return array
 		 * @todo we should add some sanitation here.
 		 */
-		public function update( $new_instance, $old_instance ) {
+		public function update($new_instance, $old_instance) {
 
 			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
+			$instance = array_merge((array) $old_instance, (array) $new_instance);
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->get_arguments();
 			}
 
 			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $argument) {
+					if (isset($argument['type']) && $argument['type'] == 'checkbox' && !isset($new_instance[$argument['name']])) {
+						$instance[$argument['name']] = '0';
 					}
 				}
 			}
@@ -2722,7 +2722,7 @@ 
 		 */
 		public function is_block_content_call() {
 			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+			if (wp_doing_ajax() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'super_duper_output_shortcode') {
 				$result = true;
 			}
 

includes/data/continents.php

Spacing +8 added lines, -8 removed lines

@@ -8,11 +8,11 @@ 
  * @version 1.0.14
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 	'AF' => array(
-		'name'      => __( 'Africa', 'invoicing' ),
+		'name'      => __('Africa', 'invoicing'),
 		'countries' => array(
 			'AO',
 			'BF',
@@ -75,7 +75,7 @@ 
 		),
 	),
 	'AN' => array(
-		'name'      => __( 'Antarctica', 'invoicing' ),
+		'name'      => __('Antarctica', 'invoicing'),
 		'countries' => array(
 			'AQ',
 			'BV',
@@ -85,7 +85,7 @@ 
 		),
 	),
 	'AS' => array(
-		'name'      => __( 'Asia', 'invoicing' ),
+		'name'      => __('Asia', 'invoicing'),
 		'countries' => array(
 			'AE',
 			'AF',
@@ -143,7 +143,7 @@ 
 		),
 	),
 	'EU' => array(
-		'name'      => __( 'Europe', 'invoicing' ),
+		'name'      => __('Europe', 'invoicing'),
 		'countries' => array(
 			'AD',
 			'AL',
@@ -201,7 +201,7 @@ 
 		),
 	),
 	'NA' => array(
-		'name'      => __( 'North America', 'invoicing' ),
+		'name'      => __('North America', 'invoicing'),
 		'countries' => array(
 			'AG',
 			'AI',
@@ -247,7 +247,7 @@ 
 		),
 	),
 	'OC' => array(
-		'name'      => __( 'Oceania', 'invoicing' ),
+		'name'      => __('Oceania', 'invoicing'),
 		'countries' => array(
 			'AS',
 			'AU',
@@ -278,7 +278,7 @@ 
 		),
 	),
 	'SA' => array(
-		'name'      => __( 'South America', 'invoicing' ),
+		'name'      => __('South America', 'invoicing'),
 		'countries' => array(
 			'AR',
 			'BO',

includes/data/states.php

Spacing +1405 added lines, -1405 removed lines

@@ -11,632 +11,632 @@ 
  * @version 1.0.14
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 	'AF' => array(),
 	'AO' => array( // Angola states.
-		'BGO' => __( 'Bengo', 'invoicing' ),
-		'BLU' => __( 'Benguela', 'invoicing' ),
-		'BIE' => __( 'Bié', 'invoicing' ),
-		'CAB' => __( 'Cabinda', 'invoicing' ),
-		'CNN' => __( 'Cunene', 'invoicing' ),
-		'HUA' => __( 'Huambo', 'invoicing' ),
-		'HUI' => __( 'Huíla', 'invoicing' ),
-		'CCU' => __( 'Kuando Kubango', 'invoicing' ),
-		'CNO' => __( 'Kwanza-Norte', 'invoicing' ),
-		'CUS' => __( 'Kwanza-Sul', 'invoicing' ),
-		'LUA' => __( 'Luanda', 'invoicing' ),
-		'LNO' => __( 'Lunda-Norte', 'invoicing' ),
-		'LSU' => __( 'Lunda-Sul', 'invoicing' ),
-		'MAL' => __( 'Malanje', 'invoicing' ),
-		'MOX' => __( 'Moxico', 'invoicing' ),
-		'NAM' => __( 'Namibe', 'invoicing' ),
-		'UIG' => __( 'Uíge', 'invoicing' ),
-		'ZAI' => __( 'Zaire', 'invoicing' ),
+		'BGO' => __('Bengo', 'invoicing'),
+		'BLU' => __('Benguela', 'invoicing'),
+		'BIE' => __('Bié', 'invoicing'),
+		'CAB' => __('Cabinda', 'invoicing'),
+		'CNN' => __('Cunene', 'invoicing'),
+		'HUA' => __('Huambo', 'invoicing'),
+		'HUI' => __('Huíla', 'invoicing'),
+		'CCU' => __('Kuando Kubango', 'invoicing'),
+		'CNO' => __('Kwanza-Norte', 'invoicing'),
+		'CUS' => __('Kwanza-Sul', 'invoicing'),
+		'LUA' => __('Luanda', 'invoicing'),
+		'LNO' => __('Lunda-Norte', 'invoicing'),
+		'LSU' => __('Lunda-Sul', 'invoicing'),
+		'MAL' => __('Malanje', 'invoicing'),
+		'MOX' => __('Moxico', 'invoicing'),
+		'NAM' => __('Namibe', 'invoicing'),
+		'UIG' => __('Uíge', 'invoicing'),
+		'ZAI' => __('Zaire', 'invoicing'),
 	),
 	'AR' => array( // Argentinian provinces.
-		'C' => __( 'Ciudad Autónoma de Buenos Aires', 'invoicing' ),
-		'B' => __( 'Buenos Aires', 'invoicing' ),
-		'K' => __( 'Catamarca', 'invoicing' ),
-		'H' => __( 'Chaco', 'invoicing' ),
-		'U' => __( 'Chubut', 'invoicing' ),
-		'X' => __( 'Córdoba', 'invoicing' ),
-		'W' => __( 'Corrientes', 'invoicing' ),
-		'E' => __( 'Entre Ríos', 'invoicing' ),
-		'P' => __( 'Formosa', 'invoicing' ),
-		'Y' => __( 'Jujuy', 'invoicing' ),
-		'L' => __( 'La Pampa', 'invoicing' ),
-		'F' => __( 'La Rioja', 'invoicing' ),
-		'M' => __( 'Mendoza', 'invoicing' ),
-		'N' => __( 'Misiones', 'invoicing' ),
-		'Q' => __( 'Neuquén', 'invoicing' ),
-		'R' => __( 'Río Negro', 'invoicing' ),
-		'A' => __( 'Salta', 'invoicing' ),
-		'J' => __( 'San Juan', 'invoicing' ),
-		'D' => __( 'San Luis', 'invoicing' ),
-		'Z' => __( 'Santa Cruz', 'invoicing' ),
-		'S' => __( 'Santa Fe', 'invoicing' ),
-		'G' => __( 'Santiago del Estero', 'invoicing' ),
-		'V' => __( 'Tierra del Fuego', 'invoicing' ),
-		'T' => __( 'Tucumán', 'invoicing' ),
+		'C' => __('Ciudad Autónoma de Buenos Aires', 'invoicing'),
+		'B' => __('Buenos Aires', 'invoicing'),
+		'K' => __('Catamarca', 'invoicing'),
+		'H' => __('Chaco', 'invoicing'),
+		'U' => __('Chubut', 'invoicing'),
+		'X' => __('Córdoba', 'invoicing'),
+		'W' => __('Corrientes', 'invoicing'),
+		'E' => __('Entre Ríos', 'invoicing'),
+		'P' => __('Formosa', 'invoicing'),
+		'Y' => __('Jujuy', 'invoicing'),
+		'L' => __('La Pampa', 'invoicing'),
+		'F' => __('La Rioja', 'invoicing'),
+		'M' => __('Mendoza', 'invoicing'),
+		'N' => __('Misiones', 'invoicing'),
+		'Q' => __('Neuquén', 'invoicing'),
+		'R' => __('Río Negro', 'invoicing'),
+		'A' => __('Salta', 'invoicing'),
+		'J' => __('San Juan', 'invoicing'),
+		'D' => __('San Luis', 'invoicing'),
+		'Z' => __('Santa Cruz', 'invoicing'),
+		'S' => __('Santa Fe', 'invoicing'),
+		'G' => __('Santiago del Estero', 'invoicing'),
+		'V' => __('Tierra del Fuego', 'invoicing'),
+		'T' => __('Tucumán', 'invoicing'),
 	),
 	'AT' => array(),
 	'AU' => array( // Australian states.
-		'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'),
 	),
 	'AX' => array(),
 	'BD' => array( // Bangladeshi states (districts).
-		'BD-05' => __( 'Bagerhat', 'invoicing' ),
-		'BD-01' => __( 'Bandarban', 'invoicing' ),
-		'BD-02' => __( 'Barguna', 'invoicing' ),
-		'BD-06' => __( 'Barishal', 'invoicing' ),
-		'BD-07' => __( 'Bhola', 'invoicing' ),
-		'BD-03' => __( 'Bogura', 'invoicing' ),
-		'BD-04' => __( 'Brahmanbaria', 'invoicing' ),
-		'BD-09' => __( 'Chandpur', 'invoicing' ),
-		'BD-10' => __( 'Chattogram', 'invoicing' ),
-		'BD-12' => __( 'Chuadanga', 'invoicing' ),
-		'BD-11' => __( "Cox's Bazar", 'invoicing' ),
-		'BD-08' => __( 'Cumilla', 'invoicing' ),
-		'BD-13' => __( 'Dhaka', 'invoicing' ),
-		'BD-14' => __( 'Dinajpur', 'invoicing' ),
-		'BD-15' => __( 'Faridpur ', 'invoicing' ),
-		'BD-16' => __( 'Feni', 'invoicing' ),
-		'BD-19' => __( 'Gaibandha', 'invoicing' ),
-		'BD-18' => __( 'Gazipur', 'invoicing' ),
-		'BD-17' => __( 'Gopalganj', 'invoicing' ),
-		'BD-20' => __( 'Habiganj', 'invoicing' ),
-		'BD-21' => __( 'Jamalpur', 'invoicing' ),
-		'BD-22' => __( 'Jashore', 'invoicing' ),
-		'BD-25' => __( 'Jhalokati', 'invoicing' ),
-		'BD-23' => __( 'Jhenaidah', 'invoicing' ),
-		'BD-24' => __( 'Joypurhat', 'invoicing' ),
-		'BD-29' => __( 'Khagrachhari', 'invoicing' ),
-		'BD-27' => __( 'Khulna', 'invoicing' ),
-		'BD-26' => __( 'Kishoreganj', 'invoicing' ),
-		'BD-28' => __( 'Kurigram', 'invoicing' ),
-		'BD-30' => __( 'Kushtia', 'invoicing' ),
-		'BD-31' => __( 'Lakshmipur', 'invoicing' ),
-		'BD-32' => __( 'Lalmonirhat', 'invoicing' ),
-		'BD-36' => __( 'Madaripur', 'invoicing' ),
-		'BD-37' => __( 'Magura', 'invoicing' ),
-		'BD-33' => __( 'Manikganj ', 'invoicing' ),
-		'BD-39' => __( 'Meherpur', 'invoicing' ),
-		'BD-38' => __( 'Moulvibazar', 'invoicing' ),
-		'BD-35' => __( 'Munshiganj', 'invoicing' ),
-		'BD-34' => __( 'Mymensingh', 'invoicing' ),
-		'BD-48' => __( 'Naogaon', 'invoicing' ),
-		'BD-43' => __( 'Narail', 'invoicing' ),
-		'BD-40' => __( 'Narayanganj', 'invoicing' ),
-		'BD-42' => __( 'Narsingdi', 'invoicing' ),
-		'BD-44' => __( 'Natore', 'invoicing' ),
-		'BD-45' => __( 'Nawabganj', 'invoicing' ),
-		'BD-41' => __( 'Netrakona', 'invoicing' ),
-		'BD-46' => __( 'Nilphamari', 'invoicing' ),
-		'BD-47' => __( 'Noakhali', 'invoicing' ),
-		'BD-49' => __( 'Pabna', 'invoicing' ),
-		'BD-52' => __( 'Panchagarh', 'invoicing' ),
-		'BD-51' => __( 'Patuakhali', 'invoicing' ),
-		'BD-50' => __( 'Pirojpur', 'invoicing' ),
-		'BD-53' => __( 'Rajbari', 'invoicing' ),
-		'BD-54' => __( 'Rajshahi', 'invoicing' ),
-		'BD-56' => __( 'Rangamati', 'invoicing' ),
-		'BD-55' => __( 'Rangpur', 'invoicing' ),
-		'BD-58' => __( 'Satkhira', 'invoicing' ),
-		'BD-62' => __( 'Shariatpur', 'invoicing' ),
-		'BD-57' => __( 'Sherpur', 'invoicing' ),
-		'BD-59' => __( 'Sirajganj', 'invoicing' ),
-		'BD-61' => __( 'Sunamganj', 'invoicing' ),
-		'BD-60' => __( 'Sylhet', 'invoicing' ),
-		'BD-63' => __( 'Tangail', 'invoicing' ),
-		'BD-64' => __( 'Thakurgaon', 'invoicing' ),
+		'BD-05' => __('Bagerhat', 'invoicing'),
+		'BD-01' => __('Bandarban', 'invoicing'),
+		'BD-02' => __('Barguna', 'invoicing'),
+		'BD-06' => __('Barishal', 'invoicing'),
+		'BD-07' => __('Bhola', 'invoicing'),
+		'BD-03' => __('Bogura', 'invoicing'),
+		'BD-04' => __('Brahmanbaria', 'invoicing'),
+		'BD-09' => __('Chandpur', 'invoicing'),
+		'BD-10' => __('Chattogram', 'invoicing'),
+		'BD-12' => __('Chuadanga', 'invoicing'),
+		'BD-11' => __("Cox's Bazar", 'invoicing'),
+		'BD-08' => __('Cumilla', 'invoicing'),
+		'BD-13' => __('Dhaka', 'invoicing'),
+		'BD-14' => __('Dinajpur', 'invoicing'),
+		'BD-15' => __('Faridpur ', 'invoicing'),
+		'BD-16' => __('Feni', 'invoicing'),
+		'BD-19' => __('Gaibandha', 'invoicing'),
+		'BD-18' => __('Gazipur', 'invoicing'),
+		'BD-17' => __('Gopalganj', 'invoicing'),
+		'BD-20' => __('Habiganj', 'invoicing'),
+		'BD-21' => __('Jamalpur', 'invoicing'),
+		'BD-22' => __('Jashore', 'invoicing'),
+		'BD-25' => __('Jhalokati', 'invoicing'),
+		'BD-23' => __('Jhenaidah', 'invoicing'),
+		'BD-24' => __('Joypurhat', 'invoicing'),
+		'BD-29' => __('Khagrachhari', 'invoicing'),
+		'BD-27' => __('Khulna', 'invoicing'),
+		'BD-26' => __('Kishoreganj', 'invoicing'),
+		'BD-28' => __('Kurigram', 'invoicing'),
+		'BD-30' => __('Kushtia', 'invoicing'),
+		'BD-31' => __('Lakshmipur', 'invoicing'),
+		'BD-32' => __('Lalmonirhat', 'invoicing'),
+		'BD-36' => __('Madaripur', 'invoicing'),
+		'BD-37' => __('Magura', 'invoicing'),
+		'BD-33' => __('Manikganj ', 'invoicing'),
+		'BD-39' => __('Meherpur', 'invoicing'),
+		'BD-38' => __('Moulvibazar', 'invoicing'),
+		'BD-35' => __('Munshiganj', 'invoicing'),
+		'BD-34' => __('Mymensingh', 'invoicing'),
+		'BD-48' => __('Naogaon', 'invoicing'),
+		'BD-43' => __('Narail', 'invoicing'),
+		'BD-40' => __('Narayanganj', 'invoicing'),
+		'BD-42' => __('Narsingdi', 'invoicing'),
+		'BD-44' => __('Natore', 'invoicing'),
+		'BD-45' => __('Nawabganj', 'invoicing'),
+		'BD-41' => __('Netrakona', 'invoicing'),
+		'BD-46' => __('Nilphamari', 'invoicing'),
+		'BD-47' => __('Noakhali', 'invoicing'),
+		'BD-49' => __('Pabna', 'invoicing'),
+		'BD-52' => __('Panchagarh', 'invoicing'),
+		'BD-51' => __('Patuakhali', 'invoicing'),
+		'BD-50' => __('Pirojpur', 'invoicing'),
+		'BD-53' => __('Rajbari', 'invoicing'),
+		'BD-54' => __('Rajshahi', 'invoicing'),
+		'BD-56' => __('Rangamati', 'invoicing'),
+		'BD-55' => __('Rangpur', 'invoicing'),
+		'BD-58' => __('Satkhira', 'invoicing'),
+		'BD-62' => __('Shariatpur', 'invoicing'),
+		'BD-57' => __('Sherpur', 'invoicing'),
+		'BD-59' => __('Sirajganj', 'invoicing'),
+		'BD-61' => __('Sunamganj', 'invoicing'),
+		'BD-60' => __('Sylhet', 'invoicing'),
+		'BD-63' => __('Tangail', 'invoicing'),
+		'BD-64' => __('Thakurgaon', 'invoicing'),
 	),
 	'BE' => array(),
 	'BG' => array( // Bulgarian states.
-		'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'),
 	),
 	'BH' => array(),
 	'BI' => array(),
 	'BO' => array( // Bolivian states.
-		'B' => __( 'Chuquisaca', 'invoicing' ),
-		'H' => __( 'Beni', 'invoicing' ),
-		'C' => __( 'Cochabamba', 'invoicing' ),
-		'L' => __( 'La Paz', 'invoicing' ),
-		'O' => __( 'Oruro', 'invoicing' ),
-		'N' => __( 'Pando', 'invoicing' ),
-		'P' => __( 'Potosí', 'invoicing' ),
-		'S' => __( 'Santa Cruz', 'invoicing' ),
-		'T' => __( 'Tarija', 'invoicing' ),
+		'B' => __('Chuquisaca', 'invoicing'),
+		'H' => __('Beni', 'invoicing'),
+		'C' => __('Cochabamba', 'invoicing'),
+		'L' => __('La Paz', 'invoicing'),
+		'O' => __('Oruro', 'invoicing'),
+		'N' => __('Pando', 'invoicing'),
+		'P' => __('Potosí', 'invoicing'),
+		'S' => __('Santa Cruz', 'invoicing'),
+		'T' => __('Tarija', 'invoicing'),
 	),
 	'BR' => array( // Brazillian states.
-		'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'),
 	),
 	'CA' => array( // Canadian states.
-		'AB' => __( 'Alberta', 'invoicing' ),
-		'BC' => __( 'British Columbia', 'invoicing' ),
-		'MB' => __( 'Manitoba', 'invoicing' ),
-		'NB' => __( 'New Brunswick', 'invoicing' ),
-		'NL' => __( 'Newfoundland and Labrador', 'invoicing' ),
-		'NT' => __( 'Northwest Territories', 'invoicing' ),
-		'NS' => __( 'Nova Scotia', 'invoicing' ),
-		'NU' => __( 'Nunavut', 'invoicing' ),
-		'ON' => __( 'Ontario', 'invoicing' ),
-		'PE' => __( 'Prince Edward Island', 'invoicing' ),
-		'QC' => __( 'Quebec', 'invoicing' ),
-		'SK' => __( 'Saskatchewan', 'invoicing' ),
-		'YT' => __( 'Yukon Territory', 'invoicing' ),
+		'AB' => __('Alberta', 'invoicing'),
+		'BC' => __('British Columbia', 'invoicing'),
+		'MB' => __('Manitoba', 'invoicing'),
+		'NB' => __('New Brunswick', 'invoicing'),
+		'NL' => __('Newfoundland and Labrador', 'invoicing'),
+		'NT' => __('Northwest Territories', 'invoicing'),
+		'NS' => __('Nova Scotia', 'invoicing'),
+		'NU' => __('Nunavut', 'invoicing'),
+		'ON' => __('Ontario', 'invoicing'),
+		'PE' => __('Prince Edward Island', 'invoicing'),
+		'QC' => __('Quebec', 'invoicing'),
+		'SK' => __('Saskatchewan', 'invoicing'),
+		'YT' => __('Yukon Territory', 'invoicing'),
 	),
 	'CH' => array( // Cantons of Switzerland.
-		'AG' => __( 'Aargau', 'invoicing' ),
-		'AR' => __( 'Appenzell Ausserrhoden', 'invoicing' ),
-		'AI' => __( 'Appenzell Innerrhoden', 'invoicing' ),
-		'BL' => __( 'Basel-Landschaft', 'invoicing' ),
-		'BS' => __( 'Basel-Stadt', 'invoicing' ),
-		'BE' => __( 'Bern', 'invoicing' ),
-		'FR' => __( 'Fribourg', 'invoicing' ),
-		'GE' => __( 'Geneva', 'invoicing' ),
-		'GL' => __( 'Glarus', 'invoicing' ),
-		'GR' => __( 'Graubünden', 'invoicing' ),
-		'JU' => __( 'Jura', 'invoicing' ),
-		'LU' => __( 'Luzern', 'invoicing' ),
-		'NE' => __( 'Neuchâtel', 'invoicing' ),
-		'NW' => __( 'Nidwalden', 'invoicing' ),
-		'OW' => __( 'Obwalden', 'invoicing' ),
-		'SH' => __( 'Schaffhausen', 'invoicing' ),
-		'SZ' => __( 'Schwyz', 'invoicing' ),
-		'SO' => __( 'Solothurn', 'invoicing' ),
-		'SG' => __( 'St. Gallen', 'invoicing' ),
-		'TG' => __( 'Thurgau', 'invoicing' ),
-		'TI' => __( 'Ticino', 'invoicing' ),
-		'UR' => __( 'Uri', 'invoicing' ),
-		'VS' => __( 'Valais', 'invoicing' ),
-		'VD' => __( 'Vaud', 'invoicing' ),
-		'ZG' => __( 'Zug', 'invoicing' ),
-		'ZH' => __( 'Zürich', 'invoicing' ),
+		'AG' => __('Aargau', 'invoicing'),
+		'AR' => __('Appenzell Ausserrhoden', 'invoicing'),
+		'AI' => __('Appenzell Innerrhoden', 'invoicing'),
+		'BL' => __('Basel-Landschaft', 'invoicing'),
+		'BS' => __('Basel-Stadt', 'invoicing'),
+		'BE' => __('Bern', 'invoicing'),
+		'FR' => __('Fribourg', 'invoicing'),
+		'GE' => __('Geneva', 'invoicing'),
+		'GL' => __('Glarus', 'invoicing'),
+		'GR' => __('Graubünden', 'invoicing'),
+		'JU' => __('Jura', 'invoicing'),
+		'LU' => __('Luzern', 'invoicing'),
+		'NE' => __('Neuchâtel', 'invoicing'),
+		'NW' => __('Nidwalden', 'invoicing'),
+		'OW' => __('Obwalden', 'invoicing'),
+		'SH' => __('Schaffhausen', 'invoicing'),
+		'SZ' => __('Schwyz', 'invoicing'),
+		'SO' => __('Solothurn', 'invoicing'),
+		'SG' => __('St. Gallen', 'invoicing'),
+		'TG' => __('Thurgau', 'invoicing'),
+		'TI' => __('Ticino', 'invoicing'),
+		'UR' => __('Uri', 'invoicing'),
+		'VS' => __('Valais', 'invoicing'),
+		'VD' => __('Vaud', 'invoicing'),
+		'ZG' => __('Zug', 'invoicing'),
+		'ZH' => __('Zürich', 'invoicing'),
 	),
 	'CN' => array( // Chinese states.
-		'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' => __( 'Macao / 澳门', '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' => __('Macao / 澳门', 'invoicing'),
+		'CN31' => __('Tibet / 西藏', 'invoicing'),
+		'CN32' => __('Xinjiang / 新疆', 'invoicing'),
 	),
 	'CZ' => array(),
 	'DE' => array(),
 	'DK' => array(),
 	'EE' => array(),
 	'ES' => array( // Spanish states.
-		'C'  => __( 'A Coruña', 'invoicing' ),
-		'VI' => __( 'Araba/Álava', '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/Álava', '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'),
 	),
 	'FI' => array(),
 	'FR' => array(),
 	'GP' => array(),
 	'GR' => array( // Greek Regions.
-		'I' => __( 'Αττική', 'invoicing' ),
-		'A' => __( 'Ανατολική Μακεδονία και Θράκη', 'invoicing' ),
-		'B' => __( 'Κεντρική Μακεδονία', 'invoicing' ),
-		'C' => __( 'Δυτική Μακεδονία', 'invoicing' ),
-		'D' => __( 'Ήπειρος', 'invoicing' ),
-		'E' => __( 'Θεσσαλία', 'invoicing' ),
-		'F' => __( 'Ιόνιοι Νήσοι', 'invoicing' ),
-		'G' => __( 'Δυτική Ελλάδα', 'invoicing' ),
-		'H' => __( 'Στερεά Ελλάδα', 'invoicing' ),
-		'J' => __( 'Πελοπόννησος', 'invoicing' ),
-		'K' => __( 'Βόρειο Αιγαίο', 'invoicing' ),
-		'L' => __( 'Νότιο Αιγαίο', 'invoicing' ),
-		'M' => __( 'Κρήτη', 'invoicing' ),
+		'I' => __('Αττική', 'invoicing'),
+		'A' => __('Ανατολική Μακεδονία και Θράκη', 'invoicing'),
+		'B' => __('Κεντρική Μακεδονία', 'invoicing'),
+		'C' => __('Δυτική Μακεδονία', 'invoicing'),
+		'D' => __('Ήπειρος', 'invoicing'),
+		'E' => __('Θεσσαλία', 'invoicing'),
+		'F' => __('Ιόνιοι Νήσοι', 'invoicing'),
+		'G' => __('Δυτική Ελλάδα', 'invoicing'),
+		'H' => __('Στερεά Ελλάδα', 'invoicing'),
+		'J' => __('Πελοπόννησος', 'invoicing'),
+		'K' => __('Βόρειο Αιγαίο', 'invoicing'),
+		'L' => __('Νότιο Αιγαίο', 'invoicing'),
+		'M' => __('Κρήτη', 'invoicing'),
 	),
 	'GF' => array(),
 	'HK' => array( // Hong Kong states.
-		'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'),
 	),
 	'HU' => array( // Hungary states.
-		'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'),
 	),
 	'ID' => array( // Indonesia Provinces.
-		'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' ),
+		'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'),
 	),
 	'IE' => array( // Republic of Ireland.
-		'CW' => __( 'Carlow', 'invoicing' ),
-		'CN' => __( 'Cavan', 'invoicing' ),
-		'CE' => __( 'Clare', 'invoicing' ),
-		'CO' => __( 'Cork', 'invoicing' ),
-		'DL' => __( 'Donegal', 'invoicing' ),
-		'D'  => __( 'Dublin', 'invoicing' ),
-		'G'  => __( 'Galway', 'invoicing' ),
-		'KY' => __( 'Kerry', 'invoicing' ),
-		'KE' => __( 'Kildare', 'invoicing' ),
-		'KK' => __( 'Kilkenny', 'invoicing' ),
-		'LS' => __( 'Laois', 'invoicing' ),
-		'LM' => __( 'Leitrim', 'invoicing' ),
-		'LK' => __( 'Limerick', 'invoicing' ),
-		'LD' => __( 'Longford', 'invoicing' ),
-		'LH' => __( 'Louth', 'invoicing' ),
-		'MO' => __( 'Mayo', 'invoicing' ),
-		'MH' => __( 'Meath', 'invoicing' ),
-		'MN' => __( 'Monaghan', 'invoicing' ),
-		'OY' => __( 'Offaly', 'invoicing' ),
-		'RN' => __( 'Roscommon', 'invoicing' ),
-		'SO' => __( 'Sligo', 'invoicing' ),
-		'TA' => __( 'Tipperary', 'invoicing' ),
-		'WD' => __( 'Waterford', 'invoicing' ),
-		'WH' => __( 'Westmeath', 'invoicing' ),
-		'WX' => __( 'Wexford', 'invoicing' ),
-		'WW' => __( 'Wicklow', 'invoicing' ),
+		'CW' => __('Carlow', 'invoicing'),
+		'CN' => __('Cavan', 'invoicing'),
+		'CE' => __('Clare', 'invoicing'),
+		'CO' => __('Cork', 'invoicing'),
+		'DL' => __('Donegal', 'invoicing'),
+		'D'  => __('Dublin', 'invoicing'),
+		'G'  => __('Galway', 'invoicing'),
+		'KY' => __('Kerry', 'invoicing'),
+		'KE' => __('Kildare', 'invoicing'),
+		'KK' => __('Kilkenny', 'invoicing'),
+		'LS' => __('Laois', 'invoicing'),
+		'LM' => __('Leitrim', 'invoicing'),
+		'LK' => __('Limerick', 'invoicing'),
+		'LD' => __('Longford', 'invoicing'),
+		'LH' => __('Louth', 'invoicing'),
+		'MO' => __('Mayo', 'invoicing'),
+		'MH' => __('Meath', 'invoicing'),
+		'MN' => __('Monaghan', 'invoicing'),
+		'OY' => __('Offaly', 'invoicing'),
+		'RN' => __('Roscommon', 'invoicing'),
+		'SO' => __('Sligo', 'invoicing'),
+		'TA' => __('Tipperary', 'invoicing'),
+		'WD' => __('Waterford', 'invoicing'),
+		'WH' => __('Westmeath', 'invoicing'),
+		'WX' => __('Wexford', 'invoicing'),
+		'WW' => __('Wicklow', 'invoicing'),
 	),
 	'IN' => array( // Indian states.
-		'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' ),
-		'TS' => __( 'Telangana', 'invoicing' ),
-		'TR' => __( 'Tripura', 'invoicing' ),
-		'UK' => __( 'Uttarakhand', 'invoicing' ),
-		'UP' => __( 'Uttar Pradesh', 'invoicing' ),
-		'WB' => __( 'West Bengal', 'invoicing' ),
-		'AN' => __( 'Andaman and Nicobar Islands', 'invoicing' ),
-		'CH' => __( 'Chandigarh', 'invoicing' ),
-		'DN' => __( 'Dadra and Nagar Haveli', 'invoicing' ),
-		'DD' => __( 'Daman and Diu', 'invoicing' ),
-		'DL' => __( 'Delhi', 'invoicing' ),
-		'LD' => __( 'Lakshadeep', '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'),
+		'TS' => __('Telangana', 'invoicing'),
+		'TR' => __('Tripura', 'invoicing'),
+		'UK' => __('Uttarakhand', 'invoicing'),
+		'UP' => __('Uttar Pradesh', 'invoicing'),
+		'WB' => __('West Bengal', 'invoicing'),
+		'AN' => __('Andaman and Nicobar Islands', 'invoicing'),
+		'CH' => __('Chandigarh', 'invoicing'),
+		'DN' => __('Dadra and Nagar Haveli', 'invoicing'),
+		'DD' => __('Daman and Diu', 'invoicing'),
+		'DL' => __('Delhi', 'invoicing'),
+		'LD' => __('Lakshadeep', 'invoicing'),
+		'PY' => __('Pondicherry (Puducherry)', 'invoicing'),
 	),
 	'IR' => array( // Iran States.
-		'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 Azarbaijan (آذربایجان شرقی)', 'invoicing' ),
-		'WAZ' => __( 'West Azarbaijan (آذربایجان غربی)', '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 Azarbaijan (آذربایجان شرقی)', 'invoicing'),
+		'WAZ' => __('West Azarbaijan (آذربایجان غربی)', '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'),
 	),
 	'IS' => array(),
 	'IT' => array( // Italy Provinces.
-		'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' ),
-		'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' => __( 'Forlì-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' ),
-		'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' ),
-		'SS' => __( 'Sassari', 'invoicing' ),
-		'SV' => __( 'Savona', 'invoicing' ),
-		'SI' => __( 'Siena', 'invoicing' ),
-		'SR' => __( 'Siracusa', 'invoicing' ),
-		'SO' => __( 'Sondrio', 'invoicing' ),
-		'SU' => __( 'Sud Sardegna', 'invoicing' ),
-		'TA' => __( 'Taranto', 'invoicing' ),
-		'TE' => __( 'Teramo', 'invoicing' ),
-		'TR' => __( 'Terni', 'invoicing' ),
-		'TO' => __( 'Torino', 'invoicing' ),
-		'TP' => __( 'Trapani', 'invoicing' ),
-		'TN' => __( 'Trento', 'invoicing' ),
-		'TV' => __( 'Treviso', 'invoicing' ),
-		'TS' => __( 'Trieste', 'invoicing' ),
-		'UD' => __( 'Udine', 'invoicing' ),
-		'VA' => __( 'Varese', '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'),
+		'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' => __('Forlì-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'),
+		'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'),
+		'SS' => __('Sassari', 'invoicing'),
+		'SV' => __('Savona', 'invoicing'),
+		'SI' => __('Siena', 'invoicing'),
+		'SR' => __('Siracusa', 'invoicing'),
+		'SO' => __('Sondrio', 'invoicing'),
+		'SU' => __('Sud Sardegna', 'invoicing'),
+		'TA' => __('Taranto', 'invoicing'),
+		'TE' => __('Teramo', 'invoicing'),
+		'TR' => __('Terni', 'invoicing'),
+		'TO' => __('Torino', 'invoicing'),
+		'TP' => __('Trapani', 'invoicing'),
+		'TN' => __('Trento', 'invoicing'),
+		'TV' => __('Treviso', 'invoicing'),
+		'TS' => __('Trieste', 'invoicing'),
+		'UD' => __('Udine', 'invoicing'),
+		'VA' => __('Varese', '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'),
 	),
 	'IL' => array(),
 	'IM' => array(),
@@ -648,903 +648,903 @@ 
 	 * The suffix corresponds with the Japanese translation file.
 	 */
 	'JP' => 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' => __( 'Kyoto', 'invoicing' ),
-		'JP27' => __( 'Osaka', 'invoicing' ),
-		'JP28' => __( 'Hyogo', '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' => __('Kyoto', 'invoicing'),
+		'JP27' => __('Osaka', 'invoicing'),
+		'JP28' => __('Hyogo', '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'),
 	),
 	'KE' => array( // Kenya Counties.
-		'1'  => __( 'Mombasa', 'invoicing' ),
-		'2'  => __( 'Kwale', 'invoicing' ),
-		'3'  => __( 'Kilifi', 'invoicing' ),
-		'4'  => __( 'Tana River', 'invoicing' ),
-		'5'  => __( 'Lamu', 'invoicing' ),
-		'6'  => __( 'Taita-Taveta', 'invoicing' ),
-		'7'  => __( 'Garissa', 'invoicing' ),
-		'8'  => __( 'Wajir', 'invoicing' ),
-		'9'  => __( 'Mandera', 'invoicing' ),
-		'10' => __( 'Marsabit', 'invoicing' ),
-		'11' => __( 'Isiolo', 'invoicing' ),
-		'12' => __( 'Meru', 'invoicing' ),
-		'13' => __( 'Tharaka-Nithi', 'invoicing' ),
-		'14' => __( 'Embu', 'invoicing' ),
-		'15' => __( 'Kitui', 'invoicing' ),
-		'16' => __( 'Machakos', 'invoicing' ),
-		'17' => __( 'Makueni', 'invoicing' ),
-		'18' => __( 'Nyandarua', 'invoicing' ),
-		'19' => __( 'Nyeri', 'invoicing' ),
-		'20' => __( 'Kirinyaga', 'invoicing' ),
-		'21' => __( "Murang'a", 'invoicing' ),
-		'22' => __( 'Kiambu', 'invoicing' ),
-		'23' => __( 'Turkana', 'invoicing' ),
-		'24' => __( 'West Pokot', 'invoicing' ),
-		'25' => __( 'Samburu', 'invoicing' ),
-		'26' => __( 'Trans-Nzoia', 'invoicing' ),
-		'27' => __( 'Uasin Gishu', 'invoicing' ),
-		'28' => __( 'Elgeyo-Marakwet', 'invoicing' ),
-		'29' => __( 'Nandi', 'invoicing' ),
-		'30' => __( 'Baringo', 'invoicing' ),
-		'31' => __( 'Laikipia', 'invoicing' ),
-		'32' => __( 'Nakuru', 'invoicing' ),
-		'33' => __( 'Narok', 'invoicing' ),
-		'34' => __( 'Kajiado', 'invoicing' ),
-		'35' => __( 'Kericho', 'invoicing' ),
-		'36' => __( 'Bomet', 'invoicing' ),
-		'37' => __( 'Kakamega', 'invoicing' ),
-		'38' => __( 'Vihiga', 'invoicing' ),
-		'39' => __( 'Bungoma', 'invoicing' ),
-		'40' => __( 'Busia', 'invoicing' ),
-		'41' => __( 'Siaya', 'invoicing' ),
-		'42' => __( 'Kisumu', 'invoicing' ),
-		'43' => __( 'Homa bay', 'invoicing' ),
-		'44' => __( 'Migori', 'invoicing' ),
-		'45' => __( 'Kisii', 'invoicing' ),
-		'46' => __( 'Nyamira', 'invoicing' ),
-		'47' => __( 'Nairobi', 'invoicing' ),
+		'1'  => __('Mombasa', 'invoicing'),
+		'2'  => __('Kwale', 'invoicing'),
+		'3'  => __('Kilifi', 'invoicing'),
+		'4'  => __('Tana River', 'invoicing'),
+		'5'  => __('Lamu', 'invoicing'),
+		'6'  => __('Taita-Taveta', 'invoicing'),
+		'7'  => __('Garissa', 'invoicing'),
+		'8'  => __('Wajir', 'invoicing'),
+		'9'  => __('Mandera', 'invoicing'),
+		'10' => __('Marsabit', 'invoicing'),
+		'11' => __('Isiolo', 'invoicing'),
+		'12' => __('Meru', 'invoicing'),
+		'13' => __('Tharaka-Nithi', 'invoicing'),
+		'14' => __('Embu', 'invoicing'),
+		'15' => __('Kitui', 'invoicing'),
+		'16' => __('Machakos', 'invoicing'),
+		'17' => __('Makueni', 'invoicing'),
+		'18' => __('Nyandarua', 'invoicing'),
+		'19' => __('Nyeri', 'invoicing'),
+		'20' => __('Kirinyaga', 'invoicing'),
+		'21' => __("Murang'a", 'invoicing'),
+		'22' => __('Kiambu', 'invoicing'),
+		'23' => __('Turkana', 'invoicing'),
+		'24' => __('West Pokot', 'invoicing'),
+		'25' => __('Samburu', 'invoicing'),
+		'26' => __('Trans-Nzoia', 'invoicing'),
+		'27' => __('Uasin Gishu', 'invoicing'),
+		'28' => __('Elgeyo-Marakwet', 'invoicing'),
+		'29' => __('Nandi', 'invoicing'),
+		'30' => __('Baringo', 'invoicing'),
+		'31' => __('Laikipia', 'invoicing'),
+		'32' => __('Nakuru', 'invoicing'),
+		'33' => __('Narok', 'invoicing'),
+		'34' => __('Kajiado', 'invoicing'),
+		'35' => __('Kericho', 'invoicing'),
+		'36' => __('Bomet', 'invoicing'),
+		'37' => __('Kakamega', 'invoicing'),
+		'38' => __('Vihiga', 'invoicing'),
+		'39' => __('Bungoma', 'invoicing'),
+		'40' => __('Busia', 'invoicing'),
+		'41' => __('Siaya', 'invoicing'),
+		'42' => __('Kisumu', 'invoicing'),
+		'43' => __('Homa bay', 'invoicing'),
+		'44' => __('Migori', 'invoicing'),
+		'45' => __('Kisii', 'invoicing'),
+		'46' => __('Nyamira', 'invoicing'),
+		'47' => __('Nairobi', 'invoicing'),
 	),
 	'KR' => array(),
 	'KW' => array(),
 	'LB' => array(),
 	'LR' => array( // Liberia provinces.
-		'BM' => __( 'Bomi', 'invoicing' ),
-		'BN' => __( 'Bong', 'invoicing' ),
-		'GA' => __( 'Gbarpolu', 'invoicing' ),
-		'GB' => __( 'Grand Bassa', 'invoicing' ),
-		'GC' => __( 'Grand Cape Mount', 'invoicing' ),
-		'GG' => __( 'Grand Gedeh', 'invoicing' ),
-		'GK' => __( 'Grand Kru', 'invoicing' ),
-		'LO' => __( 'Lofa', 'invoicing' ),
-		'MA' => __( 'Margibi', 'invoicing' ),
-		'MY' => __( 'Maryland', 'invoicing' ),
-		'MO' => __( 'Montserrado', 'invoicing' ),
-		'NM' => __( 'Nimba', 'invoicing' ),
-		'RV' => __( 'Rivercess', 'invoicing' ),
-		'RG' => __( 'River Gee', 'invoicing' ),
-		'SN' => __( 'Sinoe', 'invoicing' ),
+		'BM' => __('Bomi', 'invoicing'),
+		'BN' => __('Bong', 'invoicing'),
+		'GA' => __('Gbarpolu', 'invoicing'),
+		'GB' => __('Grand Bassa', 'invoicing'),
+		'GC' => __('Grand Cape Mount', 'invoicing'),
+		'GG' => __('Grand Gedeh', 'invoicing'),
+		'GK' => __('Grand Kru', 'invoicing'),
+		'LO' => __('Lofa', 'invoicing'),
+		'MA' => __('Margibi', 'invoicing'),
+		'MY' => __('Maryland', 'invoicing'),
+		'MO' => __('Montserrado', 'invoicing'),
+		'NM' => __('Nimba', 'invoicing'),
+		'RV' => __('Rivercess', 'invoicing'),
+		'RG' => __('River Gee', 'invoicing'),
+		'SN' => __('Sinoe', 'invoicing'),
 	),
 	'LU' => array(),
 	'MD' => array( // Moldova states.
-		'C'  => __( 'Chișinău', 'invoicing' ),
-		'BL' => __( 'Bălți', 'invoicing' ),
-		'AN' => __( 'Anenii Noi', 'invoicing' ),
-		'BS' => __( 'Basarabeasca', 'invoicing' ),
-		'BR' => __( 'Briceni', 'invoicing' ),
-		'CH' => __( 'Cahul', 'invoicing' ),
-		'CT' => __( 'Cantemir', 'invoicing' ),
-		'CL' => __( 'Călărași', 'invoicing' ),
-		'CS' => __( 'Căușeni', 'invoicing' ),
-		'CM' => __( 'Cimișlia', 'invoicing' ),
-		'CR' => __( 'Criuleni', 'invoicing' ),
-		'DN' => __( 'Dondușeni', 'invoicing' ),
-		'DR' => __( 'Drochia', 'invoicing' ),
-		'DB' => __( 'Dubăsari', 'invoicing' ),
-		'ED' => __( 'Edineț', 'invoicing' ),
-		'FL' => __( 'Fălești', 'invoicing' ),
-		'FR' => __( 'Florești', 'invoicing' ),
-		'GE' => __( 'UTA Găgăuzia', 'invoicing' ),
-		'GL' => __( 'Glodeni', 'invoicing' ),
-		'HN' => __( 'Hîncești', 'invoicing' ),
-		'IL' => __( 'Ialoveni', 'invoicing' ),
-		'LV' => __( 'Leova', 'invoicing' ),
-		'NS' => __( 'Nisporeni', 'invoicing' ),
-		'OC' => __( 'Ocnița', 'invoicing' ),
-		'OR' => __( 'Orhei', 'invoicing' ),
-		'RZ' => __( 'Rezina', 'invoicing' ),
-		'RS' => __( 'Rîșcani', 'invoicing' ),
-		'SG' => __( 'Sîngerei', 'invoicing' ),
-		'SR' => __( 'Soroca', 'invoicing' ),
-		'ST' => __( 'Strășeni', 'invoicing' ),
-		'SD' => __( 'Șoldănești', 'invoicing' ),
-		'SV' => __( 'Ștefan Vodă', 'invoicing' ),
-		'TR' => __( 'Taraclia', 'invoicing' ),
-		'TL' => __( 'Telenești', 'invoicing' ),
-		'UN' => __( 'Ungheni', 'invoicing' ),
+		'C'  => __('Chișinău', 'invoicing'),
+		'BL' => __('Bălți', 'invoicing'),
+		'AN' => __('Anenii Noi', 'invoicing'),
+		'BS' => __('Basarabeasca', 'invoicing'),
+		'BR' => __('Briceni', 'invoicing'),
+		'CH' => __('Cahul', 'invoicing'),
+		'CT' => __('Cantemir', 'invoicing'),
+		'CL' => __('Călărași', 'invoicing'),
+		'CS' => __('Căușeni', 'invoicing'),
+		'CM' => __('Cimișlia', 'invoicing'),
+		'CR' => __('Criuleni', 'invoicing'),
+		'DN' => __('Dondușeni', 'invoicing'),
+		'DR' => __('Drochia', 'invoicing'),
+		'DB' => __('Dubăsari', 'invoicing'),
+		'ED' => __('Edineț', 'invoicing'),
+		'FL' => __('Fălești', 'invoicing'),
+		'FR' => __('Florești', 'invoicing'),
+		'GE' => __('UTA Găgăuzia', 'invoicing'),
+		'GL' => __('Glodeni', 'invoicing'),
+		'HN' => __('Hîncești', 'invoicing'),
+		'IL' => __('Ialoveni', 'invoicing'),
+		'LV' => __('Leova', 'invoicing'),
+		'NS' => __('Nisporeni', 'invoicing'),
+		'OC' => __('Ocnița', 'invoicing'),
+		'OR' => __('Orhei', 'invoicing'),
+		'RZ' => __('Rezina', 'invoicing'),
+		'RS' => __('Rîșcani', 'invoicing'),
+		'SG' => __('Sîngerei', 'invoicing'),
+		'SR' => __('Soroca', 'invoicing'),
+		'ST' => __('Strășeni', 'invoicing'),
+		'SD' => __('Șoldănești', 'invoicing'),
+		'SV' => __('Ștefan Vodă', 'invoicing'),
+		'TR' => __('Taraclia', 'invoicing'),
+		'TL' => __('Telenești', 'invoicing'),
+		'UN' => __('Ungheni', 'invoicing'),
 	),
 	'MQ' => array(),
 	'MT' => array(),
 	'MX' => array( // Mexico States.
-		'DF' => __( 'Ciudad de México', 'invoicing' ),
-		'JA' => __( 'Jalisco', 'invoicing' ),
-		'NL' => __( 'Nuevo León', 'invoicing' ),
-		'AG' => __( 'Aguascalientes', 'invoicing' ),
-		'BC' => __( 'Baja California', 'invoicing' ),
-		'BS' => __( 'Baja California Sur', 'invoicing' ),
-		'CM' => __( 'Campeche', 'invoicing' ),
-		'CS' => __( 'Chiapas', 'invoicing' ),
-		'CH' => __( 'Chihuahua', 'invoicing' ),
-		'CO' => __( 'Coahuila', 'invoicing' ),
-		'CL' => __( 'Colima', 'invoicing' ),
-		'DG' => __( 'Durango', 'invoicing' ),
-		'GT' => __( 'Guanajuato', 'invoicing' ),
-		'GR' => __( 'Guerrero', 'invoicing' ),
-		'HG' => __( 'Hidalgo', 'invoicing' ),
-		'MX' => __( 'Estado de México', 'invoicing' ),
-		'MI' => __( 'Michoacán', 'invoicing' ),
-		'MO' => __( 'Morelos', 'invoicing' ),
-		'NA' => __( 'Nayarit', 'invoicing' ),
-		'OA' => __( 'Oaxaca', 'invoicing' ),
-		'PU' => __( 'Puebla', 'invoicing' ),
-		'QT' => __( 'Querétaro', 'invoicing' ),
-		'QR' => __( 'Quintana Roo', 'invoicing' ),
-		'SL' => __( 'San Luis Potosí', 'invoicing' ),
-		'SI' => __( 'Sinaloa', 'invoicing' ),
-		'SO' => __( 'Sonora', 'invoicing' ),
-		'TB' => __( 'Tabasco', 'invoicing' ),
-		'TM' => __( 'Tamaulipas', 'invoicing' ),
-		'TL' => __( 'Tlaxcala', 'invoicing' ),
-		'VE' => __( 'Veracruz', 'invoicing' ),
-		'YU' => __( 'Yucatán', 'invoicing' ),
-		'ZA' => __( 'Zacatecas', 'invoicing' ),
+		'DF' => __('Ciudad de México', 'invoicing'),
+		'JA' => __('Jalisco', 'invoicing'),
+		'NL' => __('Nuevo León', 'invoicing'),
+		'AG' => __('Aguascalientes', 'invoicing'),
+		'BC' => __('Baja California', 'invoicing'),
+		'BS' => __('Baja California Sur', 'invoicing'),
+		'CM' => __('Campeche', 'invoicing'),
+		'CS' => __('Chiapas', 'invoicing'),
+		'CH' => __('Chihuahua', 'invoicing'),
+		'CO' => __('Coahuila', 'invoicing'),
+		'CL' => __('Colima', 'invoicing'),
+		'DG' => __('Durango', 'invoicing'),
+		'GT' => __('Guanajuato', 'invoicing'),
+		'GR' => __('Guerrero', 'invoicing'),
+		'HG' => __('Hidalgo', 'invoicing'),
+		'MX' => __('Estado de México', 'invoicing'),
+		'MI' => __('Michoacán', 'invoicing'),
+		'MO' => __('Morelos', 'invoicing'),
+		'NA' => __('Nayarit', 'invoicing'),
+		'OA' => __('Oaxaca', 'invoicing'),
+		'PU' => __('Puebla', 'invoicing'),
+		'QT' => __('Querétaro', 'invoicing'),
+		'QR' => __('Quintana Roo', 'invoicing'),
+		'SL' => __('San Luis Potosí', 'invoicing'),
+		'SI' => __('Sinaloa', 'invoicing'),
+		'SO' => __('Sonora', 'invoicing'),
+		'TB' => __('Tabasco', 'invoicing'),
+		'TM' => __('Tamaulipas', 'invoicing'),
+		'TL' => __('Tlaxcala', 'invoicing'),
+		'VE' => __('Veracruz', 'invoicing'),
+		'YU' => __('Yucatán', 'invoicing'),
+		'ZA' => __('Zacatecas', 'invoicing'),
 	),
 	'MY' => array( // Malaysian states.
-		'JHR' => __( 'Johor', 'invoicing' ),
-		'KDH' => __( 'Kedah', 'invoicing' ),
-		'KTN' => __( 'Kelantan', 'invoicing' ),
-		'LBN' => __( 'Labuan', 'invoicing' ),
-		'MLK' => __( 'Malacca (Melaka)', 'invoicing' ),
-		'NSN' => __( 'Negeri Sembilan', 'invoicing' ),
-		'PHG' => __( 'Pahang', 'invoicing' ),
-		'PNG' => __( 'Penang (Pulau Pinang)', 'invoicing' ),
-		'PRK' => __( 'Perak', 'invoicing' ),
-		'PLS' => __( 'Perlis', 'invoicing' ),
-		'SBH' => __( 'Sabah', 'invoicing' ),
-		'SWK' => __( 'Sarawak', 'invoicing' ),
-		'SGR' => __( 'Selangor', 'invoicing' ),
-		'TRG' => __( 'Terengganu', 'invoicing' ),
-		'PJY' => __( 'Putrajaya', 'invoicing' ),
-		'KUL' => __( 'Kuala Lumpur', 'invoicing' ),
+		'JHR' => __('Johor', 'invoicing'),
+		'KDH' => __('Kedah', 'invoicing'),
+		'KTN' => __('Kelantan', 'invoicing'),
+		'LBN' => __('Labuan', 'invoicing'),
+		'MLK' => __('Malacca (Melaka)', 'invoicing'),
+		'NSN' => __('Negeri Sembilan', 'invoicing'),
+		'PHG' => __('Pahang', 'invoicing'),
+		'PNG' => __('Penang (Pulau Pinang)', 'invoicing'),
+		'PRK' => __('Perak', 'invoicing'),
+		'PLS' => __('Perlis', 'invoicing'),
+		'SBH' => __('Sabah', 'invoicing'),
+		'SWK' => __('Sarawak', 'invoicing'),
+		'SGR' => __('Selangor', 'invoicing'),
+		'TRG' => __('Terengganu', 'invoicing'),
+		'PJY' => __('Putrajaya', 'invoicing'),
+		'KUL' => __('Kuala Lumpur', 'invoicing'),
 	),
 	'NG' => array( // Nigerian provinces.
-		'AB' => __( 'Abia', 'invoicing' ),
-		'FC' => __( 'Abuja', 'invoicing' ),
-		'AD' => __( 'Adamawa', 'invoicing' ),
-		'AK' => __( 'Akwa Ibom', 'invoicing' ),
-		'AN' => __( 'Anambra', 'invoicing' ),
-		'BA' => __( 'Bauchi', 'invoicing' ),
-		'BY' => __( 'Bayelsa', 'invoicing' ),
-		'BE' => __( 'Benue', 'invoicing' ),
-		'BO' => __( 'Borno', 'invoicing' ),
-		'CR' => __( 'Cross River', 'invoicing' ),
-		'DE' => __( 'Delta', 'invoicing' ),
-		'EB' => __( 'Ebonyi', 'invoicing' ),
-		'ED' => __( 'Edo', 'invoicing' ),
-		'EK' => __( 'Ekiti', 'invoicing' ),
-		'EN' => __( 'Enugu', 'invoicing' ),
-		'GO' => __( 'Gombe', 'invoicing' ),
-		'IM' => __( 'Imo', 'invoicing' ),
-		'JI' => __( 'Jigawa', 'invoicing' ),
-		'KD' => __( 'Kaduna', 'invoicing' ),
-		'KN' => __( 'Kano', 'invoicing' ),
-		'KT' => __( 'Katsina', 'invoicing' ),
-		'KE' => __( 'Kebbi', 'invoicing' ),
-		'KO' => __( 'Kogi', 'invoicing' ),
-		'KW' => __( 'Kwara', 'invoicing' ),
-		'LA' => __( 'Lagos', 'invoicing' ),
-		'NA' => __( 'Nasarawa', 'invoicing' ),
-		'NI' => __( 'Niger', 'invoicing' ),
-		'OG' => __( 'Ogun', 'invoicing' ),
-		'ON' => __( 'Ondo', 'invoicing' ),
-		'OS' => __( 'Osun', 'invoicing' ),
-		'OY' => __( 'Oyo', 'invoicing' ),
-		'PL' => __( 'Plateau', 'invoicing' ),
-		'RI' => __( 'Rivers', 'invoicing' ),
-		'SO' => __( 'Sokoto', 'invoicing' ),
-		'TA' => __( 'Taraba', 'invoicing' ),
-		'YO' => __( 'Yobe', 'invoicing' ),
-		'ZA' => __( 'Zamfara', 'invoicing' ),
+		'AB' => __('Abia', 'invoicing'),
+		'FC' => __('Abuja', 'invoicing'),
+		'AD' => __('Adamawa', 'invoicing'),
+		'AK' => __('Akwa Ibom', 'invoicing'),
+		'AN' => __('Anambra', 'invoicing'),
+		'BA' => __('Bauchi', 'invoicing'),
+		'BY' => __('Bayelsa', 'invoicing'),
+		'BE' => __('Benue', 'invoicing'),
+		'BO' => __('Borno', 'invoicing'),
+		'CR' => __('Cross River', 'invoicing'),
+		'DE' => __('Delta', 'invoicing'),
+		'EB' => __('Ebonyi', 'invoicing'),
+		'ED' => __('Edo', 'invoicing'),
+		'EK' => __('Ekiti', 'invoicing'),
+		'EN' => __('Enugu', 'invoicing'),
+		'GO' => __('Gombe', 'invoicing'),
+		'IM' => __('Imo', 'invoicing'),
+		'JI' => __('Jigawa', 'invoicing'),
+		'KD' => __('Kaduna', 'invoicing'),
+		'KN' => __('Kano', 'invoicing'),
+		'KT' => __('Katsina', 'invoicing'),
+		'KE' => __('Kebbi', 'invoicing'),
+		'KO' => __('Kogi', 'invoicing'),
+		'KW' => __('Kwara', 'invoicing'),
+		'LA' => __('Lagos', 'invoicing'),
+		'NA' => __('Nasarawa', 'invoicing'),
+		'NI' => __('Niger', 'invoicing'),
+		'OG' => __('Ogun', 'invoicing'),
+		'ON' => __('Ondo', 'invoicing'),
+		'OS' => __('Osun', 'invoicing'),
+		'OY' => __('Oyo', 'invoicing'),
+		'PL' => __('Plateau', 'invoicing'),
+		'RI' => __('Rivers', 'invoicing'),
+		'SO' => __('Sokoto', 'invoicing'),
+		'TA' => __('Taraba', 'invoicing'),
+		'YO' => __('Yobe', 'invoicing'),
+		'ZA' => __('Zamfara', 'invoicing'),
 	),
 	'NL' => array(),
 	'NO' => array(),
 	'NP' => array( // Nepal states (Zones).
-		'BAG' => __( 'Bagmati', 'invoicing' ),
-		'BHE' => __( 'Bheri', 'invoicing' ),
-		'DHA' => __( 'Dhaulagiri', 'invoicing' ),
-		'GAN' => __( 'Gandaki', 'invoicing' ),
-		'JAN' => __( 'Janakpur', 'invoicing' ),
-		'KAR' => __( 'Karnali', 'invoicing' ),
-		'KOS' => __( 'Koshi', 'invoicing' ),
-		'LUM' => __( 'Lumbini', 'invoicing' ),
-		'MAH' => __( 'Mahakali', 'invoicing' ),
-		'MEC' => __( 'Mechi', 'invoicing' ),
-		'NAR' => __( 'Narayani', 'invoicing' ),
-		'RAP' => __( 'Rapti', 'invoicing' ),
-		'SAG' => __( 'Sagarmatha', 'invoicing' ),
-		'SET' => __( 'Seti', 'invoicing' ),
+		'BAG' => __('Bagmati', 'invoicing'),
+		'BHE' => __('Bheri', 'invoicing'),
+		'DHA' => __('Dhaulagiri', 'invoicing'),
+		'GAN' => __('Gandaki', 'invoicing'),
+		'JAN' => __('Janakpur', 'invoicing'),
+		'KAR' => __('Karnali', 'invoicing'),
+		'KOS' => __('Koshi', 'invoicing'),
+		'LUM' => __('Lumbini', 'invoicing'),
+		'MAH' => __('Mahakali', 'invoicing'),
+		'MEC' => __('Mechi', 'invoicing'),
+		'NAR' => __('Narayani', 'invoicing'),
+		'RAP' => __('Rapti', 'invoicing'),
+		'SAG' => __('Sagarmatha', 'invoicing'),
+		'SET' => __('Seti', 'invoicing'),
 	),
 	'NZ' => array( // New Zealand States.
-		'NL' => __( 'Northland', 'invoicing' ),
-		'AK' => __( 'Auckland', 'invoicing' ),
-		'WA' => __( 'Waikato', 'invoicing' ),
-		'BP' => __( 'Bay of Plenty', 'invoicing' ),
-		'TK' => __( 'Taranaki', 'invoicing' ),
-		'GI' => __( 'Gisborne', 'invoicing' ),
-		'HB' => __( 'Hawke’s Bay', 'invoicing' ),
-		'MW' => __( 'Manawatu-Wanganui', 'invoicing' ),
-		'WE' => __( 'Wellington', 'invoicing' ),
-		'NS' => __( 'Nelson', 'invoicing' ),
-		'MB' => __( 'Marlborough', 'invoicing' ),
-		'TM' => __( 'Tasman', 'invoicing' ),
-		'WC' => __( 'West Coast', 'invoicing' ),
-		'CT' => __( 'Canterbury', 'invoicing' ),
-		'OT' => __( 'Otago', 'invoicing' ),
-		'SL' => __( 'Southland', 'invoicing' ),
+		'NL' => __('Northland', 'invoicing'),
+		'AK' => __('Auckland', 'invoicing'),
+		'WA' => __('Waikato', 'invoicing'),
+		'BP' => __('Bay of Plenty', 'invoicing'),
+		'TK' => __('Taranaki', 'invoicing'),
+		'GI' => __('Gisborne', 'invoicing'),
+		'HB' => __('Hawke’s Bay', 'invoicing'),
+		'MW' => __('Manawatu-Wanganui', 'invoicing'),
+		'WE' => __('Wellington', 'invoicing'),
+		'NS' => __('Nelson', 'invoicing'),
+		'MB' => __('Marlborough', 'invoicing'),
+		'TM' => __('Tasman', 'invoicing'),
+		'WC' => __('West Coast', 'invoicing'),
+		'CT' => __('Canterbury', 'invoicing'),
+		'OT' => __('Otago', 'invoicing'),
+		'SL' => __('Southland', 'invoicing'),
 	),
 	'PE' => array( // Peru states.
-		'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'),
 	),
 
 	/**
 	 * Philippine Provinces.
 	 */
 	'PH' => array(
-		'ABR' => __( 'Abra', 'invoicing' ),
-		'AGN' => __( 'Agusan del Norte', 'invoicing' ),
-		'AGS' => __( 'Agusan del Sur', 'invoicing' ),
-		'AKL' => __( 'Aklan', 'invoicing' ),
-		'ALB' => __( 'Albay', 'invoicing' ),
-		'ANT' => __( 'Antique', 'invoicing' ),
-		'APA' => __( 'Apayao', 'invoicing' ),
-		'AUR' => __( 'Aurora', 'invoicing' ),
-		'BAS' => __( 'Basilan', 'invoicing' ),
-		'BAN' => __( 'Bataan', 'invoicing' ),
-		'BTN' => __( 'Batanes', 'invoicing' ),
-		'BTG' => __( 'Batangas', 'invoicing' ),
-		'BEN' => __( 'Benguet', 'invoicing' ),
-		'BIL' => __( 'Biliran', 'invoicing' ),
-		'BOH' => __( 'Bohol', 'invoicing' ),
-		'BUK' => __( 'Bukidnon', 'invoicing' ),
-		'BUL' => __( 'Bulacan', 'invoicing' ),
-		'CAG' => __( 'Cagayan', 'invoicing' ),
-		'CAN' => __( 'Camarines Norte', 'invoicing' ),
-		'CAS' => __( 'Camarines Sur', 'invoicing' ),
-		'CAM' => __( 'Camiguin', 'invoicing' ),
-		'CAP' => __( 'Capiz', 'invoicing' ),
-		'CAT' => __( 'Catanduanes', 'invoicing' ),
-		'CAV' => __( 'Cavite', 'invoicing' ),
-		'CEB' => __( 'Cebu', 'invoicing' ),
-		'COM' => __( 'Compostela Valley', 'invoicing' ),
-		'NCO' => __( 'Cotabato', 'invoicing' ),
-		'DAV' => __( 'Davao del Norte', 'invoicing' ),
-		'DAS' => __( 'Davao del Sur', 'invoicing' ),
-		'DAC' => __( 'Davao Occidental', 'invoicing' ),
-		'DAO' => __( 'Davao Oriental', 'invoicing' ),
-		'DIN' => __( 'Dinagat Islands', 'invoicing' ),
-		'EAS' => __( 'Eastern Samar', 'invoicing' ),
-		'GUI' => __( 'Guimaras', 'invoicing' ),
-		'IFU' => __( 'Ifugao', 'invoicing' ),
-		'ILN' => __( 'Ilocos Norte', 'invoicing' ),
-		'ILS' => __( 'Ilocos Sur', 'invoicing' ),
-		'ILI' => __( 'Iloilo', 'invoicing' ),
-		'ISA' => __( 'Isabela', 'invoicing' ),
-		'KAL' => __( 'Kalinga', 'invoicing' ),
-		'LUN' => __( 'La Union', 'invoicing' ),
-		'LAG' => __( 'Laguna', 'invoicing' ),
-		'LAN' => __( 'Lanao del Norte', 'invoicing' ),
-		'LAS' => __( 'Lanao del Sur', 'invoicing' ),
-		'LEY' => __( 'Leyte', 'invoicing' ),
-		'MAG' => __( 'Maguindanao', 'invoicing' ),
-		'MAD' => __( 'Marinduque', 'invoicing' ),
-		'MAS' => __( 'Masbate', 'invoicing' ),
-		'MSC' => __( 'Misamis Occidental', 'invoicing' ),
-		'MSR' => __( 'Misamis Oriental', 'invoicing' ),
-		'MOU' => __( 'Mountain Province', 'invoicing' ),
-		'NEC' => __( 'Negros Occidental', 'invoicing' ),
-		'NER' => __( 'Negros Oriental', 'invoicing' ),
-		'NSA' => __( 'Northern Samar', 'invoicing' ),
-		'NUE' => __( 'Nueva Ecija', 'invoicing' ),
-		'NUV' => __( 'Nueva Vizcaya', 'invoicing' ),
-		'MDC' => __( 'Occidental Mindoro', 'invoicing' ),
-		'MDR' => __( 'Oriental Mindoro', 'invoicing' ),
-		'PLW' => __( 'Palawan', 'invoicing' ),
-		'PAM' => __( 'Pampanga', 'invoicing' ),
-		'PAN' => __( 'Pangasinan', 'invoicing' ),
-		'QUE' => __( 'Quezon', 'invoicing' ),
-		'QUI' => __( 'Quirino', 'invoicing' ),
-		'RIZ' => __( 'Rizal', 'invoicing' ),
-		'ROM' => __( 'Romblon', 'invoicing' ),
-		'WSA' => __( 'Samar', 'invoicing' ),
-		'SAR' => __( 'Sarangani', 'invoicing' ),
-		'SIQ' => __( 'Siquijor', 'invoicing' ),
-		'SOR' => __( 'Sorsogon', 'invoicing' ),
-		'SCO' => __( 'South Cotabato', 'invoicing' ),
-		'SLE' => __( 'Southern Leyte', 'invoicing' ),
-		'SUK' => __( 'Sultan Kudarat', 'invoicing' ),
-		'SLU' => __( 'Sulu', 'invoicing' ),
-		'SUN' => __( 'Surigao del Norte', 'invoicing' ),
-		'SUR' => __( 'Surigao del Sur', 'invoicing' ),
-		'TAR' => __( 'Tarlac', 'invoicing' ),
-		'TAW' => __( 'Tawi-Tawi', 'invoicing' ),
-		'ZMB' => __( 'Zambales', 'invoicing' ),
-		'ZAN' => __( 'Zamboanga del Norte', 'invoicing' ),
-		'ZAS' => __( 'Zamboanga del Sur', 'invoicing' ),
-		'ZSI' => __( 'Zamboanga Sibugay', 'invoicing' ),
-		'00'  => __( 'Metro Manila', 'invoicing' ),
+		'ABR' => __('Abra', 'invoicing'),
+		'AGN' => __('Agusan del Norte', 'invoicing'),
+		'AGS' => __('Agusan del Sur', 'invoicing'),
+		'AKL' => __('Aklan', 'invoicing'),
+		'ALB' => __('Albay', 'invoicing'),
+		'ANT' => __('Antique', 'invoicing'),
+		'APA' => __('Apayao', 'invoicing'),
+		'AUR' => __('Aurora', 'invoicing'),
+		'BAS' => __('Basilan', 'invoicing'),
+		'BAN' => __('Bataan', 'invoicing'),
+		'BTN' => __('Batanes', 'invoicing'),
+		'BTG' => __('Batangas', 'invoicing'),
+		'BEN' => __('Benguet', 'invoicing'),
+		'BIL' => __('Biliran', 'invoicing'),
+		'BOH' => __('Bohol', 'invoicing'),
+		'BUK' => __('Bukidnon', 'invoicing'),
+		'BUL' => __('Bulacan', 'invoicing'),
+		'CAG' => __('Cagayan', 'invoicing'),
+		'CAN' => __('Camarines Norte', 'invoicing'),
+		'CAS' => __('Camarines Sur', 'invoicing'),
+		'CAM' => __('Camiguin', 'invoicing'),
+		'CAP' => __('Capiz', 'invoicing'),
+		'CAT' => __('Catanduanes', 'invoicing'),
+		'CAV' => __('Cavite', 'invoicing'),
+		'CEB' => __('Cebu', 'invoicing'),
+		'COM' => __('Compostela Valley', 'invoicing'),
+		'NCO' => __('Cotabato', 'invoicing'),
+		'DAV' => __('Davao del Norte', 'invoicing'),
+		'DAS' => __('Davao del Sur', 'invoicing'),
+		'DAC' => __('Davao Occidental', 'invoicing'),
+		'DAO' => __('Davao Oriental', 'invoicing'),
+		'DIN' => __('Dinagat Islands', 'invoicing'),
+		'EAS' => __('Eastern Samar', 'invoicing'),
+		'GUI' => __('Guimaras', 'invoicing'),
+		'IFU' => __('Ifugao', 'invoicing'),
+		'ILN' => __('Ilocos Norte', 'invoicing'),
+		'ILS' => __('Ilocos Sur', 'invoicing'),
+		'ILI' => __('Iloilo', 'invoicing'),
+		'ISA' => __('Isabela', 'invoicing'),
+		'KAL' => __('Kalinga', 'invoicing'),
+		'LUN' => __('La Union', 'invoicing'),
+		'LAG' => __('Laguna', 'invoicing'),
+		'LAN' => __('Lanao del Norte', 'invoicing'),
+		'LAS' => __('Lanao del Sur', 'invoicing'),
+		'LEY' => __('Leyte', 'invoicing'),
+		'MAG' => __('Maguindanao', 'invoicing'),
+		'MAD' => __('Marinduque', 'invoicing'),
+		'MAS' => __('Masbate', 'invoicing'),
+		'MSC' => __('Misamis Occidental', 'invoicing'),
+		'MSR' => __('Misamis Oriental', 'invoicing'),
+		'MOU' => __('Mountain Province', 'invoicing'),
+		'NEC' => __('Negros Occidental', 'invoicing'),
+		'NER' => __('Negros Oriental', 'invoicing'),
+		'NSA' => __('Northern Samar', 'invoicing'),
+		'NUE' => __('Nueva Ecija', 'invoicing'),
+		'NUV' => __('Nueva Vizcaya', 'invoicing'),
+		'MDC' => __('Occidental Mindoro', 'invoicing'),
+		'MDR' => __('Oriental Mindoro', 'invoicing'),
+		'PLW' => __('Palawan', 'invoicing'),
+		'PAM' => __('Pampanga', 'invoicing'),
+		'PAN' => __('Pangasinan', 'invoicing'),
+		'QUE' => __('Quezon', 'invoicing'),
+		'QUI' => __('Quirino', 'invoicing'),
+		'RIZ' => __('Rizal', 'invoicing'),
+		'ROM' => __('Romblon', 'invoicing'),
+		'WSA' => __('Samar', 'invoicing'),
+		'SAR' => __('Sarangani', 'invoicing'),
+		'SIQ' => __('Siquijor', 'invoicing'),
+		'SOR' => __('Sorsogon', 'invoicing'),
+		'SCO' => __('South Cotabato', 'invoicing'),
+		'SLE' => __('Southern Leyte', 'invoicing'),
+		'SUK' => __('Sultan Kudarat', 'invoicing'),
+		'SLU' => __('Sulu', 'invoicing'),
+		'SUN' => __('Surigao del Norte', 'invoicing'),
+		'SUR' => __('Surigao del Sur', 'invoicing'),
+		'TAR' => __('Tarlac', 'invoicing'),
+		'TAW' => __('Tawi-Tawi', 'invoicing'),
+		'ZMB' => __('Zambales', 'invoicing'),
+		'ZAN' => __('Zamboanga del Norte', 'invoicing'),
+		'ZAS' => __('Zamboanga del Sur', 'invoicing'),
+		'ZSI' => __('Zamboanga Sibugay', 'invoicing'),
+		'00'  => __('Metro Manila', 'invoicing'),
 	),
 	'PK' => array( // Pakistan's states.
-		'JK' => __( 'Azad Kashmir', 'invoicing' ),
-		'BA' => __( 'Balochistan', 'invoicing' ),
-		'TA' => __( 'FATA', 'invoicing' ),
-		'GB' => __( 'Gilgit Baltistan', 'invoicing' ),
-		'IS' => __( 'Islamabad Capital Territory', 'invoicing' ),
-		'KP' => __( 'Khyber Pakhtunkhwa', 'invoicing' ),
-		'PB' => __( 'Punjab', 'invoicing' ),
-		'SD' => __( 'Sindh', 'invoicing' ),
+		'JK' => __('Azad Kashmir', 'invoicing'),
+		'BA' => __('Balochistan', 'invoicing'),
+		'TA' => __('FATA', 'invoicing'),
+		'GB' => __('Gilgit Baltistan', 'invoicing'),
+		'IS' => __('Islamabad Capital Territory', 'invoicing'),
+		'KP' => __('Khyber Pakhtunkhwa', 'invoicing'),
+		'PB' => __('Punjab', 'invoicing'),
+		'SD' => __('Sindh', 'invoicing'),
 	),
 	'PL' => array(),
 	'PT' => array(),
 	'PY' => array( // Paraguay states.
-		'PY-ASU' => __( 'Asunción', 'invoicing' ),
-		'PY-1'   => __( 'Concepción', 'invoicing' ),
-		'PY-2'   => __( 'San Pedro', 'invoicing' ),
-		'PY-3'   => __( 'Cordillera', 'invoicing' ),
-		'PY-4'   => __( 'Guairá', 'invoicing' ),
-		'PY-5'   => __( 'Caaguazú', 'invoicing' ),
-		'PY-6'   => __( 'Caazapá', 'invoicing' ),
-		'PY-7'   => __( 'Itapúa', 'invoicing' ),
-		'PY-8'   => __( 'Misiones', 'invoicing' ),
-		'PY-9'   => __( 'Paraguarí', 'invoicing' ),
-		'PY-10'  => __( 'Alto Paraná', 'invoicing' ),
-		'PY-11'  => __( 'Central', 'invoicing' ),
-		'PY-12'  => __( 'Ñeembucú', 'invoicing' ),
-		'PY-13'  => __( 'Amambay', 'invoicing' ),
-		'PY-14'  => __( 'Canindeyú', 'invoicing' ),
-		'PY-15'  => __( 'Presidente Hayes', 'invoicing' ),
-		'PY-16'  => __( 'Alto Paraguay', 'invoicing' ),
-		'PY-17'  => __( 'Boquerón', 'invoicing' ),
+		'PY-ASU' => __('Asunción', 'invoicing'),
+		'PY-1'   => __('Concepción', 'invoicing'),
+		'PY-2'   => __('San Pedro', 'invoicing'),
+		'PY-3'   => __('Cordillera', 'invoicing'),
+		'PY-4'   => __('Guairá', 'invoicing'),
+		'PY-5'   => __('Caaguazú', 'invoicing'),
+		'PY-6'   => __('Caazapá', 'invoicing'),
+		'PY-7'   => __('Itapúa', 'invoicing'),
+		'PY-8'   => __('Misiones', 'invoicing'),
+		'PY-9'   => __('Paraguarí', 'invoicing'),
+		'PY-10'  => __('Alto Paraná', 'invoicing'),
+		'PY-11'  => __('Central', 'invoicing'),
+		'PY-12'  => __('Ñeembucú', 'invoicing'),
+		'PY-13'  => __('Amambay', 'invoicing'),
+		'PY-14'  => __('Canindeyú', 'invoicing'),
+		'PY-15'  => __('Presidente Hayes', 'invoicing'),
+		'PY-16'  => __('Alto Paraguay', 'invoicing'),
+		'PY-17'  => __('Boquerón', 'invoicing'),
 	),
 	'RE' => array(),
 	'RO' => array( // Romania states.
-		'AB' => __( 'Alba', 'invoicing' ),
-		'AR' => __( 'Arad', 'invoicing' ),
-		'AG' => __( 'Argeș', 'invoicing' ),
-		'BC' => __( 'Bacău', 'invoicing' ),
-		'BH' => __( 'Bihor', 'invoicing' ),
-		'BN' => __( 'Bistrița-Năsăud', 'invoicing' ),
-		'BT' => __( 'Botoșani', 'invoicing' ),
-		'BR' => __( 'Brăila', 'invoicing' ),
-		'BV' => __( 'Brașov', 'invoicing' ),
-		'B'  => __( 'București', 'invoicing' ),
-		'BZ' => __( 'Buzău', 'invoicing' ),
-		'CL' => __( 'Călărași', 'invoicing' ),
-		'CS' => __( 'Caraș-Severin', 'invoicing' ),
-		'CJ' => __( 'Cluj', 'invoicing' ),
-		'CT' => __( 'Constanța', 'invoicing' ),
-		'CV' => __( 'Covasna', 'invoicing' ),
-		'DB' => __( 'Dâmbovița', 'invoicing' ),
-		'DJ' => __( 'Dolj', 'invoicing' ),
-		'GL' => __( 'Galați', 'invoicing' ),
-		'GR' => __( 'Giurgiu', 'invoicing' ),
-		'GJ' => __( 'Gorj', 'invoicing' ),
-		'HR' => __( 'Harghita', 'invoicing' ),
-		'HD' => __( 'Hunedoara', 'invoicing' ),
-		'IL' => __( 'Ialomița', 'invoicing' ),
-		'IS' => __( 'Iași', 'invoicing' ),
-		'IF' => __( 'Ilfov', 'invoicing' ),
-		'MM' => __( 'Maramureș', 'invoicing' ),
-		'MH' => __( 'Mehedinți', 'invoicing' ),
-		'MS' => __( 'Mureș', 'invoicing' ),
-		'NT' => __( 'Neamț', 'invoicing' ),
-		'OT' => __( 'Olt', 'invoicing' ),
-		'PH' => __( 'Prahova', 'invoicing' ),
-		'SJ' => __( 'Sălaj', 'invoicing' ),
-		'SM' => __( 'Satu Mare', 'invoicing' ),
-		'SB' => __( 'Sibiu', 'invoicing' ),
-		'SV' => __( 'Suceava', 'invoicing' ),
-		'TR' => __( 'Teleorman', 'invoicing' ),
-		'TM' => __( 'Timiș', 'invoicing' ),
-		'TL' => __( 'Tulcea', 'invoicing' ),
-		'VL' => __( 'Vâlcea', 'invoicing' ),
-		'VS' => __( 'Vaslui', 'invoicing' ),
-		'VN' => __( 'Vrancea', 'invoicing' ),
+		'AB' => __('Alba', 'invoicing'),
+		'AR' => __('Arad', 'invoicing'),
+		'AG' => __('Argeș', 'invoicing'),
+		'BC' => __('Bacău', 'invoicing'),
+		'BH' => __('Bihor', 'invoicing'),
+		'BN' => __('Bistrița-Năsăud', 'invoicing'),
+		'BT' => __('Botoșani', 'invoicing'),
+		'BR' => __('Brăila', 'invoicing'),
+		'BV' => __('Brașov', 'invoicing'),
+		'B'  => __('București', 'invoicing'),
+		'BZ' => __('Buzău', 'invoicing'),
+		'CL' => __('Călărași', 'invoicing'),
+		'CS' => __('Caraș-Severin', 'invoicing'),
+		'CJ' => __('Cluj', 'invoicing'),
+		'CT' => __('Constanța', 'invoicing'),
+		'CV' => __('Covasna', 'invoicing'),
+		'DB' => __('Dâmbovița', 'invoicing'),
+		'DJ' => __('Dolj', 'invoicing'),
+		'GL' => __('Galați', 'invoicing'),
+		'GR' => __('Giurgiu', 'invoicing'),
+		'GJ' => __('Gorj', 'invoicing'),
+		'HR' => __('Harghita', 'invoicing'),
+		'HD' => __('Hunedoara', 'invoicing'),
+		'IL' => __('Ialomița', 'invoicing'),
+		'IS' => __('Iași', 'invoicing'),
+		'IF' => __('Ilfov', 'invoicing'),
+		'MM' => __('Maramureș', 'invoicing'),
+		'MH' => __('Mehedinți', 'invoicing'),
+		'MS' => __('Mureș', 'invoicing'),
+		'NT' => __('Neamț', 'invoicing'),
+		'OT' => __('Olt', 'invoicing'),
+		'PH' => __('Prahova', 'invoicing'),
+		'SJ' => __('Sălaj', 'invoicing'),
+		'SM' => __('Satu Mare', 'invoicing'),
+		'SB' => __('Sibiu', 'invoicing'),
+		'SV' => __('Suceava', 'invoicing'),
+		'TR' => __('Teleorman', 'invoicing'),
+		'TM' => __('Timiș', 'invoicing'),
+		'TL' => __('Tulcea', 'invoicing'),
+		'VL' => __('Vâlcea', 'invoicing'),
+		'VS' => __('Vaslui', 'invoicing'),
+		'VN' => __('Vrancea', 'invoicing'),
 	),
 	'RS' => array(),
 	'SG' => array(),
 	'SK' => array(),
 	'SI' => array(),
 	'TH' => array( // Thailand states.
-		'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'),
 	),
 	'TR' => array( // Turkey States.
-		'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ırı', '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ırı', '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'),
 	),
 	'TZ' => array( // Tanzania States.
-		'TZ01' => __( 'Arusha', 'invoicing' ),
-		'TZ02' => __( 'Dar es Salaam', 'invoicing' ),
-		'TZ03' => __( 'Dodoma', 'invoicing' ),
-		'TZ04' => __( 'Iringa', 'invoicing' ),
-		'TZ05' => __( 'Kagera', 'invoicing' ),
-		'TZ06' => __( 'Pemba North', 'invoicing' ),
-		'TZ07' => __( 'Zanzibar North', 'invoicing' ),
-		'TZ08' => __( 'Kigoma', 'invoicing' ),
-		'TZ09' => __( 'Kilimanjaro', 'invoicing' ),
-		'TZ10' => __( 'Pemba South', 'invoicing' ),
-		'TZ11' => __( 'Zanzibar South', 'invoicing' ),
-		'TZ12' => __( 'Lindi', 'invoicing' ),
-		'TZ13' => __( 'Mara', 'invoicing' ),
-		'TZ14' => __( 'Mbeya', 'invoicing' ),
-		'TZ15' => __( 'Zanzibar West', 'invoicing' ),
-		'TZ16' => __( 'Morogoro', 'invoicing' ),
-		'TZ17' => __( 'Mtwara', 'invoicing' ),
-		'TZ18' => __( 'Mwanza', 'invoicing' ),
-		'TZ19' => __( 'Coast', 'invoicing' ),
-		'TZ20' => __( 'Rukwa', 'invoicing' ),
-		'TZ21' => __( 'Ruvuma', 'invoicing' ),
-		'TZ22' => __( 'Shinyanga', 'invoicing' ),
-		'TZ23' => __( 'Singida', 'invoicing' ),
-		'TZ24' => __( 'Tabora', 'invoicing' ),
-		'TZ25' => __( 'Tanga', 'invoicing' ),
-		'TZ26' => __( 'Manyara', 'invoicing' ),
-		'TZ27' => __( 'Geita', 'invoicing' ),
-		'TZ28' => __( 'Katavi', 'invoicing' ),
-		'TZ29' => __( 'Njombe', 'invoicing' ),
-		'TZ30' => __( 'Simiyu', 'invoicing' ),
+		'TZ01' => __('Arusha', 'invoicing'),
+		'TZ02' => __('Dar es Salaam', 'invoicing'),
+		'TZ03' => __('Dodoma', 'invoicing'),
+		'TZ04' => __('Iringa', 'invoicing'),
+		'TZ05' => __('Kagera', 'invoicing'),
+		'TZ06' => __('Pemba North', 'invoicing'),
+		'TZ07' => __('Zanzibar North', 'invoicing'),
+		'TZ08' => __('Kigoma', 'invoicing'),
+		'TZ09' => __('Kilimanjaro', 'invoicing'),
+		'TZ10' => __('Pemba South', 'invoicing'),
+		'TZ11' => __('Zanzibar South', 'invoicing'),
+		'TZ12' => __('Lindi', 'invoicing'),
+		'TZ13' => __('Mara', 'invoicing'),
+		'TZ14' => __('Mbeya', 'invoicing'),
+		'TZ15' => __('Zanzibar West', 'invoicing'),
+		'TZ16' => __('Morogoro', 'invoicing'),
+		'TZ17' => __('Mtwara', 'invoicing'),
+		'TZ18' => __('Mwanza', 'invoicing'),
+		'TZ19' => __('Coast', 'invoicing'),
+		'TZ20' => __('Rukwa', 'invoicing'),
+		'TZ21' => __('Ruvuma', 'invoicing'),
+		'TZ22' => __('Shinyanga', 'invoicing'),
+		'TZ23' => __('Singida', 'invoicing'),
+		'TZ24' => __('Tabora', 'invoicing'),
+		'TZ25' => __('Tanga', 'invoicing'),
+		'TZ26' => __('Manyara', 'invoicing'),
+		'TZ27' => __('Geita', 'invoicing'),
+		'TZ28' => __('Katavi', 'invoicing'),
+		'TZ29' => __('Njombe', 'invoicing'),
+		'TZ30' => __('Simiyu', 'invoicing'),
 	),
 	'LK' => array(),
 	'SE' => array(),
 	'UG' => array( // Uganda districts. Ref: https://en.wikipedia.org/wiki/ISO_3166-2:UG.
-		'UG314' => __( 'Abim', 'invoicing' ),
-		'UG301' => __( 'Adjumani', 'invoicing' ),
-		'UG322' => __( 'Agago', 'invoicing' ),
-		'UG323' => __( 'Alebtong', 'invoicing' ),
-		'UG315' => __( 'Amolatar', 'invoicing' ),
-		'UG324' => __( 'Amudat', 'invoicing' ),
-		'UG216' => __( 'Amuria', 'invoicing' ),
-		'UG316' => __( 'Amuru', 'invoicing' ),
-		'UG302' => __( 'Apac', 'invoicing' ),
-		'UG303' => __( 'Arua', 'invoicing' ),
-		'UG217' => __( 'Budaka', 'invoicing' ),
-		'UG218' => __( 'Bududa', 'invoicing' ),
-		'UG201' => __( 'Bugiri', 'invoicing' ),
-		'UG235' => __( 'Bugweri', 'invoicing' ),
-		'UG420' => __( 'Buhweju', 'invoicing' ),
-		'UG117' => __( 'Buikwe', 'invoicing' ),
-		'UG219' => __( 'Bukedea', 'invoicing' ),
-		'UG118' => __( 'Bukomansimbi', 'invoicing' ),
-		'UG220' => __( 'Bukwa', 'invoicing' ),
-		'UG225' => __( 'Bulambuli', 'invoicing' ),
-		'UG416' => __( 'Buliisa', 'invoicing' ),
-		'UG401' => __( 'Bundibugyo', 'invoicing' ),
-		'UG430' => __( 'Bunyangabu', 'invoicing' ),
-		'UG402' => __( 'Bushenyi', 'invoicing' ),
-		'UG202' => __( 'Busia', 'invoicing' ),
-		'UG221' => __( 'Butaleja', 'invoicing' ),
-		'UG119' => __( 'Butambala', 'invoicing' ),
-		'UG233' => __( 'Butebo', 'invoicing' ),
-		'UG120' => __( 'Buvuma', 'invoicing' ),
-		'UG226' => __( 'Buyende', 'invoicing' ),
-		'UG317' => __( 'Dokolo', 'invoicing' ),
-		'UG121' => __( 'Gomba', 'invoicing' ),
-		'UG304' => __( 'Gulu', 'invoicing' ),
-		'UG403' => __( 'Hoima', 'invoicing' ),
-		'UG417' => __( 'Ibanda', 'invoicing' ),
-		'UG203' => __( 'Iganga', 'invoicing' ),
-		'UG418' => __( 'Isingiro', 'invoicing' ),
-		'UG204' => __( 'Jinja', 'invoicing' ),
-		'UG318' => __( 'Kaabong', 'invoicing' ),
-		'UG404' => __( 'Kabale', 'invoicing' ),
-		'UG405' => __( 'Kabarole', 'invoicing' ),
-		'UG213' => __( 'Kaberamaido', 'invoicing' ),
-		'UG427' => __( 'Kagadi', 'invoicing' ),
-		'UG428' => __( 'Kakumiro', 'invoicing' ),
-		'UG101' => __( 'Kalangala', 'invoicing' ),
-		'UG222' => __( 'Kaliro', 'invoicing' ),
-		'UG122' => __( 'Kalungu', 'invoicing' ),
-		'UG102' => __( 'Kampala', 'invoicing' ),
-		'UG205' => __( 'Kamuli', 'invoicing' ),
-		'UG413' => __( 'Kamwenge', 'invoicing' ),
-		'UG414' => __( 'Kanungu', 'invoicing' ),
-		'UG206' => __( 'Kapchorwa', 'invoicing' ),
-		'UG236' => __( 'Kapelebyong', 'invoicing' ),
-		'UG126' => __( 'Kasanda', 'invoicing' ),
-		'UG406' => __( 'Kasese', 'invoicing' ),
-		'UG207' => __( 'Katakwi', 'invoicing' ),
-		'UG112' => __( 'Kayunga', 'invoicing' ),
-		'UG407' => __( 'Kibaale', 'invoicing' ),
-		'UG103' => __( 'Kiboga', 'invoicing' ),
-		'UG227' => __( 'Kibuku', 'invoicing' ),
-		'UG432' => __( 'Kikuube', 'invoicing' ),
-		'UG419' => __( 'Kiruhura', 'invoicing' ),
-		'UG421' => __( 'Kiryandongo', 'invoicing' ),
-		'UG408' => __( 'Kisoro', 'invoicing' ),
-		'UG305' => __( 'Kitgum', 'invoicing' ),
-		'UG319' => __( 'Koboko', 'invoicing' ),
-		'UG325' => __( 'Kole', 'invoicing' ),
-		'UG306' => __( 'Kotido', 'invoicing' ),
-		'UG208' => __( 'Kumi', 'invoicing' ),
-		'UG333' => __( 'Kwania', 'invoicing' ),
-		'UG228' => __( 'Kween', 'invoicing' ),
-		'UG123' => __( 'Kyankwanzi', 'invoicing' ),
-		'UG422' => __( 'Kyegegwa', 'invoicing' ),
-		'UG415' => __( 'Kyenjojo', 'invoicing' ),
-		'UG125' => __( 'Kyotera', 'invoicing' ),
-		'UG326' => __( 'Lamwo', 'invoicing' ),
-		'UG307' => __( 'Lira', 'invoicing' ),
-		'UG229' => __( 'Luuka', 'invoicing' ),
-		'UG104' => __( 'Luwero', 'invoicing' ),
-		'UG124' => __( 'Lwengo', 'invoicing' ),
-		'UG114' => __( 'Lyantonde', 'invoicing' ),
-		'UG223' => __( 'Manafwa', 'invoicing' ),
-		'UG320' => __( 'Maracha', 'invoicing' ),
-		'UG105' => __( 'Masaka', 'invoicing' ),
-		'UG409' => __( 'Masindi', 'invoicing' ),
-		'UG214' => __( 'Mayuge', 'invoicing' ),
-		'UG209' => __( 'Mbale', 'invoicing' ),
-		'UG410' => __( 'Mbarara', 'invoicing' ),
-		'UG423' => __( 'Mitooma', 'invoicing' ),
-		'UG115' => __( 'Mityana', 'invoicing' ),
-		'UG308' => __( 'Moroto', 'invoicing' ),
-		'UG309' => __( 'Moyo', 'invoicing' ),
-		'UG106' => __( 'Mpigi', 'invoicing' ),
-		'UG107' => __( 'Mubende', 'invoicing' ),
-		'UG108' => __( 'Mukono', 'invoicing' ),
-		'UG334' => __( 'Nabilatuk', 'invoicing' ),
-		'UG311' => __( 'Nakapiripirit', 'invoicing' ),
-		'UG116' => __( 'Nakaseke', 'invoicing' ),
-		'UG109' => __( 'Nakasongola', 'invoicing' ),
-		'UG230' => __( 'Namayingo', 'invoicing' ),
-		'UG234' => __( 'Namisindwa', 'invoicing' ),
-		'UG224' => __( 'Namutumba', 'invoicing' ),
-		'UG327' => __( 'Napak', 'invoicing' ),
-		'UG310' => __( 'Nebbi', 'invoicing' ),
-		'UG231' => __( 'Ngora', 'invoicing' ),
-		'UG424' => __( 'Ntoroko', 'invoicing' ),
-		'UG411' => __( 'Ntungamo', 'invoicing' ),
-		'UG328' => __( 'Nwoya', 'invoicing' ),
-		'UG331' => __( 'Omoro', 'invoicing' ),
-		'UG329' => __( 'Otuke', 'invoicing' ),
-		'UG321' => __( 'Oyam', 'invoicing' ),
-		'UG312' => __( 'Pader', 'invoicing' ),
-		'UG332' => __( 'Pakwach', 'invoicing' ),
-		'UG210' => __( 'Pallisa', 'invoicing' ),
-		'UG110' => __( 'Rakai', 'invoicing' ),
-		'UG429' => __( 'Rubanda', 'invoicing' ),
-		'UG425' => __( 'Rubirizi', 'invoicing' ),
-		'UG431' => __( 'Rukiga', 'invoicing' ),
-		'UG412' => __( 'Rukungiri', 'invoicing' ),
-		'UG111' => __( 'Sembabule', 'invoicing' ),
-		'UG232' => __( 'Serere', 'invoicing' ),
-		'UG426' => __( 'Sheema', 'invoicing' ),
-		'UG215' => __( 'Sironko', 'invoicing' ),
-		'UG211' => __( 'Soroti', 'invoicing' ),
-		'UG212' => __( 'Tororo', 'invoicing' ),
-		'UG113' => __( 'Wakiso', 'invoicing' ),
-		'UG313' => __( 'Yumbe', 'invoicing' ),
-		'UG330' => __( 'Zombo', 'invoicing' ),
+		'UG314' => __('Abim', 'invoicing'),
+		'UG301' => __('Adjumani', 'invoicing'),
+		'UG322' => __('Agago', 'invoicing'),
+		'UG323' => __('Alebtong', 'invoicing'),
+		'UG315' => __('Amolatar', 'invoicing'),
+		'UG324' => __('Amudat', 'invoicing'),
+		'UG216' => __('Amuria', 'invoicing'),
+		'UG316' => __('Amuru', 'invoicing'),
+		'UG302' => __('Apac', 'invoicing'),
+		'UG303' => __('Arua', 'invoicing'),
+		'UG217' => __('Budaka', 'invoicing'),
+		'UG218' => __('Bududa', 'invoicing'),
+		'UG201' => __('Bugiri', 'invoicing'),
+		'UG235' => __('Bugweri', 'invoicing'),
+		'UG420' => __('Buhweju', 'invoicing'),
+		'UG117' => __('Buikwe', 'invoicing'),
+		'UG219' => __('Bukedea', 'invoicing'),
+		'UG118' => __('Bukomansimbi', 'invoicing'),
+		'UG220' => __('Bukwa', 'invoicing'),
+		'UG225' => __('Bulambuli', 'invoicing'),
+		'UG416' => __('Buliisa', 'invoicing'),
+		'UG401' => __('Bundibugyo', 'invoicing'),
+		'UG430' => __('Bunyangabu', 'invoicing'),
+		'UG402' => __('Bushenyi', 'invoicing'),
+		'UG202' => __('Busia', 'invoicing'),
+		'UG221' => __('Butaleja', 'invoicing'),
+		'UG119' => __('Butambala', 'invoicing'),
+		'UG233' => __('Butebo', 'invoicing'),
+		'UG120' => __('Buvuma', 'invoicing'),
+		'UG226' => __('Buyende', 'invoicing'),
+		'UG317' => __('Dokolo', 'invoicing'),
+		'UG121' => __('Gomba', 'invoicing'),
+		'UG304' => __('Gulu', 'invoicing'),
+		'UG403' => __('Hoima', 'invoicing'),
+		'UG417' => __('Ibanda', 'invoicing'),
+		'UG203' => __('Iganga', 'invoicing'),
+		'UG418' => __('Isingiro', 'invoicing'),
+		'UG204' => __('Jinja', 'invoicing'),
+		'UG318' => __('Kaabong', 'invoicing'),
+		'UG404' => __('Kabale', 'invoicing'),
+		'UG405' => __('Kabarole', 'invoicing'),
+		'UG213' => __('Kaberamaido', 'invoicing'),
+		'UG427' => __('Kagadi', 'invoicing'),
+		'UG428' => __('Kakumiro', 'invoicing'),
+		'UG101' => __('Kalangala', 'invoicing'),
+		'UG222' => __('Kaliro', 'invoicing'),
+		'UG122' => __('Kalungu', 'invoicing'),
+		'UG102' => __('Kampala', 'invoicing'),
+		'UG205' => __('Kamuli', 'invoicing'),
+		'UG413' => __('Kamwenge', 'invoicing'),
+		'UG414' => __('Kanungu', 'invoicing'),
+		'UG206' => __('Kapchorwa', 'invoicing'),
+		'UG236' => __('Kapelebyong', 'invoicing'),
+		'UG126' => __('Kasanda', 'invoicing'),
+		'UG406' => __('Kasese', 'invoicing'),
+		'UG207' => __('Katakwi', 'invoicing'),
+		'UG112' => __('Kayunga', 'invoicing'),
+		'UG407' => __('Kibaale', 'invoicing'),
+		'UG103' => __('Kiboga', 'invoicing'),
+		'UG227' => __('Kibuku', 'invoicing'),
+		'UG432' => __('Kikuube', 'invoicing'),
+		'UG419' => __('Kiruhura', 'invoicing'),
+		'UG421' => __('Kiryandongo', 'invoicing'),
+		'UG408' => __('Kisoro', 'invoicing'),
+		'UG305' => __('Kitgum', 'invoicing'),
+		'UG319' => __('Koboko', 'invoicing'),
+		'UG325' => __('Kole', 'invoicing'),
+		'UG306' => __('Kotido', 'invoicing'),
+		'UG208' => __('Kumi', 'invoicing'),
+		'UG333' => __('Kwania', 'invoicing'),
+		'UG228' => __('Kween', 'invoicing'),
+		'UG123' => __('Kyankwanzi', 'invoicing'),
+		'UG422' => __('Kyegegwa', 'invoicing'),
+		'UG415' => __('Kyenjojo', 'invoicing'),
+		'UG125' => __('Kyotera', 'invoicing'),
+		'UG326' => __('Lamwo', 'invoicing'),
+		'UG307' => __('Lira', 'invoicing'),
+		'UG229' => __('Luuka', 'invoicing'),
+		'UG104' => __('Luwero', 'invoicing'),
+		'UG124' => __('Lwengo', 'invoicing'),
+		'UG114' => __('Lyantonde', 'invoicing'),
+		'UG223' => __('Manafwa', 'invoicing'),
+		'UG320' => __('Maracha', 'invoicing'),
+		'UG105' => __('Masaka', 'invoicing'),
+		'UG409' => __('Masindi', 'invoicing'),
+		'UG214' => __('Mayuge', 'invoicing'),
+		'UG209' => __('Mbale', 'invoicing'),
+		'UG410' => __('Mbarara', 'invoicing'),
+		'UG423' => __('Mitooma', 'invoicing'),
+		'UG115' => __('Mityana', 'invoicing'),
+		'UG308' => __('Moroto', 'invoicing'),
+		'UG309' => __('Moyo', 'invoicing'),
+		'UG106' => __('Mpigi', 'invoicing'),
+		'UG107' => __('Mubende', 'invoicing'),
+		'UG108' => __('Mukono', 'invoicing'),
+		'UG334' => __('Nabilatuk', 'invoicing'),
+		'UG311' => __('Nakapiripirit', 'invoicing'),
+		'UG116' => __('Nakaseke', 'invoicing'),
+		'UG109' => __('Nakasongola', 'invoicing'),
+		'UG230' => __('Namayingo', 'invoicing'),
+		'UG234' => __('Namisindwa', 'invoicing'),
+		'UG224' => __('Namutumba', 'invoicing'),
+		'UG327' => __('Napak', 'invoicing'),
+		'UG310' => __('Nebbi', 'invoicing'),
+		'UG231' => __('Ngora', 'invoicing'),
+		'UG424' => __('Ntoroko', 'invoicing'),
+		'UG411' => __('Ntungamo', 'invoicing'),
+		'UG328' => __('Nwoya', 'invoicing'),
+		'UG331' => __('Omoro', 'invoicing'),
+		'UG329' => __('Otuke', 'invoicing'),
+		'UG321' => __('Oyam', 'invoicing'),
+		'UG312' => __('Pader', 'invoicing'),
+		'UG332' => __('Pakwach', 'invoicing'),
+		'UG210' => __('Pallisa', 'invoicing'),
+		'UG110' => __('Rakai', 'invoicing'),
+		'UG429' => __('Rubanda', 'invoicing'),
+		'UG425' => __('Rubirizi', 'invoicing'),
+		'UG431' => __('Rukiga', 'invoicing'),
+		'UG412' => __('Rukungiri', 'invoicing'),
+		'UG111' => __('Sembabule', 'invoicing'),
+		'UG232' => __('Serere', 'invoicing'),
+		'UG426' => __('Sheema', 'invoicing'),
+		'UG215' => __('Sironko', 'invoicing'),
+		'UG211' => __('Soroti', 'invoicing'),
+		'UG212' => __('Tororo', 'invoicing'),
+		'UG113' => __('Wakiso', 'invoicing'),
+		'UG313' => __('Yumbe', 'invoicing'),
+		'UG330' => __('Zombo', 'invoicing'),
 	),
 	'UM' => array(
-		'81' => __( 'Baker Island', 'invoicing' ),
-		'84' => __( 'Howland Island', 'invoicing' ),
-		'86' => __( 'Jarvis Island', 'invoicing' ),
-		'67' => __( 'Johnston Atoll', 'invoicing' ),
-		'89' => __( 'Kingman Reef', 'invoicing' ),
-		'71' => __( 'Midway Atoll', 'invoicing' ),
-		'76' => __( 'Navassa Island', 'invoicing' ),
-		'95' => __( 'Palmyra Atoll', 'invoicing' ),
-		'79' => __( 'Wake Island', 'invoicing' ),
+		'81' => __('Baker Island', 'invoicing'),
+		'84' => __('Howland Island', 'invoicing'),
+		'86' => __('Jarvis Island', 'invoicing'),
+		'67' => __('Johnston Atoll', 'invoicing'),
+		'89' => __('Kingman Reef', 'invoicing'),
+		'71' => __('Midway Atoll', 'invoicing'),
+		'76' => __('Navassa Island', 'invoicing'),
+		'95' => __('Palmyra Atoll', 'invoicing'),
+		'79' => __('Wake Island', 'invoicing'),
 	),
 	'US' => array( // United States.
-		'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' => _x( 'Georgia', 'US state of 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' ),
-		'AA' => __( 'Armed Forces (AA)', 'invoicing' ),
-		'AE' => __( 'Armed Forces (AE)', 'invoicing' ),
-		'AP' => __( 'Armed Forces (AP)', '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' => _x('Georgia', 'US state of 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'),
+		'AA' => __('Armed Forces (AA)', 'invoicing'),
+		'AE' => __('Armed Forces (AE)', 'invoicing'),
+		'AP' => __('Armed Forces (AP)', 'invoicing'),
 	),
 	'VN' => array(),
 	'YT' => array(),
 	'ZA' => array( // South African states.
-		'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'),
 	),
 	'ZM' => array( // Zambia's Provinces. Ref: https://en.wikipedia.org/wiki/ISO_3166-2:ZM.
-		'ZM-01' => __( 'Western', 'invoicing' ),
-		'ZM-02' => __( 'Central', 'invoicing' ),
-		'ZM-03' => __( 'Eastern', 'invoicing' ),
-		'ZM-04' => __( 'Luapula', 'invoicing' ),
-		'ZM-05' => __( 'Northern', 'invoicing' ),
-		'ZM-06' => __( 'North-Western', 'invoicing' ),
-		'ZM-07' => __( 'Southern', 'invoicing' ),
-		'ZM-08' => __( 'Copperbelt', 'invoicing' ),
-		'ZM-09' => __( 'Lusaka', 'invoicing' ),
-		'ZM-10' => __( 'Muchinga', 'invoicing' ),
+		'ZM-01' => __('Western', 'invoicing'),
+		'ZM-02' => __('Central', 'invoicing'),
+		'ZM-03' => __('Eastern', 'invoicing'),
+		'ZM-04' => __('Luapula', 'invoicing'),
+		'ZM-05' => __('Northern', 'invoicing'),
+		'ZM-06' => __('North-Western', 'invoicing'),
+		'ZM-07' => __('Southern', 'invoicing'),
+		'ZM-08' => __('Copperbelt', 'invoicing'),
+		'ZM-09' => __('Lusaka', 'invoicing'),
+		'ZM-10' => __('Muchinga', 'invoicing'),
 	),
 );

includes/data/phone-codes.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @package Invoicing/data
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 	'BD' => '+880',