AyeCode / invoicing

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetDPM.php

Spacing +13 added lines, -13 removed lines

@@ -57,7 +57,7 @@ 
                 else
                 {
                     // Redirect to error page.
-                    $redirect_url = $url . '?response_code='.$response->response_code . '&response_reason_text=' . $response->response_reason_text;
+                    $redirect_url = $url . '?response_code=' . $response->response_code . '&response_reason_text=' . $response->response_reason_text;
                 }
                 // Send the Javascript back to AuthorizeNet, which will redirect user back to your site.
                 echo AuthorizeNetDPM::getRelayResponseSnippet($redirect_url);
@@ -179,54 +179,54 @@ 
             -moz-box-shadow: inset 3px -3px 3px rgba(0,0,0,.5), inset 0 3px 3px rgba(255,255,255,.5), inset -3px 0 3px rgba(255,255,255,.75);
             box-shadow: inset 3px -3px 3px rgba(0,0,0,.5), inset 0 3px 3px rgba(255,255,255,.5), inset -3px 0 3px rgba(255,255,255,.75); }
         </style>
-        <form method="post" action="'.$post_url.'">
-                '.$hidden_fields.'
+        <form method="post" action="'.$post_url . '">
+                '.$hidden_fields . '
             <fieldset>
                 <div>
                     <label>Credit Card Number</label>
-                    <input type="text" class="text" size="15" name="x_card_num" value="'.($prefill ? '6011000000000012' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_card_num" value="'.($prefill ? '6011000000000012' : '') . '"></input>
                 </div>
                 <div>
                     <label>Exp.</label>
-                    <input type="text" class="text" size="4" name="x_exp_date" value="'.($prefill ? '04/17' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_exp_date" value="'.($prefill ? '04/17' : '') . '"></input>
                 </div>
                 <div>
                     <label>CCV</label>
-                    <input type="text" class="text" size="4" name="x_card_code" value="'.($prefill ? '782' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_card_code" value="'.($prefill ? '782' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>First Name</label>
-                    <input type="text" class="text" size="15" name="x_first_name" value="'.($prefill ? 'John' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_first_name" value="'.($prefill ? 'John' : '') . '"></input>
                 </div>
                 <div>
                     <label>Last Name</label>
-                    <input type="text" class="text" size="14" name="x_last_name" value="'.($prefill ? 'Doe' : '').'"></input>
+                    <input type="text" class="text" size="14" name="x_last_name" value="'.($prefill ? 'Doe' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>Address</label>
-                    <input type="text" class="text" size="26" name="x_address" value="'.($prefill ? '123 Main Street' : '').'"></input>
+                    <input type="text" class="text" size="26" name="x_address" value="'.($prefill ? '123 Main Street' : '') . '"></input>
                 </div>
                 <div>
                     <label>City</label>
-                    <input type="text" class="text" size="15" name="x_city" value="'.($prefill ? 'Boston' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_city" value="'.($prefill ? 'Boston' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>State</label>
-                    <input type="text" class="text" size="4" name="x_state" value="'.($prefill ? 'MA' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_state" value="'.($prefill ? 'MA' : '') . '"></input>
                 </div>
                 <div>
                     <label>Zip Code</label>
-                    <input type="text" class="text" size="9" name="x_zip" value="'.($prefill ? '02142' : '').'"></input>
+                    <input type="text" class="text" size="9" name="x_zip" value="'.($prefill ? '02142' : '') . '"></input>
                 </div>
                 <div>
                     <label>Country</label>
-                    <input type="text" class="text" size="22" name="x_country" value="'.($prefill ? 'US' : '').'"></input>
+                    <input type="text" class="text" size="22" name="x_country" value="'.($prefill ? 'US' : '') . '"></input>
                 </div>
             </fieldset>
             <input type="submit" value="BUY" class="submit buy">

includes/gateways/manual.php

Spacing +13 added lines, -13 removed lines

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

includes/gateways/bank_transfer.php

Spacing +27 added lines, -27 removed lines

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

includes/wpinv-address-functions.php

Spacing +979 added lines, -979 removed lines

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

invoicing.php

Spacing +11 added lines, -11 removed lines

@@ -11,19 +11,19 @@ 
 */
 
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-if ( !defined( 'WPINV_VERSION' ) ) {
-    define( 'WPINV_VERSION', '0.0.4' );
+if (!defined('WPINV_VERSION')) {
+    define('WPINV_VERSION', '0.0.4');
 }
 
-if ( !defined( 'WPINV_PLUGIN_FILE' ) ) {
-    define( 'WPINV_PLUGIN_FILE', __FILE__ );
+if (!defined('WPINV_PLUGIN_FILE')) {
+    define('WPINV_PLUGIN_FILE', __FILE__);
 }
 
-require plugin_dir_path( __FILE__ ) . 'includes/class-wpinv.php';
+require plugin_dir_path(__FILE__) . 'includes/class-wpinv.php';
 
 function wpinv_run() {
     global $invoicing;
@@ -40,16 +40,16 @@ 
 /**
  * Show update plugin admin notification.
  */
-if(is_admin()){
+if (is_admin()) {
     if (!function_exists('ayecode_show_update_plugin_requirement')) {//only load the update file if needed
         function ayecode_show_update_plugin_requirement() {
-            if ( !defined( 'WP_EASY_UPDATES_ACTIVE' ) ) {
+            if (!defined('WP_EASY_UPDATES_ACTIVE')) {
                 ?>
                 <div class="notice notice-warning is-dismissible">
                     <p>
                         <strong>
                             <?php
-                            echo sprintf( __( 'The plugin %sWP Easy Updates%s is required to check for and update some installed plugins, please install it now.', 'geodirectory' ), '<a href="https://wpeasyupdates.com/" target="_blank" title="WP Easy Updates">', '</a>' );
+                            echo sprintf(__('The plugin %sWP Easy Updates%s is required to check for and update some installed plugins, please install it now.', 'geodirectory'), '<a href="https://wpeasyupdates.com/" target="_blank" title="WP Easy Updates">', '</a>');
                             ?>
                         </strong>
                     </p>
@@ -58,6 +58,6 @@ 
             }
         }
 
-        add_action( 'admin_notices', 'ayecode_show_update_plugin_requirement' );
+        add_action('admin_notices', 'ayecode_show_update_plugin_requirement');
     }
 }

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

Spacing +709 added lines, -709 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,132 +17,132 @@ 
     }
     
     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() {
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $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['checkoutNonce'] = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $vars['checkoutNonce'] = wp_create_nonce('wpinv_checkout_nonce');
         $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::enqueue_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;
@@ -151,52 +151,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' ) ) ),
+            'options'     => array_merge($vat_classes, array('_new' => __('Add New Rate Class', 'invoicing'))),
             'chosen'      => true,
-            'placeholder' => __( 'Select a VAT Rate', 'invoicing' ),
+            'placeholder' => __('Select a VAT Rate', 'invoicing'),
             'selected'    => $vat_class,
             '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',
             );
@@ -208,7 +208,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',
             );
         }
@@ -216,12 +216,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'
@@ -229,22 +229,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'
@@ -252,8 +252,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'
             );
@@ -269,8 +269,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'
             );
 
@@ -278,21 +278,21 @@ 
 
             $vat_settings['vat_same_country_rule'] = array(
                 'id'          => 'vat_same_country_rule',
-                'name'        => __( 'Same country rule', 'invoicing' ),
-                'desc'        => __( 'Select how you want 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 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 a option', 'invoicing' ),
+                'placeholder' => __('Select a option', 'invoicing'),
                 'std'         => ''
             );
 
             $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'
@@ -300,14 +300,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 lookup', 'invoicing' ),
+                'name' => __('IP Country lookup', 'invoicing'),
                 'type' => 'vat_ip_lookup',
                 'size' => 'regular',
                 'std' => 'default'
@@ -315,21 +315,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'
@@ -337,37 +337,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' => __( 'This will disable basic JS correct format validation attempts, it is very rare this should need to be disabled.', 'invoicing' ),
+                'name' => __('Disable basic checks', 'invoicing'),
+                'desc' => __('This will disable basic JS correct format validation attempts, it is very rare this should need to be disabled.', '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'
             );
@@ -383,11 +383,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',
@@ -398,57 +398,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);
             }
         }
         
@@ -460,11 +460,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',
@@ -473,12 +473,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',
@@ -512,23 +512,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;
         }
         
@@ -538,12 +538,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;
         }
         
@@ -554,10 +554,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;
         }
         
@@ -568,173 +568,173 @@ 
         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' ) && ( $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') && ($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 ) ) {
+                if (!empty($load_xml) && !empty($load_xml->geoplugin_countryCode)) {
                     $wpinv_ip_address_country = (string)$load_xml->geoplugin_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( !current_user_can( 'manage_options' ) ) {
-            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 (!current_user_can('manage_options')) {
+            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;
@@ -744,71 +744,71 @@ 
         $response = array();
         $response['success'] = false;
         
-        if ( !current_user_can( 'manage_options' ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!current_user_can('manage_options')) {
+            $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();
 
-        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 ( !current_user_can( 'manage_options' ) || !isset( $_POST['class'] ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!current_user_can('manage_options') || !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_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() {        
@@ -817,72 +817,72 @@ 
         $response['error']      = null;
         $response['data']       = null;
         
-        if ( !current_user_can( 'manage_options' ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!current_user_can('manage_options')) {
+            $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;
         }
@@ -895,140 +895,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;
                 }
@@ -1038,75 +1038,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;
                     }
                 }
@@ -1118,55 +1118,55 @@ 
         }
     }
     
-    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;
@@ -1174,7 +1174,7 @@ 
                         $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];
@@ -1186,79 +1186,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;
             }
@@ -1269,15 +1269,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'];
         }
         
@@ -1293,106 +1293,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;
                 }
@@ -1404,67 +1404,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);
                     }
                 }
             }
@@ -1473,84 +1473,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);
             }
         }
 
@@ -1560,48 +1560,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 ) {
@@ -1612,36 +1612,36 @@ 
         }
         */
 
-        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 ) {
-        if ( empty( $user_id ) ) {
+    public static function get_user_company($company = '', $user_id = 0) {
+        if (empty($user_id)) {
             $user_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');
             }
         }
 
@@ -1651,113 +1651,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() {
@@ -1766,161 +1766,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->get_total() > 0 && self::requires_vat( 0, false, $is_digital );
+        $requires_vat       = !self::hide_vat_fields() && $invoice->get_total() > 0 && self::requires_vat(0, false, $is_digital);
         $wpi_requires_vat   = $requires_vat;
         
         $company            = is_user_logged_in() ? 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;
         }
 
@@ -1928,52 +1928,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>
@@ -1987,32 +1987,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>

templates/wpinv-invoice-print.php

Spacing +32 added lines, -32 removed lines

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

includes/wpinv-post-types.php

Spacing +96 added lines, -96 removed lines

@@ -7,36 +7,36 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-add_action( 'init', 'wpinv_register_post_types', 1 );
+add_action('init', 'wpinv_register_post_types', 1);
 function wpinv_register_post_types() {    
     $labels = array(
-        'name'               => _x( 'Invoices', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Invoice', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Invoices', 'admin menu', 'invoicing' ),
-        'name_admin_bar'     => _x( 'Invoice', 'add new on admin bar', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'book', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Invoice', 'invoicing' ),
-        'new_item'           => __( 'New Invoice', 'invoicing' ),
-        'edit_item'          => __( 'Edit Invoice', 'invoicing' ),
-        'view_item'          => __( 'View Invoice', 'invoicing' ),
-        'all_items'          => __( 'Invoices', 'invoicing' ),
-        'search_items'       => __( 'Search Invoices', 'invoicing' ),
-        'parent_item_colon'  => __( 'Parent Invoices:', 'invoicing' ),
-        'not_found'          => __( 'No invoices found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No invoices found in trash.', 'invoicing' )
+        'name'               => _x('Invoices', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Invoice', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Invoices', 'admin menu', 'invoicing'),
+        'name_admin_bar'     => _x('Invoice', 'add new on admin bar', 'invoicing'),
+        'add_new'            => _x('Add New', 'book', 'invoicing'),
+        'add_new_item'       => __('Add New Invoice', 'invoicing'),
+        'new_item'           => __('New Invoice', 'invoicing'),
+        'edit_item'          => __('Edit Invoice', 'invoicing'),
+        'view_item'          => __('View Invoice', 'invoicing'),
+        'all_items'          => __('Invoices', 'invoicing'),
+        'search_items'       => __('Search Invoices', 'invoicing'),
+        'parent_item_colon'  => __('Parent Invoices:', 'invoicing'),
+        'not_found'          => __('No invoices found.', 'invoicing'),
+        'not_found_in_trash' => __('No invoices found in trash.', 'invoicing')
     );
-    $labels = apply_filters( 'wpinv_labels', $labels );
+    $labels = apply_filters('wpinv_labels', $labels);
     
     $menu_icon = WPINV_PLUGIN_URL . '/assets/images/favicon.ico';
-    $menu_icon = apply_filters( 'wpinv_menu_icon_invoice', $menu_icon );
+    $menu_icon = apply_filters('wpinv_menu_icon_invoice', $menu_icon);
 
     $args = array(
         'labels'             => $labels,
-        'description'        => __( 'This is where invoices are stored.', 'invoicing' ),
+        'description'        => __('This is where invoices are stored.', 'invoicing'),
         'public'             => true,
         'can_export'         => true,
         '_builtin'           => false,
@@ -50,68 +50,68 @@ 
         'has_archive'        => false,
         'hierarchical'       => false,
         'menu_position'      => null,
-        'supports'           => array( 'title', 'author' ),
+        'supports'           => array('title', 'author'),
         'menu_icon'          => $menu_icon,
     );
             
-    $args = apply_filters( 'wpinv_register_post_type_invoice', $args );
+    $args = apply_filters('wpinv_register_post_type_invoice', $args);
     
-    register_post_type( 'wpi_invoice', $args );
+    register_post_type('wpi_invoice', $args);
     
     $items_labels = array(
-        'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'wpi_item', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-        'new_item'           => __( 'New Item', 'invoicing' ),
-        'edit_item'          => __( 'Edit Item', 'invoicing' ),
-        'view_item'          => __( 'View Item', 'invoicing' ),
-        'all_items'          => __( 'Items', 'invoicing' ),
-        'search_items'       => __( 'Search Items', 'invoicing' ),
+        'name'               => _x('Items', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Item', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Items', 'admin menu', 'invoicing'),
+        'add_new'            => _x('Add New', 'wpi_item', 'invoicing'),
+        'add_new_item'       => __('Add New Item', 'invoicing'),
+        'new_item'           => __('New Item', 'invoicing'),
+        'edit_item'          => __('Edit Item', 'invoicing'),
+        'view_item'          => __('View Item', 'invoicing'),
+        'all_items'          => __('Items', 'invoicing'),
+        'search_items'       => __('Search Items', 'invoicing'),
         'parent_item_colon'  => '',
-        'not_found'          => __( 'No items found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+        'not_found'          => __('No items found.', 'invoicing'),
+        'not_found_in_trash' => __('No items found in trash.', 'invoicing')
     );
-    $items_labels = apply_filters( 'wpinv_items_labels', $items_labels );
+    $items_labels = apply_filters('wpinv_items_labels', $items_labels);
     
     $invoice_item_args = array(
         'labels'                => $items_labels,
         'public'                => false,
         'show_ui'               => true,
         'show_in_menu'          => 'wpinv',
-        'supports'              => array( 'title', 'excerpt' ),
+        'supports'              => array('title', 'excerpt'),
         'register_meta_box_cb'  => 'wpinv_register_item_meta_boxes',
         'rewrite'               => false,
         'query_var'             => false,
         'map_meta_cap'          => true,
         'can_export'            => true,
     );
-    $invoice_item_args = apply_filters( 'wpinv_register_post_type_invoice_item', $invoice_item_args );
+    $invoice_item_args = apply_filters('wpinv_register_post_type_invoice_item', $invoice_item_args);
 
-    register_post_type( 'wpi_item', $invoice_item_args );
+    register_post_type('wpi_item', $invoice_item_args);
     
     $labels = array(
-        'name'               => _x( 'Discounts', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Discount', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Discounts', 'admin menu', 'invoicing' ),
-        'name_admin_bar'     => _x( 'Discount', 'add new on admin bar', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'book', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Discount', 'invoicing' ),
-        'new_item'           => __( 'New Discount', 'invoicing' ),
-        'edit_item'          => __( 'Edit Discount', 'invoicing' ),
-        'view_item'          => __( 'View Discount', 'invoicing' ),
-        'all_items'          => __( 'Discounts', 'invoicing' ),
-        'search_items'       => __( 'Search Discounts', 'invoicing' ),
-        'parent_item_colon'  => __( 'Parent Discounts:', 'invoicing' ),
-        'not_found'          => __( 'No discounts found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No discounts found in trash.', 'invoicing' )
+        'name'               => _x('Discounts', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Discount', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Discounts', 'admin menu', 'invoicing'),
+        'name_admin_bar'     => _x('Discount', 'add new on admin bar', 'invoicing'),
+        'add_new'            => _x('Add New', 'book', 'invoicing'),
+        'add_new_item'       => __('Add New Discount', 'invoicing'),
+        'new_item'           => __('New Discount', 'invoicing'),
+        'edit_item'          => __('Edit Discount', 'invoicing'),
+        'view_item'          => __('View Discount', 'invoicing'),
+        'all_items'          => __('Discounts', 'invoicing'),
+        'search_items'       => __('Search Discounts', 'invoicing'),
+        'parent_item_colon'  => __('Parent Discounts:', 'invoicing'),
+        'not_found'          => __('No discounts found.', 'invoicing'),
+        'not_found_in_trash' => __('No discounts found in trash.', 'invoicing')
     );
-    $labels = apply_filters( 'wpinv_discounts_labels', $labels );
+    $labels = apply_filters('wpinv_discounts_labels', $labels);
     
     $args = array(
         'labels'             => $labels,
-        'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+        'description'        => __('This is where you can add new discounts that users can use in invoices.', 'invoicing'),
         'public'             => false,
         'can_export'         => true,
         '_builtin'           => false,
@@ -125,7 +125,7 @@ 
         'map_meta_cap'       => true,
         'has_archive'        => false,
         'hierarchical'       => false,
-        'supports'           => array( 'title', 'excerpt' ),
+        'supports'           => array('title', 'excerpt'),
         'register_meta_box_cb'  => 'wpinv_register_discount_meta_boxes',
         'show_in_nav_menus'  => false,
         'show_in_admin_bar'  => true,
@@ -133,99 +133,99 @@ 
         'menu_position'      => null,
     );
             
-    $args = apply_filters( 'wpinv_register_post_type_discount', $args );
+    $args = apply_filters('wpinv_register_post_type_discount', $args);
     
-    register_post_type( 'wpi_discount', $args );
+    register_post_type('wpi_discount', $args);
 }
 
 function wpinv_get_default_labels() {
     $defaults = array(
-       'singular' => __( 'Invoice', 'invoicing' ),
-       'plural'   => __( 'Invoices', 'invoicing' )
+       'singular' => __('Invoice', 'invoicing'),
+       'plural'   => __('Invoices', 'invoicing')
     );
     
-    return apply_filters( 'wpinv_default_invoices_name', $defaults );
+    return apply_filters('wpinv_default_invoices_name', $defaults);
 }
 
-function wpinv_get_label_singular( $lowercase = false ) {
+function wpinv_get_label_singular($lowercase = false) {
     $defaults = wpinv_get_default_labels();
     
-    return ($lowercase) ? strtolower( $defaults['singular'] ) : $defaults['singular'];
+    return ($lowercase) ? strtolower($defaults['singular']) : $defaults['singular'];
 }
 
-function wpinv_get_label_plural( $lowercase = false ) {
+function wpinv_get_label_plural($lowercase = false) {
     $defaults = wpinv_get_default_labels();
     
-    return ( $lowercase ) ? strtolower( $defaults['plural'] ) : $defaults['plural'];
+    return ($lowercase) ? strtolower($defaults['plural']) : $defaults['plural'];
 }
 
-function wpinv_change_default_title( $title ) {
-     if ( !is_admin() ) {
+function wpinv_change_default_title($title) {
+     if (!is_admin()) {
         $label = wpinv_get_label_singular();
-        $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
+        $title = sprintf(__('Enter %s name here', 'invoicing'), $label);
         return $title;
      }
 
      $screen = get_current_screen();
 
-     if ( 'wpi_invoice' == $screen->post_type ) {
+     if ('wpi_invoice' == $screen->post_type) {
         $label = wpinv_get_label_singular();
-        $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
+        $title = sprintf(__('Enter %s name here', 'invoicing'), $label);
      }
 
      return $title;
 }
-add_filter( 'enter_title_here', 'wpinv_change_default_title' );
+add_filter('enter_title_here', 'wpinv_change_default_title');
 
 function wpinv_register_post_status() {
-    register_post_status( 'wpi-processing', array(
-        'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+    register_post_status('wpi-processing', array(
+        'label'                     => _x('Processing', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-onhold', array(
-        'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-onhold', array(
+        'label'                     => _x('On Hold', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-cancelled', array(
-        'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-cancelled', array(
+        'label'                     => _x('Cancelled', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-refunded', array(
-        'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-refunded', array(
+        'label'                     => _x('Refunded', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-failed', array(
-        'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-failed', array(
+        'label'                     => _x('Failed', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-renewal', array(
-        'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-renewal', array(
+        'label'                     => _x('Renewal', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
-    ) );
+        'label_count'               => _n_noop('Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing')
+    ));
 }
-add_action( 'init', 'wpinv_register_post_status', 10 );
+add_action('init', 'wpinv_register_post_status', 10);
 

includes/gateways/worldpay.php

Spacing +60 added lines, -60 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_worldpay_cc_form', '__return_false' );
+add_action('wpinv_worldpay_cc_form', '__return_false');
 
-function wpinv_process_worldpay_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_worldpay_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
     // Collect payment data
@@ -24,120 +24,120 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {
+    if (!empty($invoice)) {
         $quantities_enabled = wpinv_item_quantities_enabled();
         
-        $instId     = wpinv_get_option( 'worldpay_instId', false );
+        $instId     = wpinv_get_option('worldpay_instId', false);
         $cartId     = $invoice->get_number();
-        $testMode   = wpinv_is_test_mode( 'worldpay' ) ? 100 : 0;
+        $testMode   = wpinv_is_test_mode('worldpay') ? 100 : 0;
         $name       = $invoice->get_user_full_name();
-        $address    = wp_strip_all_tags( $invoice->get_address(), true );
+        $address    = wp_strip_all_tags($invoice->get_address(), true);
         $postcode   = $invoice->zip;
         $tel        = $invoice->phone;
         $email      = $invoice->get_email();
         $country    = $invoice->country;
-        $amount     = wpinv_sanitize_amount( $invoice->get_total() );
+        $amount     = wpinv_sanitize_amount($invoice->get_total());
         $currency   = wpinv_get_currency();
         
         $items      = array();
-        foreach ( $invoice->get_cart_details() as $item ) {
+        foreach ($invoice->get_cart_details() as $item) {
             $item_desc  = $item['name'];
-            $quantity   = !empty( $item['quantity'] ) && $item['quantity'] > 0 ? $item['quantity'] : 1;
-            $item_desc .= ' (' . ( $quantities_enabled ? $quantity . 'x ' : '' ) . wpinv_price( wpinv_format_amount( $item['item_price'] ) ) . ')';
+            $quantity   = !empty($item['quantity']) && $item['quantity'] > 0 ? $item['quantity'] : 1;
+            $item_desc .= ' (' . ($quantities_enabled ? $quantity . 'x ' : '') . wpinv_price(wpinv_format_amount($item['item_price'])) . ')';
             
             $items[] = $item_desc;
         }
         
-        $desc = implode( ', ', $items );
-        if ( wpinv_use_taxes() && $invoice->get_tax() > 0 ) {
-            $desc .= ', ' . wp_sprintf( __( 'Tax: %s', 'invoicing' ), $invoice->get_tax( true ) );
+        $desc = implode(', ', $items);
+        if (wpinv_use_taxes() && $invoice->get_tax() > 0) {
+            $desc .= ', ' . wp_sprintf(__('Tax: %s', 'invoicing'), $invoice->get_tax(true));
         }
         
         $extra_params                   = array();
         $extra_params['MC_description'] = $desc;
-        $extra_params['MC_callback']    = wpinv_get_ipn_url( 'worldpay' );
+        $extra_params['MC_callback']    = wpinv_get_ipn_url('worldpay');
         $extra_params['MC_key']         = $invoice->get_key();
         $extra_params['MC_invoice_id']  = $invoice->ID;
         $extra_params['address1']       = $address;
         $extra_params['town']           = $invoice->city;
         $extra_params['region']         = $invoice->state;
-        $extra_params['amountString']   = $invoice->get_total( true );
-        $extra_params['countryString']  = wpinv_country_name( $invoice->country );
+        $extra_params['amountString']   = $invoice->get_total(true);
+        $extra_params['countryString']  = wpinv_country_name($invoice->country);
         $extra_params['compName']       = $invoice->company;
         
-        $extra_params   = apply_filters( 'wpinv_worldpay_form_extra_parameters', $extra_params, $invoice );
+        $extra_params   = apply_filters('wpinv_worldpay_form_extra_parameters', $extra_params, $invoice);
         
-        $redirect_text  = __( 'Redirecting to Worldpay site, click on button if not redirected.', 'invoicing' );
-        $redirect_text  = apply_filters( 'wpinv_worldpay_redirect_text', $redirect_text, $invoice );
+        $redirect_text  = __('Redirecting to Worldpay site, click on button if not redirected.', 'invoicing');
+        $redirect_text  = apply_filters('wpinv_worldpay_redirect_text', $redirect_text, $invoice);
         
         // Empty the shopping cart
         wpinv_empty_cart();
         ?>
 <div class="wpi-worldpay-form" style="padding:20px;font-family:arial,sans-serif;text-align:center;color:#555">
-<?php do_action( 'wpinv_worldpay_form_before', $invoice ); ?>
-<h3><?php echo $redirect_text ;?></h3>
+<?php do_action('wpinv_worldpay_form_before', $invoice); ?>
+<h3><?php echo $redirect_text; ?></h3>
 <form action="<?php echo wpinv_get_worldpay_redirect(); ?>" name="wpi_worldpay_form" method="POST">
-    <input type="hidden" value="<?php echo $amount;?>" name="amount">
-    <input type="hidden" value="<?php echo esc_attr( $cartId );?>" name="cartId">
-    <input type="hidden" value="<?php echo $currency;?>" name="currency">
-    <input type="hidden" value="<?php echo $instId;?>" name="instId">
-    <input type="hidden" value="<?php echo $testMode;?>" name="testMode">
-    <input type="hidden" value="<?php echo esc_attr( $name );?>" name="name">
-    <input type="hidden" value="<?php echo esc_attr( $address );?>" name="address">
-    <input type="hidden" value="<?php echo esc_attr( $postcode );?>" name="postcode">
-    <input type="hidden" value="<?php echo esc_attr( $tel );?>" name="tel">
-    <input type="hidden" value="<?php echo esc_attr( $email );?>" name="email">
-    <input type="hidden" value="<?php echo esc_attr( $country );?>" name="country">
-    <input type="hidden" value="<?php echo esc_attr( $desc );?>" name="desc">
-    <?php foreach ( $extra_params as $param => $value ) { ?>
-        <?php if ( !empty( $value !== false ) ) { ?>
-    <input type="hidden" value="<?php echo esc_attr( $value );?>" name="<?php echo esc_attr( $param );?>">
+    <input type="hidden" value="<?php echo $amount; ?>" name="amount">
+    <input type="hidden" value="<?php echo esc_attr($cartId); ?>" name="cartId">
+    <input type="hidden" value="<?php echo $currency; ?>" name="currency">
+    <input type="hidden" value="<?php echo $instId; ?>" name="instId">
+    <input type="hidden" value="<?php echo $testMode; ?>" name="testMode">
+    <input type="hidden" value="<?php echo esc_attr($name); ?>" name="name">
+    <input type="hidden" value="<?php echo esc_attr($address); ?>" name="address">
+    <input type="hidden" value="<?php echo esc_attr($postcode); ?>" name="postcode">
+    <input type="hidden" value="<?php echo esc_attr($tel); ?>" name="tel">
+    <input type="hidden" value="<?php echo esc_attr($email); ?>" name="email">
+    <input type="hidden" value="<?php echo esc_attr($country); ?>" name="country">
+    <input type="hidden" value="<?php echo esc_attr($desc); ?>" name="desc">
+    <?php foreach ($extra_params as $param => $value) { ?>
+        <?php if (!empty($value !== false)) { ?>
+    <input type="hidden" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($param); ?>">
         <?php } ?>
     <?php } ?>
-    <?php do_action( 'wpinv_worldpay_form_parameters', $invoice ); ?>
-    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e( 'Pay by Debit/Credit Card (WorldPay)', 'invoicing' ) ;?>">
+    <?php do_action('wpinv_worldpay_form_parameters', $invoice); ?>
+    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e('Pay by Debit/Credit Card (WorldPay)', 'invoicing'); ?>">
 </form>
 <script type="text/javascript">document.wpi_worldpay_form.submit();</script>
-<?php do_action( 'wpinv_worldpay_form_after', $invoice ); ?>
+<?php do_action('wpinv_worldpay_form_after', $invoice); ?>
 </div>
         <?php
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment' );
+add_action('wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment');
 
 function wpinv_get_worldpay_redirect() {
-    $redirect = wpinv_is_test_mode( 'worldpay' ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+    $redirect = wpinv_is_test_mode('worldpay') ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
     
-    return apply_filters( 'wpinv_worldpay_redirect', $redirect );
+    return apply_filters('wpinv_worldpay_redirect', $redirect);
 }
 
 function wpinv_process_worldpay_ipn() {
-    $request = wpinv_get_post_data( 'post' );
+    $request = wpinv_get_post_data('post');
     
-    if ( !empty( $request['cartId'] ) && !empty( $request['transStatus'] ) && !empty( $request['installation'] ) && isset( $request['testMode'] ) && isset( $request['MC_invoice_id'] ) && isset( $request['MC_key'] ) ) {
+    if (!empty($request['cartId']) && !empty($request['transStatus']) && !empty($request['installation']) && isset($request['testMode']) && isset($request['MC_invoice_id']) && isset($request['MC_key'])) {
         $invoice_id = $request['MC_invoice_id'];
         
-        if ( $invoice_id == wpinv_get_invoice_id_by_key( $request['MC_key'] ) && $invoice = wpinv_get_invoice( $invoice_id ) ) {
-            if ( $request['transStatus'] == 'Y' ) {                
-                wpinv_update_payment_status( $invoice_id, 'publish' );
-                wpinv_set_payment_transaction_id( $invoice_id, $request['transId'] );
-                wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Worldpay Transaction ID: %s', 'invoicing' ), $request['transId'] ) );
+        if ($invoice_id == wpinv_get_invoice_id_by_key($request['MC_key']) && $invoice = wpinv_get_invoice($invoice_id)) {
+            if ($request['transStatus'] == 'Y') {                
+                wpinv_update_payment_status($invoice_id, 'publish');
+                wpinv_set_payment_transaction_id($invoice_id, $request['transId']);
+                wpinv_insert_payment_note($invoice_id, sprintf(__('Worldpay Transaction ID: %s', 'invoicing'), $request['transId']));
                 return;
-            } else if ( $request['transStatus'] == 'C' ) {
-                wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-                wpinv_insert_payment_note( $invoice_id, __( 'Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing' ) );
+            } else if ($request['transStatus'] == 'C') {
+                wpinv_update_payment_status($invoice_id, 'wpi-failed');
+                wpinv_insert_payment_note($invoice_id, __('Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing'));
                 
-                wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing' ), json_encode( $request ) ), $invoice_id );
+                wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing'), json_encode($request)), $invoice_id);
                 return;
             }
         }
     }
     return;
 }
-add_action( 'wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn' );
\ No newline at end of file
+add_action('wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn');
\ No newline at end of file