AyeCode / invoicing

widgets/invoice-receipt.php

Indentation +9 added lines, -9 removed lines

@@ -44,15 +44,15 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
         return wpinv_payment_receipt();
     }

Spacing +7 added lines, -7 removed lines

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

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

Indentation +31 added lines, -31 removed lines

@@ -394,15 +394,15 @@ 
     }
 
     /**
-	 * Fetches the database from the MaxMind service.
-	 *
-	 * @param string $license_key The license key to be used when downloading the database.
-	 */
+     * Fetches the database from the MaxMind service.
+     *
+     * @param string $license_key The license key to be used when downloading the database.
+     */
     public static function geoip2_download_database() {
 
         // Allow us to easily interact with the filesystem.
         require_once ABSPATH . 'wp-admin/includes/file.php';
-		WP_Filesystem();
+        WP_Filesystem();
         global $wp_filesystem;
 
         $license_key = wpinv_get_option( 'maxmind_license_key' );
@@ -433,7 +433,7 @@ 
             }
 
             // Move the new database into position.
-		    $wp_filesystem->move( $database_path, $target_path, true );
+            $wp_filesystem->move( $database_path, $target_path, true );
             $wp_filesystem->delete( dirname( $database_path ) );
 
             wpinv_update_option( 'wpinv_geoip2_date_updated', current_time( 'timestamp' ) );
@@ -452,16 +452,16 @@ 
 
         // The download URI of the database.
         $source_url = add_query_arg(
-			array(
+            array(
                 'license_key' => urlencode( sanitize_text_field( $license_key ) ),
                 'edition_id'  => $database,
-				'suffix'      => 'tar.gz',
-			),
-			'https://download.maxmind.com/app/geoip_download'
+                'suffix'      => 'tar.gz',
+            ),
+            'https://download.maxmind.com/app/geoip_download'
         );
 
         // Needed for the download_url call right below.
-		require_once ABSPATH . 'wp-admin/includes/file.php';
+        require_once ABSPATH . 'wp-admin/includes/file.php';
 
         // Download the file.
         $tmp_archive_path = download_url( esc_url_raw( $source_url ) );
@@ -470,16 +470,16 @@ 
         if ( is_wp_error( $tmp_archive_path ) ) {
 
             // Transform the error into something more informative.
-			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) ) {
-				switch ( $error_data['code'] ) {
-					case 401:
-						return new WP_Error(
-							'invoicing_maxmind_geolocation_database_license_key',
-							__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
-						);
-				}
-			}
+            $error_data = $tmp_archive_path->get_error_data();
+            if ( isset( $error_data['code'] ) ) {
+                switch ( $error_data['code'] ) {
+                    case 401:
+                        return new WP_Error(
+                            'invoicing_maxmind_geolocation_database_license_key',
+                            __( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+                        );
+                }
+            }
 
             return new WP_Error( 'invoicing_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
 
@@ -487,19 +487,19 @@ 
 
         // Extract the database from the archive.
         try {
-			$file      = new PharData( $tmp_archive_path );
+            $file      = new PharData( $tmp_archive_path );
             $file_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb';
 
-			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb',
-				true
+            $file->extractTo(
+                dirname( $tmp_archive_path ),
+                trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb',
+                true
             );
 
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
-		} finally {
-			// Remove the archive since we only care about a single file in it.
+        } catch ( Exception $exception ) {
+            return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+        } finally {
+            // Remove the archive since we only care about a single file in it.
             unlink( $tmp_archive_path );
         }
 
@@ -1862,7 +1862,7 @@ 
         $valid_company = $vies_company && $company && ( $vies_company == '---' || strcasecmp( trim( $vies_company ), trim( $company ) ) == 0 ) ? true : false;
 
         if ( ! $valid_company && ! empty( $wpinv_options['vat_disable_company_name_check'] ) ) {
-           return wp_sprintf(
+            return wp_sprintf(
                 __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ),
                 getpaid_vat_name()
             );

Braces +7 added lines, -5 removed lines

@@ -712,7 +712,7 @@ 
                 if ( !empty( $load_xml ) && !empty( $load_xml->geoplugin_countryCode ) ) {
                     $wpinv_ip_address_country = (string)$load_xml->geoplugin_countryCode;
                 }
-            }elseif(!empty( $ip )){
+            } elseif(!empty( $ip )){
                 $url = 'http://ip-api.com/json/' . $ip;
                 $response = wp_remote_get($url);
 
@@ -1513,16 +1513,18 @@ 
 
         if ( !empty( $tax_rates ) ) {
             foreach ( $tax_rates as $key => $tax_rate ) {
-                if ( $country != $tax_rate['country'] )
-                    continue;
+                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 );
                     }
                 } else {
-                    if ( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) )
-                        continue;
+                    if ( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) ) {
+                                            continue;
+                    }
 
                     $state_rate = $tax_rate['rate'];
                     if ( 0 !== $state_rate || !empty( $state_rate ) ) {

Spacing +624 added lines, -624 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 class WPInv_EUVat {
 
@@ -24,128 +24,128 @@ 
     public function init() {
 
         // If this is an admin page...
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             // Register our scripts.
-            add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
-            add_action( 'wpinv_settings_sections_taxes', array( $this, 'section_vat_settings' ) );
-            add_action( 'wpinv_settings_taxes', array( $this, 'vat_settings' ) );
-            add_filter( 'wpinv_settings_taxes-vat_sanitize', array( $this, 'sanitize_vat_settings' ) );
-            add_filter( 'wpinv_settings_taxes-vat_rates_sanitize', array( $this, 'sanitize_vat_rates' ) );
-            add_action( 'wp_ajax_wpinv_add_vat_class', array( $this, 'add_class' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_add_vat_class', array( $this, 'add_class' ) );
-            add_action( 'wp_ajax_wpinv_delete_vat_class', array( $this, 'delete_class' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_delete_vat_class', array( $this, 'delete_class' ) );
-            add_action( 'wp_ajax_wpinv_update_vat_rates', array( $this, 'update_eu_rates' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_update_vat_rates', array( $this, 'update_eu_rates' ) );
-            add_action( 'wp_ajax_wpinv_geoip2', array( $this, 'geoip2_download_database' ) );
-            add_action( 'wp_ajax_nopriv_wpinv_geoip2', array( $this, 'geoip2_download_database' ) );
+            add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'));
+            add_action('wpinv_settings_sections_taxes', array($this, 'section_vat_settings'));
+            add_action('wpinv_settings_taxes', array($this, 'vat_settings'));
+            add_filter('wpinv_settings_taxes-vat_sanitize', array($this, 'sanitize_vat_settings'));
+            add_filter('wpinv_settings_taxes-vat_rates_sanitize', array($this, 'sanitize_vat_rates'));
+            add_action('wp_ajax_wpinv_add_vat_class', array($this, 'add_class'));
+            add_action('wp_ajax_nopriv_wpinv_add_vat_class', array($this, 'add_class'));
+            add_action('wp_ajax_wpinv_delete_vat_class', array($this, 'delete_class'));
+            add_action('wp_ajax_nopriv_wpinv_delete_vat_class', array($this, 'delete_class'));
+            add_action('wp_ajax_wpinv_update_vat_rates', array($this, 'update_eu_rates'));
+            add_action('wp_ajax_nopriv_wpinv_update_vat_rates', array($this, 'update_eu_rates'));
+            add_action('wp_ajax_wpinv_geoip2', array($this, 'geoip2_download_database'));
+            add_action('wp_ajax_nopriv_wpinv_geoip2', array($this, 'geoip2_download_database'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_vat_scripts' ) );
-        add_filter( 'wpinv_default_billing_country', array( $this, 'get_user_country' ), 10 );
-        add_filter( 'wpinv_get_user_country', array( $this, 'set_user_country' ), 10 );
-        add_action( 'wp_ajax_wpinv_vat_validate', array( $this, 'ajax_vat_validate' ) );
-        add_action( 'wp_ajax_nopriv_wpinv_vat_validate', array( $this, 'ajax_vat_validate' ) );
+        add_action('wp_enqueue_scripts', array($this, 'enqueue_vat_scripts'));
+        add_filter('wpinv_default_billing_country', array($this, 'get_user_country'), 10);
+        add_filter('wpinv_get_user_country', array($this, 'set_user_country'), 10);
+        add_action('wp_ajax_wpinv_vat_validate', array($this, 'ajax_vat_validate'));
+        add_action('wp_ajax_nopriv_wpinv_vat_validate', array($this, 'ajax_vat_validate'));
 
-        if ( wpinv_use_taxes() && self::allow_vat_rules() ) {
-            add_filter( 'wpinv_tax_rate', array( $this, 'get_rate' ), 10, 4 );
+        if (wpinv_use_taxes() && self::allow_vat_rules()) {
+            add_filter('wpinv_tax_rate', array($this, '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 function enqueue_vat_scripts() {
-        if( wpinv_use_taxes() && wpinv_get_option( 'apply_vat_rules' ) ) {
+        if (wpinv_use_taxes() && wpinv_get_option('apply_vat_rules')) {
             $this->load_vat_scripts();
         }
     }
 
-    public function load_vat_scripts(){
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+    public function load_vat_scripts() {
+        $suffix = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
-        wp_register_script( 'wpinv-vat-validation-script', WPINV_PLUGIN_URL . 'assets/js/jsvat' . $suffix . '.js', array( 'jquery' ),  WPINV_VERSION );
-        wp_register_script( 'wpinv-vat-script', WPINV_PLUGIN_URL . 'assets/js/euvat' . $suffix . '.js', array( 'jquery' ),  WPINV_VERSION );
+        wp_register_script('wpinv-vat-validation-script', WPINV_PLUGIN_URL . 'assets/js/jsvat' . $suffix . '.js', array('jquery'), WPINV_VERSION);
+        wp_register_script('wpinv-vat-script', WPINV_PLUGIN_URL . 'assets/js/euvat' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        $vat_name   = $this->get_vat_name();
+        $vat_name = $this->get_vat_name();
 
         $vars = array();
         $vars['UseTaxes'] = wpinv_use_taxes();
         $vars['EUStates'] = self::get_eu_states();
-        $vars['NoRateSet'] = __( 'You have not set a rate. Do you want to continue?', 'invoicing' );
-        $vars['EmptyCompany'] = __( 'Please enter your registered company name!', 'invoicing' );
-        $vars['EmptyVAT'] = wp_sprintf( __( 'Please enter your %s number!', 'invoicing' ), $vat_name );
-        $vars['TotalsRefreshed'] = wp_sprintf( __( 'The invoice totals will be refreshed to update the %s.', 'invoicing' ), $vat_name );
-        $vars['ErrValidateVAT'] = wp_sprintf( __( 'Fail to validate the %s number!', 'invoicing' ), $vat_name );
-        $vars['ErrResetVAT'] = wp_sprintf( __( 'Fail to reset the %s number!', 'invoicing' ), $vat_name );
-        $vars['ErrInvalidVat'] = wp_sprintf( __( 'The %s number supplied does not have a valid format!', 'invoicing' ), $vat_name );
-        $vars['ErrInvalidResponse'] = __( 'An invalid response has been received from the server!', 'invoicing' );
+        $vars['NoRateSet'] = __('You have not set a rate. Do you want to continue?', 'invoicing');
+        $vars['EmptyCompany'] = __('Please enter your registered company name!', 'invoicing');
+        $vars['EmptyVAT'] = wp_sprintf(__('Please enter your %s number!', 'invoicing'), $vat_name);
+        $vars['TotalsRefreshed'] = wp_sprintf(__('The invoice totals will be refreshed to update the %s.', 'invoicing'), $vat_name);
+        $vars['ErrValidateVAT'] = wp_sprintf(__('Fail to validate the %s number!', 'invoicing'), $vat_name);
+        $vars['ErrResetVAT'] = wp_sprintf(__('Fail to reset the %s number!', 'invoicing'), $vat_name);
+        $vars['ErrInvalidVat'] = wp_sprintf(__('The %s number supplied does not have a valid format!', 'invoicing'), $vat_name);
+        $vars['ErrInvalidResponse'] = __('An invalid response has been received from the server!', 'invoicing');
         $vars['ApplyVATRules'] = $vars['UseTaxes'] ? self::allow_vat_rules() : false;
         $vars['HideVatFields'] = $vars['ApplyVATRules'] ? self::hide_vat_fields() : true;
-        $vars['ErrResponse'] = __( 'The request response is invalid!', 'invoicing' );
-        $vars['ErrRateResponse'] = __( 'The get rate request response is invalid', 'invoicing' );
-        $vars['PageRefresh'] = __( 'The page will be refreshed in 10 seconds to show the new options.', 'invoicing' );
-        $vars['RequestResponseNotValidJSON'] = __( 'The get rate request response is not valid JSON', 'invoicing' );
-        $vars['GetRateRequestFailed'] = __( 'The get rate request failed: ', 'invoicing' );
-        $vars['NoRateInformationInResponse'] = __( 'The get rate request response does not contain any rate information', 'invoicing' );
-        $vars['RatesUpdated'] = __( 'The rates have been updated. Press the save button to record these new rates.', 'invoicing' );
-        $vars['IPAddressInformation'] = __( 'IP Address Information', 'invoicing' );
-        $vars['VatValidating'] = wp_sprintf( __( 'Validating %s number...', 'invoicing' ), $vat_name );
-        $vars['VatReseting'] = __( 'Reseting...', 'invoicing' );
-        $vars['VatValidated'] = wp_sprintf( __( '%s number validated', 'invoicing' ), $vat_name );
-        $vars['VatNotValidated'] = wp_sprintf( __( '%s number not validated', 'invoicing' ), $vat_name );
-        $vars['ConfirmDeleteClass'] = __( 'Are you sure you wish to delete this rates class?', 'invoicing' );
+        $vars['ErrResponse'] = __('The request response is invalid!', 'invoicing');
+        $vars['ErrRateResponse'] = __('The get rate request response is invalid', 'invoicing');
+        $vars['PageRefresh'] = __('The page will be refreshed in 10 seconds to show the new options.', 'invoicing');
+        $vars['RequestResponseNotValidJSON'] = __('The get rate request response is not valid JSON', 'invoicing');
+        $vars['GetRateRequestFailed'] = __('The get rate request failed: ', 'invoicing');
+        $vars['NoRateInformationInResponse'] = __('The get rate request response does not contain any rate information', 'invoicing');
+        $vars['RatesUpdated'] = __('The rates have been updated. Press the save button to record these new rates.', 'invoicing');
+        $vars['IPAddressInformation'] = __('IP Address Information', 'invoicing');
+        $vars['VatValidating'] = wp_sprintf(__('Validating %s number...', 'invoicing'), $vat_name);
+        $vars['VatReseting'] = __('Reseting...', 'invoicing');
+        $vars['VatValidated'] = wp_sprintf(__('%s number validated', 'invoicing'), $vat_name);
+        $vars['VatNotValidated'] = wp_sprintf(__('%s number not validated', 'invoicing'), $vat_name);
+        $vars['ConfirmDeleteClass'] = __('Are you sure you wish to delete this rates class?', 'invoicing');
         $vars['isFront'] = is_admin() ? false : true;
         $vars['baseCountry'] = wpinv_get_default_country();
-        $vars['disableVATSameCountry'] = ( self::same_country_rule() == 'no' ? true : false );
-        $vars['disableVATSimpleCheck'] = wpinv_get_option( 'vat_offline_check' ) ? true : false;
+        $vars['disableVATSameCountry'] = (self::same_country_rule() == 'no' ? true : false);
+        $vars['disableVATSimpleCheck'] = wpinv_get_option('vat_offline_check') ? true : false;
 
-        wp_enqueue_script( 'wpinv-vat-validation-script' );
-        wp_enqueue_script( 'wpinv-vat-script' );
-        wp_localize_script( 'wpinv-vat-script', 'WPInv_VAT_Vars', $vars );
+        wp_enqueue_script('wpinv-vat-validation-script');
+        wp_enqueue_script('wpinv-vat-script');
+        wp_localize_script('wpinv-vat-script', 'WPInv_VAT_Vars', $vars);
     }
 
     public static function enqueue_admin_scripts() {
-        if( isset( $_GET['page'] ) && 'wpinv-settings' == $_GET['page'] ) {
+        if (isset($_GET['page']) && 'wpinv-settings' == $_GET['page']) {
             self::load_vat_scripts();
         }
     }
 
-    public static function section_vat_settings( $sections ) {
-        if ( !empty( $sections ) ) {
-            $sections['vat'] = __( 'EU VAT Settings', 'invoicing' );
+    public static function section_vat_settings($sections) {
+        if (!empty($sections)) {
+            $sections['vat'] = __('EU VAT Settings', 'invoicing');
 
-            if ( self::allow_vat_classes() ) {
-                $sections['vat_rates'] = __( 'EU VAT Rates', 'invoicing' );
+            if (self::allow_vat_classes()) {
+                $sections['vat_rates'] = __('EU VAT Rates', 'invoicing');
             }
         }
         return $sections;
@@ -154,52 +154,52 @@ 
     public static function vat_rates_settings() {
         $vat_classes = self::get_rate_classes();
         $vat_rates = array();
-        $vat_class = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '_new';
-        $current_url = remove_query_arg( 'wpi_sub' );
+        $vat_class = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '_new';
+        $current_url = remove_query_arg('wpi_sub');
 
         $vat_rates['vat_rates_header'] = array(
             'id' => 'vat_rates_header',
-            'name' => '<h3>' . __( 'Manage VAT Rates', 'invoicing' ) . '</h3>',
+            'name' => '<h3>' . __('Manage VAT Rates', 'invoicing') . '</h3>',
             'desc' => '',
             'type' => 'header',
             'size' => 'regular'
         );
         $vat_rates['vat_rates_class'] = array(
             'id'          => 'vat_rates_class',
-            'name'        => __( 'Edit VAT Rates', 'invoicing' ),
-            'desc'        => __( 'The standard rate will apply where no explicit rate is provided.', 'invoicing' ),
+            'name'        => __('Edit VAT Rates', 'invoicing'),
+            'desc'        => __('The standard rate will apply where no explicit rate is provided.', 'invoicing'),
             'type'        => 'select',
-            'options'     => array_merge( $vat_classes, array( '_new' => __( 'Add New Rate Class', 'invoicing' ) ) ),
-            'placeholder' => __( 'Select a VAT Rate', 'invoicing' ),
+            'options'     => array_merge($vat_classes, array('_new' => __('Add New Rate Class', 'invoicing'))),
+            'placeholder' => __('Select a VAT Rate', 'invoicing'),
             'selected'    => $vat_class,
             'class'       => 'wpi_select2',
             'onchange'    => 'document.location.href="' . $current_url . '&wpi_sub=" + this.value;',
         );
 
-        if ( $vat_class != '_standard' && $vat_class != '_new' ) {
+        if ($vat_class != '_standard' && $vat_class != '_new') {
             $vat_rates['vat_rate_delete'] = array(
                 'id'   => 'vat_rate_delete',
                 'type' => 'vat_rate_delete',
             );
         }
 
-        if ( $vat_class == '_new' ) {
+        if ($vat_class == '_new') {
             $vat_rates['vat_rates_settings'] = array(
                 'id' => 'vat_rates_settings',
-                'name' => '<h3>' . __( 'Add New Rate Class', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Add New Rate Class', 'invoicing') . '</h3>',
                 'type' => 'header',
             );
             $vat_rates['vat_rate_name'] = array(
                 'id'   => 'vat_rate_name',
-                'name' => __( 'Name', 'invoicing' ),
-                'desc' => __( 'A short name for the new VAT Rate class', 'invoicing' ),
+                'name' => __('Name', 'invoicing'),
+                'desc' => __('A short name for the new VAT Rate class', 'invoicing'),
                 'type' => 'text',
                 'size' => 'regular',
             );
             $vat_rates['vat_rate_desc'] = array(
                 'id'   => 'vat_rate_desc',
-                'name' => __( 'Description', 'invoicing' ),
-                'desc' => __( 'Manage VAT Rate class', 'invoicing' ),
+                'name' => __('Description', 'invoicing'),
+                'desc' => __('Manage VAT Rate class', 'invoicing'),
                 'type' => 'text',
                 'size' => 'regular',
             );
@@ -211,7 +211,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',
             );
         }
@@ -219,12 +219,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'
@@ -232,22 +232,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'
@@ -255,8 +255,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'
             );
@@ -272,8 +272,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'
             );
 
@@ -281,22 +281,22 @@ 
 
             $vat_settings['vat_same_country_rule'] = array(
                 'id'          => 'vat_same_country_rule',
-                'name'        => __( 'Same Country Rule', 'invoicing' ),
-                'desc'        => __( 'Select how you want to handle VAT charge if sales are in the same country as the base country.', 'invoicing' ),
+                'name'        => __('Same Country Rule', 'invoicing'),
+                'desc'        => __('Select how you want to handle VAT charge if sales are in the same country as the base country.', 'invoicing'),
                 'type'        => 'select',
                 'options'     => array(
-                    ''          => __( 'Normal', 'invoicing' ),
-                    'no'        => __( 'No VAT', 'invoicing' ),
-                    'always'    => __( 'Always apply VAT', 'invoicing' ),
+                    ''          => __('Normal', 'invoicing'),
+                    'no'        => __('No VAT', 'invoicing'),
+                    'always'    => __('Always apply VAT', 'invoicing'),
                 ),
-                'placeholder' => __( 'Select an option', 'invoicing' ),
+                'placeholder' => __('Select an option', 'invoicing'),
                 'std'         => '',
                 'class'   => 'wpi_select2',
             );
 
             $vat_settings['vat_checkout_title'] = array(
                 'id' => 'vat_checkout_title',
-                'name' => '<h3>' . __( 'Checkout Fields', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('Checkout Fields', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
                 'size' => 'regular'
@@ -304,22 +304,22 @@ 
 
             $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['maxmind_license_key'] = array(
                 'id'   => 'maxmind_license_key',
-                'name' => __( 'MaxMind License Key', 'invoicing' ),
+                'name' => __('MaxMind License Key', 'invoicing'),
                 'type' => 'text',
                 'size' => 'regular',
-                'desc' => '<a href="https://support.maxmind.com/account-faq/license-keys/how-do-i-generate-a-license-key/">' . __( 'The key that will be used when dealing with MaxMind Geolocation services.', 'invoicing' ) . '</a>',
+                'desc' => '<a href="https://support.maxmind.com/account-faq/license-keys/how-do-i-generate-a-license-key/">' . __('The key that will be used when dealing with MaxMind Geolocation services.', 'invoicing') . '</a>',
             );
 
             $vat_settings['vat_ip_lookup'] = array(
                 'id'   => 'vat_ip_lookup',
-                'name' => __( 'IP Country Look-up', 'invoicing' ),
+                'name' => __('IP Country Look-up', 'invoicing'),
                 'type' => 'vat_ip_lookup',
                 'size' => 'regular',
                 'std' => 'default',
@@ -328,14 +328,14 @@ 
 
             $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'
@@ -343,37 +343,37 @@ 
 
             $vat_settings['vat_vies_check'] = array(
                 'id' => 'vat_vies_check',
-                'name' => __( 'Disable VIES VAT ID Check', 'invoicing' ),
-                'desc' => wp_sprintf( __( 'Prevent VAT numbers from being validated by the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                'name' => __('Disable VIES VAT ID Check', 'invoicing'),
+                'desc' => wp_sprintf(__('Prevent VAT numbers from being validated by the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_disable_company_name_check'] = array(
                 'id' => 'vat_disable_company_name_check',
-                'name' => __( 'Disable VIES Name Check', 'invoicing' ),
-                'desc' => wp_sprintf( __( 'Prevent company name from being validated by the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                'name' => __('Disable VIES Name Check', 'invoicing'),
+                'desc' => wp_sprintf(__('Prevent company name from being validated by the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                 'type' => 'checkbox'
             );
 
             $vat_settings['vat_offline_check'] = array(
                 'id' => 'vat_offline_check',
-                'name' => __( 'Disable Basic Checks', 'invoicing' ),
-                'desc' => __( 'Disable basic JS checks for correct format of VAT number. (Not Recommended)', 'invoicing' ),
+                'name' => __('Disable Basic Checks', 'invoicing'),
+                'desc' => __('Disable basic JS checks for correct format of VAT number. (Not Recommended)', 'invoicing'),
                 'type' => 'checkbox'
             );
 
 
             $settings['vat'] = $vat_settings;
 
-            if ( self::allow_vat_classes() ) {
+            if (self::allow_vat_classes()) {
                 $settings['vat_rates'] = self::vat_rates_settings();
             }
 
             $eu_fallback_rate = array(
                 'id'   => 'eu_fallback_rate',
-                'name' => '<h3>' . __( 'VAT rate for EU member states', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('VAT rate for EU member states', 'invoicing') . '</h3>',
                 'type' => 'eu_fallback_rate',
-                'desc' => __( 'Enter the VAT rate to be charged for EU member states. You can edit the rates for each member state when a country rate has been set up by pressing this button.', 'invoicing' ),
+                'desc' => __('Enter the VAT rate to be charged for EU member states. You can edit the rates for each member state when a country rate has been set up by pressing this button.', 'invoicing'),
                 'std'  => '20',
                 'size' => 'small'
             );
@@ -388,7 +388,7 @@ 
      */
     public static function maxmind_folder() {
 
-        $upload_dir      = wp_upload_dir();
+        $upload_dir = wp_upload_dir();
         return $upload_dir['basedir'] . '/invoicing';
 
     }
@@ -405,39 +405,39 @@ 
 		WP_Filesystem();
         global $wp_filesystem;
 
-        $license_key = wpinv_get_option( 'maxmind_license_key' );
+        $license_key = wpinv_get_option('maxmind_license_key');
 
-        if ( empty( $license_key ) ) {
-            echo __( 'Please enter your MaxMind license key then save the settings first before downloading the databases.', 'invoicing' );
+        if (empty($license_key)) {
+            echo __('Please enter your MaxMind license key then save the settings first before downloading the databases.', 'invoicing');
             exit;
         }
 
         // The database files that we will download.
-        $database_files     = array( 'GeoLite2-Country', 'GeoLite2-City' );
+        $database_files = array('GeoLite2-Country', 'GeoLite2-City');
 
         // The destination dir of all databases.
         $destination_dir = self::maxmind_folder();
 
-        if ( ! $wp_filesystem->is_dir( $destination_dir ) ) {
-            $wp_filesystem->mkdir( $destination_dir );
+        if (!$wp_filesystem->is_dir($destination_dir)) {
+            $wp_filesystem->mkdir($destination_dir);
         }
 
-        foreach( $database_files as $database ) {
+        foreach ($database_files as $database) {
 
-            $database_path = self::geoip2_download_file( $license_key, $database );
-            $target_path   = trailingslashit( $destination_dir ) .  $database . '.mmdb';
+            $database_path = self::geoip2_download_file($license_key, $database);
+            $target_path   = trailingslashit($destination_dir) . $database . '.mmdb';
 
-            if ( is_wp_error( $database_path ) ) {
+            if (is_wp_error($database_path)) {
                 echo $database_path->get_error_message();
                 exit;
             }
 
             // Move the new database into position.
-		    $wp_filesystem->move( $database_path, $target_path, true );
-            $wp_filesystem->delete( dirname( $database_path ) );
+		    $wp_filesystem->move($database_path, $target_path, true);
+            $wp_filesystem->delete(dirname($database_path));
 
-            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;
@@ -448,12 +448,12 @@ 
      *
      * @return string|WP_Error
      */
-    public static function geoip2_download_file( $license_key, $database ) {
+    public static function geoip2_download_file($license_key, $database) {
 
         // The download URI of the database.
         $source_url = add_query_arg(
 			array(
-                'license_key' => urlencode( sanitize_text_field( $license_key ) ),
+                'license_key' => urlencode(sanitize_text_field($license_key)),
                 'edition_id'  => $database,
 				'suffix'      => 'tar.gz',
 			),
@@ -464,54 +464,54 @@ 
 		require_once ABSPATH . 'wp-admin/includes/file.php';
 
         // Download the file.
-        $tmp_archive_path = download_url( esc_url_raw( $source_url ) );
+        $tmp_archive_path = download_url(esc_url_raw($source_url));
 
         // Did we encounter an error?
-        if ( is_wp_error( $tmp_archive_path ) ) {
+        if (is_wp_error($tmp_archive_path)) {
 
             // Transform the error into something more informative.
 			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) ) {
-				switch ( $error_data['code'] ) {
+			if (isset($error_data['code'])) {
+				switch ($error_data['code']) {
 					case 401:
 						return new WP_Error(
 							'invoicing_maxmind_geolocation_database_license_key',
-							__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+							__('The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing')
 						);
 				}
 			}
 
-            return new WP_Error( 'invoicing_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
+            return new WP_Error('invoicing_maxmind_geolocation_database_download', __('Failed to download the MaxMind database.', 'invoicing'));
 
         }
 
         // Extract the database from the archive.
         try {
-			$file      = new PharData( $tmp_archive_path );
-            $file_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb';
+			$file = new PharData($tmp_archive_path);
+            $file_path = trailingslashit(dirname($tmp_archive_path)) . trailingslashit($file->current()->getFilename()) . $database . '.mmdb';
 
 			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . $database . '.mmdb',
+				dirname($tmp_archive_path),
+				trailingslashit($file->current()->getFilename()) . $database . '.mmdb',
 				true
             );
 
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+		} catch (Exception $exception) {
+			return new WP_Error('invoicing_maxmind_geolocation_database_archive', $exception->getMessage());
 		} finally {
 			// Remove the archive since we only care about a single file in it.
-            unlink( $tmp_archive_path );
+            unlink($tmp_archive_path);
         }
 
         return $file_path;
     }
 
     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',
@@ -520,12 +520,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',
@@ -559,23 +559,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;
         }
 
@@ -585,12 +585,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;
         }
 
@@ -601,10 +601,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;
         }
 
@@ -615,183 +615,183 @@ 
         try {
             self::load_geoip2();
 
-            if ( $filename = self::geoip2_city_dbfile() ) {
-                return new \GeoIp2\Database\Reader( $filename );
+            if ($filename = self::geoip2_city_dbfile()) {
+                return new \GeoIp2\Database\Reader($filename);
             }
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
 
         return false;
     }
 
-    public static function geoip2_country_record( $ip_address ) {
+    public static function geoip2_country_record($ip_address) {
         try {
             $reader = self::geoip2_country_reader();
 
-            if ( $reader ) {
-                $record = $reader->country( $ip_address );
+            if ($reader) {
+                $record = $reader->country($ip_address);
 
-                if ( !empty( $record->country->isoCode ) ) {
+                if (!empty($record->country->isoCode)) {
                     return $record;
                 }
             }
-        } catch(\InvalidArgumentException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\InvalidArgumentException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
 
             return false;
-        } catch(\GeoIp2\Exception\AddressNotFoundException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\GeoIp2\Exception\AddressNotFoundException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
 
             return false;
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
 
         return false;
     }
 
-    public static function geoip2_city_record( $ip_address ) {
+    public static function geoip2_city_record($ip_address) {
         try {
             $reader = self::geoip2_city_reader();
 
-            if ( $reader ) {
-                $record = $reader->city( $ip_address );
+            if ($reader) {
+                $record = $reader->city($ip_address);
 
-                if ( !empty( $record->country->isoCode ) ) {
+                if (!empty($record->country->isoCode)) {
                     return $record;
                 }
             }
-        } catch(\InvalidArgumentException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\InvalidArgumentException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
 
             return false;
-        } catch(\GeoIp2\Exception\AddressNotFoundException $e) {
-            wpinv_error_log( $e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )' );
+        } catch (\GeoIp2\Exception\AddressNotFoundException $e) {
+            wpinv_error_log($e->getMessage(), 'GeoIp2 Lookup( ' . $ip_address . ' )');
 
             return false;
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
             return false;
         }
 
         return false;
     }
 
-    public static function geoip2_country_code( $ip_address ) {
-        $record = self::geoip2_country_record( $ip_address );
-        return !empty( $record->country->isoCode ) ? $record->country->isoCode : wpinv_get_default_country();
+    public static function geoip2_country_code($ip_address) {
+        $record = self::geoip2_country_record($ip_address);
+        return !empty($record->country->isoCode) ? $record->country->isoCode : wpinv_get_default_country();
     }
 
     // Find country by IP address.
-    public static function get_country_by_ip( $ip = '' ) {
+    public static function get_country_by_ip($ip = '') {
         global $wpinv_ip_address_country;
         return '';
-        if ( !empty( $wpinv_ip_address_country ) ) {
+        if (!empty($wpinv_ip_address_country)) {
             return $wpinv_ip_address_country;
         }
 
-        if ( empty( $ip ) ) {
+        if (empty($ip)) {
             $ip = wpinv_get_ip();
         }
 
-        $ip_country_service = wpinv_get_option( 'vat_ip_lookup' );
-        $is_default         = empty( $ip_country_service ) || $ip_country_service === 'default' ? true : false;
+        $ip_country_service = wpinv_get_option('vat_ip_lookup');
+        $is_default         = empty($ip_country_service) || $ip_country_service === 'default' ? true : false;
 
-        if ( !empty( $ip ) && $ip !== '127.0.0.1' ) { // For 127.0.0.1(localhost) use default country.
-            if ( function_exists( 'geoip_country_code_by_name') && ( $ip_country_service === 'geoip' || $is_default ) ) {
+        if (!empty($ip) && $ip !== '127.0.0.1') { // For 127.0.0.1(localhost) use default country.
+            if (function_exists('geoip_country_code_by_name') && ($ip_country_service === 'geoip' || $is_default)) {
                 try {
-                    $wpinv_ip_address_country = geoip_country_code_by_name( $ip );
-                } catch( Exception $e ) {
-                    wpinv_error_log( $e->getMessage(), 'GeoIP Lookup( ' . $ip . ' )' );
+                    $wpinv_ip_address_country = geoip_country_code_by_name($ip);
+                } catch (Exception $e) {
+                    wpinv_error_log($e->getMessage(), 'GeoIP Lookup( ' . $ip . ' )');
                 }
-            } else if ( self::geoip2_country_dbfile() && ( $ip_country_service === 'geoip2' || $is_default ) ) {
-                $wpinv_ip_address_country = self::geoip2_country_code( $ip );
-            } else if ( function_exists( 'simplexml_load_file' ) && ini_get('allow_url_fopen') && ( $ip_country_service === 'geoplugin' || $is_default ) ) {
-                $load_xml = simplexml_load_file( 'http://www.geoplugin.net/xml.gp?ip=' . $ip );
+            } else if (self::geoip2_country_dbfile() && ($ip_country_service === 'geoip2' || $is_default)) {
+                $wpinv_ip_address_country = self::geoip2_country_code($ip);
+            } else if (function_exists('simplexml_load_file') && ini_get('allow_url_fopen') && ($ip_country_service === 'geoplugin' || $is_default)) {
+                $load_xml = simplexml_load_file('http://www.geoplugin.net/xml.gp?ip=' . $ip);
 
-                if ( !empty( $load_xml ) && !empty( $load_xml->geoplugin_countryCode ) ) {
-                    $wpinv_ip_address_country = (string)$load_xml->geoplugin_countryCode;
+                if (!empty($load_xml) && !empty($load_xml->geoplugin_countryCode)) {
+                    $wpinv_ip_address_country = (string) $load_xml->geoplugin_countryCode;
                 }
-            }elseif(!empty( $ip )){
+            }elseif (!empty($ip)) {
                 $url = 'http://ip-api.com/json/' . $ip;
                 $response = wp_remote_get($url);
 
-                if ( is_array( $response ) && wp_remote_retrieve_response_code( $response ) == '200' ) {
-                    $data = json_decode(wp_remote_retrieve_body( $response ),true);
-                    if(!empty($data['countryCode'])){
-                        $wpinv_ip_address_country = (string)$data['countryCode'];
+                if (is_array($response) && wp_remote_retrieve_response_code($response) == '200') {
+                    $data = json_decode(wp_remote_retrieve_body($response), true);
+                    if (!empty($data['countryCode'])) {
+                        $wpinv_ip_address_country = (string) $data['countryCode'];
                     }
                 }
             }
         }
 
-        if ( empty( $wpinv_ip_address_country ) ) {
+        if (empty($wpinv_ip_address_country)) {
             $wpinv_ip_address_country = wpinv_get_default_country();
         }
 
         return $wpinv_ip_address_country;
     }
 
-    public static function sanitize_vat_settings( $input ) {
+    public static function sanitize_vat_settings($input) {
         global $wpinv_options;
 
         $valid      = false;
         $message    = '';
 
-        if ( !empty( $wpinv_options['vat_vies_check'] ) ) {
-            if ( empty( $wpinv_options['vat_offline_check'] ) ) {
-                $valid = self::offline_check( $input['vat_number'] );
+        if (!empty($wpinv_options['vat_vies_check'])) {
+            if (empty($wpinv_options['vat_offline_check'])) {
+                $valid = self::offline_check($input['vat_number']);
             } else {
                 $valid = true;
             }
 
-            $message = $valid ? '' : __( 'VAT number not validated', 'invoicing' );
+            $message = $valid ? '' : __('VAT number not validated', 'invoicing');
         } else {
-            $result = self::check_vat( $input['vat_number'] );
+            $result = self::check_vat($input['vat_number']);
 
-            if ( empty( $result['valid'] ) ) {
+            if (empty($result['valid'])) {
                 $valid      = false;
                 $message    = $result['message'];
             } else {
-                $valid      = ( isset( $result['company'] ) && ( $result['company'] == '---' || ( strcasecmp( trim( $result['company'] ), trim( $input['vat_company_name'] ) ) == 0 ) ) ) || !empty( $wpinv_options['vat_disable_company_name_check'] );
-                $message    = $valid ? '' : __( 'The company name associated with the VAT number provided is not the same as the company name provided.', 'invoicing' );
+                $valid      = (isset($result['company']) && ($result['company'] == '---' || (strcasecmp(trim($result['company']), trim($input['vat_company_name'])) == 0))) || !empty($wpinv_options['vat_disable_company_name_check']);
+                $message    = $valid ? '' : __('The company name associated with the VAT number provided is not the same as the company name provided.', 'invoicing');
             }
         }
 
-        if ( $message && self::is_vat_validated() != $valid ) {
-            add_settings_error( 'wpinv-notices', '', $message, ( $valid ? 'updated' : 'error' ) );
+        if ($message && self::is_vat_validated() != $valid) {
+            add_settings_error('wpinv-notices', '', $message, ($valid ? 'updated' : 'error'));
         }
 
         $input['vat_valid'] = $valid;
         return $input;
     }
 
-    public static function sanitize_vat_rates( $input ) {
-        if( !wpinv_current_user_can_manage_invoicing() ) {
-            add_settings_error( 'wpinv-notices', '', __( 'Your account does not have permission to add rate classes.', 'invoicing' ), 'error' );
+    public static function sanitize_vat_rates($input) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
+            add_settings_error('wpinv-notices', '', __('Your account does not have permission to add rate classes.', 'invoicing'), 'error');
             return $input;
         }
 
         $vat_classes = self::get_rate_classes();
-        $vat_class = !empty( $_REQUEST['wpi_vat_class'] ) && isset( $vat_classes[$_REQUEST['wpi_vat_class']] )? sanitize_text_field( $_REQUEST['wpi_vat_class'] ) : '';
+        $vat_class = !empty($_REQUEST['wpi_vat_class']) && isset($vat_classes[$_REQUEST['wpi_vat_class']]) ? sanitize_text_field($_REQUEST['wpi_vat_class']) : '';
 
-        if ( empty( $vat_class ) ) {
-            add_settings_error( 'wpinv-notices', '', __( 'No valid VAT rates class contained in the request to save rates.', 'invoicing' ), 'error' );
+        if (empty($vat_class)) {
+            add_settings_error('wpinv-notices', '', __('No valid VAT rates class contained in the request to save rates.', 'invoicing'), 'error');
 
             return $input;
         }
 
-        $new_rates = ! empty( $_POST['vat_rates'] ) ? array_values( $_POST['vat_rates'] ) : array();
+        $new_rates = !empty($_POST['vat_rates']) ? array_values($_POST['vat_rates']) : array();
 
-        if ( $vat_class === '_standard' ) {
+        if ($vat_class === '_standard') {
             // Save the active rates in the invoice settings
-            update_option( 'wpinv_tax_rates', $new_rates );
+            update_option('wpinv_tax_rates', $new_rates);
         } else {
             // Get the existing set of rates
             $rates = self::get_non_standard_rates();
             $rates[$vat_class] = $new_rates;
 
-            update_option( 'wpinv_vat_rates', $rates );
+            update_option('wpinv_vat_rates', $rates);
         }
 
         return $input;
@@ -801,71 +801,71 @@ 
         $response = array();
         $response['success'] = false;
 
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing()) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
 
-        $vat_class_name = !empty( $_POST['name'] ) ? sanitize_text_field( $_POST['name'] ) : false;
-        $vat_class_desc = !empty( $_POST['desc'] ) ? sanitize_text_field( $_POST['desc'] ) : false;
+        $vat_class_name = !empty($_POST['name']) ? sanitize_text_field($_POST['name']) : false;
+        $vat_class_desc = !empty($_POST['desc']) ? sanitize_text_field($_POST['desc']) : false;
 
-        if ( empty( $vat_class_name ) ) {
-            $response['error'] = __( 'Select the VAT rate name', 'invoicing' );
-            wp_send_json( $response );
+        if (empty($vat_class_name)) {
+            $response['error'] = __('Select the VAT rate name', 'invoicing');
+            wp_send_json($response);
         }
 
-        $vat_classes = (array)self::get_rate_classes();
+        $vat_classes = (array) self::get_rate_classes();
 
-        if ( !empty( $vat_classes ) && in_array( strtolower( $vat_class_name ), array_map( 'strtolower', array_values( $vat_classes ) ) ) ) {
-            $response['error'] = wp_sprintf( __( 'A VAT Rate name "%s" already exists', 'invoicing' ), $vat_class_name );
-            wp_send_json( $response );
+        if (!empty($vat_classes) && in_array(strtolower($vat_class_name), array_map('strtolower', array_values($vat_classes)))) {
+            $response['error'] = wp_sprintf(__('A VAT Rate name "%s" already exists', 'invoicing'), $vat_class_name);
+            wp_send_json($response);
         }
 
-        $rate_class_key = normalize_whitespace( 'wpi-' . $vat_class_name );
-        $rate_class_key = sanitize_key( str_replace( " ", "-", $rate_class_key ) );
+        $rate_class_key = normalize_whitespace('wpi-' . $vat_class_name);
+        $rate_class_key = sanitize_key(str_replace(" ", "-", $rate_class_key));
 
-        $vat_classes = (array)self::get_rate_classes( true );
-        $vat_classes[$rate_class_key] = array( 'name' => $vat_class_name, 'desc' => $vat_class_desc );
+        $vat_classes = (array) self::get_rate_classes(true);
+        $vat_classes[$rate_class_key] = array('name' => $vat_class_name, 'desc' => $vat_class_desc);
 
-        update_option( '_wpinv_vat_rate_classes', $vat_classes );
+        update_option('_wpinv_vat_rate_classes', $vat_classes);
 
         $response['success'] = true;
-        $response['redirect'] = admin_url( 'admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=' . $rate_class_key );
+        $response['redirect'] = admin_url('admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=' . $rate_class_key);
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
 
     public static function delete_class() {
         $response = array();
         $response['success'] = false;
 
-        if ( !wpinv_current_user_can_manage_invoicing() || !isset( $_POST['class'] ) ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing() || !isset($_POST['class'])) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
 
-        $vat_class = isset( $_POST['class'] ) && $_POST['class'] !== '' ? sanitize_text_field( $_POST['class'] ) : false;
-        $vat_classes = (array)self::get_rate_classes();
+        $vat_class = isset($_POST['class']) && $_POST['class'] !== '' ? sanitize_text_field($_POST['class']) : false;
+        $vat_classes = (array) self::get_rate_classes();
 
-        if ( !isset( $vat_classes[$vat_class] ) ) {
-            $response['error'] = __( 'Requested class does not exists', 'invoicing' );
-            wp_send_json( $response );
+        if (!isset($vat_classes[$vat_class])) {
+            $response['error'] = __('Requested class does not exists', 'invoicing');
+            wp_send_json($response);
         }
 
-        if ( $vat_class == '_new' || $vat_class == '_standard' ) {
-            $response['error'] = __( 'You can not delete standard rates class', 'invoicing' );
-            wp_send_json( $response );
+        if ($vat_class == '_new' || $vat_class == '_standard') {
+            $response['error'] = __('You can not delete standard rates class', 'invoicing');
+            wp_send_json($response);
         }
 
-        $vat_classes = (array)self::get_rate_classes( true );
-        unset( $vat_classes[$vat_class] );
+        $vat_classes = (array) self::get_rate_classes(true);
+        unset($vat_classes[$vat_class]);
 
-        update_option( '_wpinv_vat_rate_classes', $vat_classes );
+        update_option('_wpinv_vat_rate_classes', $vat_classes);
 
         $response['success'] = true;
-        $response['redirect'] = admin_url( 'admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=_new' );
+        $response['redirect'] = admin_url('admin.php?page=wpinv-settings&tab=taxes&section=vat_rates&wpi_sub=_new');
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
 
     public static function update_eu_rates() {
@@ -874,73 +874,73 @@ 
         $response['error']      = null;
         $response['data']       = null;
 
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
-            $response['error'] = __( 'Invalid access!', 'invoicing' );
-            wp_send_json( $response );
+        if (!wpinv_current_user_can_manage_invoicing()) {
+            $response['error'] = __('Invalid access!', 'invoicing');
+            wp_send_json($response);
         }
 
-        $group      = !empty( $_POST['group'] ) ? sanitize_text_field( $_POST['group'] ) : '';
-        $euvatrates = self::request_euvatrates( $group );
+        $group      = !empty($_POST['group']) ? sanitize_text_field($_POST['group']) : '';
+        $euvatrates = self::request_euvatrates($group);
 
-        if ( !empty( $euvatrates ) ) {
-            if ( !empty( $euvatrates['success'] ) && !empty( $euvatrates['rates'] ) ) {
+        if (!empty($euvatrates)) {
+            if (!empty($euvatrates['success']) && !empty($euvatrates['rates'])) {
                 $response['success']        = true;
                 $response['data']['rates']  = $euvatrates['rates'];
-            } else if ( !empty( $euvatrates['error'] ) ) {
+            } else if (!empty($euvatrates['error'])) {
                 $response['error']          = $euvatrates['error'];
             }
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
 
     public static function hide_vat_fields() {
-        $hide = wpinv_get_option( 'vat_disable_fields' );
+        $hide = wpinv_get_option('vat_disable_fields');
 
-        return apply_filters( 'wpinv_hide_vat_fields', $hide );
+        return apply_filters('wpinv_hide_vat_fields', $hide);
     }
 
     public static function same_country_rule() {
-        $same_country_rule = wpinv_get_option( 'vat_same_country_rule' );
+        $same_country_rule = wpinv_get_option('vat_same_country_rule');
 
-        return apply_filters( 'wpinv_vat_same_country_rule', $same_country_rule );
+        return apply_filters('wpinv_vat_same_country_rule', $same_country_rule);
     }
 
     /**
      * Retrieves the vat name.
      */
     public function get_vat_name() {
-        $vat_name = wpinv_get_option( 'vat_name' );
-        return empty( $vat_name ) ? __( 'VAT', 'invoicing' ) : sanitize_text_field( $vat_name );
+        $vat_name = wpinv_get_option('vat_name');
+        return empty($vat_name) ? __('VAT', 'invoicing') : sanitize_text_field($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;
         }
@@ -953,140 +953,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;
                 }
@@ -1096,75 +1096,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;
                     }
                 }
@@ -1176,62 +1176,62 @@ 
         }
     }
 
-    public static function check_vat( $vat_number, $country_code = '' ) {
+    public static function check_vat($vat_number, $country_code = '') {
         $vat_name           = getpaid_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'] );
-                if ( isset( $body->rates ) ) {
+                $body = json_decode($api_response['body']);
+                if (isset($body->rates)) {
                     $rates = array();
 
-                    foreach ( $body->rates as $country_code => $rate ) {
+                    foreach ($body->rates as $country_code => $rate) {
                         $vat_rate = array();
                         $vat_rate['country']        = $rate->country;
-                        $vat_rate['standard']       = (float)$rate->standard_rate;
-                        $vat_rate['reduced']        = (float)$rate->reduced_rate;
-                        $vat_rate['superreduced']   = (float)$rate->super_reduced_rate;
-                        $vat_rate['parking']        = (float)$rate->parking_rate;
+                        $vat_rate['standard']       = (float) $rate->standard_rate;
+                        $vat_rate['reduced']        = (float) $rate->reduced_rate;
+                        $vat_rate['superreduced']   = (float) $rate->super_reduced_rate;
+                        $vat_rate['parking']        = (float) $rate->parking_rate;
 
-                        if ( $group !== '' && in_array( $group, array( 'standard', 'reduced', 'superreduced', 'parking' ) ) ) {
+                        if ($group !== '' && in_array($group, array('standard', 'reduced', 'superreduced', 'parking'))) {
                             $vat_rate_group = array();
                             $vat_rate_group['country'] = $rate->country;
                             $vat_rate_group[$group]    = $vat_rate[$group];
@@ -1243,79 +1243,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( wpinv_get_default_country() ) || $is_digital ) ) || ( self::is_gst_country( $country_code ) && self::is_gst_country( wpinv_get_default_country() ) );
+        if (!empty($country_code)) {
+            $requires_vat = (self::is_eu_state($country_code) && (self::is_eu_state(wpinv_get_default_country()) || $is_digital)) || (self::is_gst_country($country_code) && self::is_gst_country(wpinv_get_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;
             }
@@ -1326,15 +1326,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'];
         }
 
@@ -1350,107 +1350,107 @@ 
             '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' ),
-            '_exempt' => __( 'Tax-Free Product', 'invoicing' ),
+            'digital' => __('Digital Product', 'invoicing'),
+            'physical' => __('Physical Product', 'invoicing'),
+            '_exempt' => __('Tax-Free 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;
                 }
@@ -1462,71 +1462,71 @@ 
         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;
         }
 
-        if ( !empty( $item_id ) && self::get_item_rule( $item_id ) == '_exempt' ) {
+        if (!empty($item_id) && self::get_item_rule($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);
                     }
                 }
             }
@@ -1535,84 +1535,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_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);
             }
         }
 
@@ -1620,48 +1620,48 @@ 
     }
 
     public static function current_vat_data() {
-        return getpaid_session()->get( 'user_vat_data' );
+        return getpaid_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 ) {
@@ -1672,38 +1672,38 @@ 
         }
         */
 
-        return apply_filters('wpinv_get_user_vat_number', $vat_number, $user_id, $is_valid );
+        return apply_filters('wpinv_get_user_vat_number', $vat_number, $user_id, $is_valid);
     }
 
-    public static function get_user_company( $company = '', $user_id = 0 ) {
+    public static function get_user_company($company = '', $user_id = 0) {
         global $wpi_current_id, $wpi_userID;
 
-        if ( empty( $user_id ) ) {
-            $user_id = !empty( $wpi_userID ) ? $wpi_userID : ( $wpi_current_id ? wpinv_get_user_id( $wpi_current_id ) : get_current_user_id() );
+        if (empty($user_id)) {
+            $user_id = !empty($wpi_userID) ? $wpi_userID : ($wpi_current_id ? wpinv_get_user_id($wpi_current_id) : get_current_user_id());
         }
 
-        $company = empty( $user_id ) ? "" : get_user_meta( $user_id, '_wpinv_company', true );
+        $company = empty($user_id) ? "" : get_user_meta($user_id, '_wpinv_company', true);
 
-        return apply_filters( 'wpinv_user_company', $company, $user_id );
+        return apply_filters('wpinv_user_company', $company, $user_id);
     }
 
-    public static function save_user_vat_details( $company = '', $vat_number = '' ) {
-        $save = apply_filters( 'wpinv_allow_save_user_vat_details', true );
+    public static function save_user_vat_details($company = '', $vat_number = '') {
+        $save = apply_filters('wpinv_allow_save_user_vat_details', true);
 
-        if ( is_user_logged_in() && $save ) {
+        if (is_user_logged_in() && $save) {
             $user_id = get_current_user_id();
 
-            if ( !empty( $vat_number ) ) {
-                update_user_meta( $user_id, '_wpinv_vat_number', $vat_number );
+            if (!empty($vat_number)) {
+                update_user_meta($user_id, '_wpinv_vat_number', $vat_number);
             } else {
-                delete_user_meta( $user_id, '_wpinv_vat_number');
+                delete_user_meta($user_id, '_wpinv_vat_number');
             }
 
-            if ( !empty( $company ) ) {
-                update_user_meta( $user_id, '_wpinv_company', $company );
+            if (!empty($company)) {
+                update_user_meta($user_id, '_wpinv_company', $company);
             } else {
-                delete_user_meta( $user_id, '_wpinv_company');
-                delete_user_meta( $user_id, '_wpinv_vat_number');
+                delete_user_meta($user_id, '_wpinv_company');
+                delete_user_meta($user_id, '_wpinv_vat_number');
             }
         }
 
@@ -1716,74 +1716,74 @@ 
         $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();
 
-        $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 = getpaid_session()->get( 'user_vat_data' );
-        if ( !is_array( $vat_info ) || empty( $vat_info ) ) {
-            $vat_info = array( 'company'=> $company, 'number' => '', 'valid' => true );
+        $vat_info = getpaid_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 ) ) {
-            $response['error'] = wp_sprintf( __( 'Please enter your %s number!', 'invoicing' ), $vat_name );
+        if (empty($vat_number)) {
+            $response['error'] = wp_sprintf(__('Please enter your %s number!', 'invoicing'), $vat_name);
             $vat_info['valid'] = false;
-            getpaid_session()->set( 'user_vat_data', $vat_info );
-            wp_send_json( $response );
+            getpaid_session()->set('user_vat_data', $vat_info);
+            wp_send_json($response);
         }
 
-        if ( empty( $company ) ) {
+        if (empty($company)) {
             $vat_info['valid'] = false;
-            getpaid_session()->set( 'user_vat_data', $vat_info );
+            getpaid_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;
-                getpaid_session()->set( 'user_vat_data', $vat_info );
+                getpaid_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;
-                getpaid_session()->set( 'user_vat_data', $vat_info );
+                getpaid_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);
             }
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
 
     /**
@@ -1791,16 +1791,16 @@ 
      * 
      * @return string
      */
-    public static function validate_vat_number( $vat_number, $company, $country ) {
+    public static function validate_vat_number($vat_number, $company, $country) {
         global $wpinv_options;
 
         // If we are not checking the vat number via view...
-        if ( ! empty( $wpinv_options['vat_vies_check'] ) ) {
+        if (!empty($wpinv_options['vat_vies_check'])) {
 
             // Try validating via regex.
-            if ( empty( $wpinv_options['vat_offline_check'] ) && ! self::offline_check( $vat_number, $country ) ) {
+            if (empty($wpinv_options['vat_offline_check']) && !self::offline_check($vat_number, $country)) {
                 return wp_sprintf(
-                    __( 'Your %s number is invalid', 'invoicing' ),
+                    __('Your %s number is invalid', 'invoicing'),
                     getpaid_vat_name()
                 );
             }
@@ -1809,23 +1809,23 @@ 
         }
 
         // Validate the vat number.
-        $result = self::check_vat( $vat_number, $country );
+        $result = self::check_vat($vat_number, $country);
 
-        if ( empty( $result['valid'] ) ) {
+        if (empty($result['valid'])) {
             return wp_sprintf(
-                __( 'Failed to validate the %s number via EU Commission VAT server (VIES).', 'invoicing' ),
+                __('Failed to validate the %s number via EU Commission VAT server (VIES).', 'invoicing'),
                 getpaid_vat_name()
             );
         }
 
         // Validate the 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;
+        $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;
 
-        if ( ! $valid_company && ! empty( $wpinv_options['vat_disable_company_name_check'] ) ) {
+        if (!$valid_company && !empty($wpinv_options['vat_disable_company_name_check'])) {
            return wp_sprintf(
-                __( 'The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing' ),
+                __('The company name associated with the %s number provided is not the same as the company name provided.', 'invoicing'),
                 getpaid_vat_name()
             );
         }

templates/payment-forms/elements/ip_address.php

Spacing +6 added lines, -6 removed lines

@@ -7,17 +7,17 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( empty( $text ) ) {
-    $text = __( 'Your IP address is:', 'invoicing' );
+if (empty($text)) {
+    $text = __('Your IP address is:', 'invoicing');
 }
 
-$ip_address = sanitize_text_field( wpinv_get_ip() );
-$url        = esc_url( getpaid_ip_location_url( $ip_address ) );
+$ip_address = sanitize_text_field(wpinv_get_ip());
+$url        = esc_url(getpaid_ip_location_url($ip_address));
 
 ?>
 <div class="form-group getpaid-ip-info">
-    <span><?php echo wp_kses_post( $text ); ?></span>
+    <span><?php echo wp_kses_post($text); ?></span>
     <a target='_blank' href='<?php echo $url; ?>'><?php echo $ip_address; ?>&nbsp;&nbsp;<i class='fa fa-external-link-square' aria-hidden='true'></i></a>
 </div>

templates/geolocation.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 
 ?><!DOCTYPE html>
@@ -16,14 +16,14 @@ 
 
     <head>
 
-		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta charset="<?php bloginfo('charset'); ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" >
 
         <meta name="robots" content="noindex,nofollow">
 
 		<link rel="profile" href="https://gmpg.org/xfn/11">
 
-        <title><?php _e( 'GetPaid GeoLocation', 'invoicing' ); ?></title>
+        <title><?php _e('GetPaid GeoLocation', 'invoicing'); ?></title>
 
         <link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" />
         <script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"></script>
@@ -69,7 +69,7 @@ 
             var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
                 osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
                 osm = L.tileLayer( osmUrl, { maxZoom: 18, attribution: osmAttrib } ),
-                latlng = new L.LatLng( <?php echo sanitize_text_field( $latitude );?>, <?php echo sanitize_text_field( $longitude );?> );
+                latlng = new L.LatLng( <?php echo sanitize_text_field($latitude); ?>, <?php echo sanitize_text_field($longitude); ?> );
 
             var map = new L.Map( 'map', {center: latlng, zoom: 18, layers: [osm]});
 
@@ -77,11 +77,11 @@ 
             map.addLayer(marker);
 
             marker
-                .bindPopup("<p><?php echo esc_attr( $address );?></p>")
+                .bindPopup("<p><?php echo esc_attr($address); ?></p>")
                 .openPopup();
         </script>
 
-        <div style="height:100px"><?php echo wp_kses_post( $content ); ?></div>
+        <div style="height:100px"><?php echo wp_kses_post($content); ?></div>
 
     </body>
 

templates/payment-forms/cart-totals.php

Spacing +31 added lines, -31 removed lines

@@ -7,16 +7,16 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Totals rows.
 $totals = apply_filters(
     'getpaid_payment_form_cart_table_totals',
     array(
-        'subtotal' => __( 'Subtotal', 'invoicing' ),
-        'tax'      => __( 'Tax', 'invoicing' ),
-        'discount' => __( 'Discount', 'invoicing' ),
-        'total'    => __( 'Total', 'invoicing' ),
+        'subtotal' => __('Subtotal', 'invoicing'),
+        'tax'      => __('Tax', 'invoicing'),
+        'discount' => __('Discount', 'invoicing'),
+        'total'    => __('Total', 'invoicing'),
     ),
     $form
 );
@@ -24,15 +24,15 @@ 
 $currency = $form->get_currency();
 $country  = wpinv_get_default_country();
 
-if ( ! empty( $form->invoice ) ) {
-    $country  = $form->invoice->get_country();
+if (!empty($form->invoice)) {
+    $country = $form->invoice->get_country();
 }
 
-if ( ! wpinv_use_taxes() && isset( $totals['tax'] ) ) {
-    unset( $totals['tax'] );
+if (!wpinv_use_taxes() && isset($totals['tax'])) {
+    unset($totals['tax']);
 }
 
-do_action( 'getpaid_before_payment_form_cart_totals', $form, $totals );
+do_action('getpaid_before_payment_form_cart_totals', $form, $totals);
 
 $tax       = 0;
 $sub_total = 0;
@@ -40,9 +40,9 @@ 
 $discount  = 0;
 
 // Calculate totals.
-foreach ( $form->get_items() as $item ) {
+foreach ($form->get_items() as $item) {
 
-    if ( ! empty( $form->invoice ) && 'amount' == $form->invoice->get_template() ) {
+    if (!empty($form->invoice) && 'amount' == $form->invoice->get_template()) {
         $amount = $item->get_price();
     } else {
         $amount = $item->get_sub_total();
@@ -50,11 +50,11 @@ 
 
 
     // Include the tax.
-    if ( wpinv_use_taxes() ) {
-        $rate = wpinv_get_tax_rate( $country, false, $item->get_id() );
+    if (wpinv_use_taxes()) {
+        $rate = wpinv_get_tax_rate($country, false, $item->get_id());
 
-        if ( wpinv_prices_include_tax() ) {
-            $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+        if (wpinv_prices_include_tax()) {
+            $pre_tax  = ($amount - $amount * $rate * 0.01);
             $item_tax = $amount - $pre_tax;
         } else {
             $pre_tax  = $amount;
@@ -66,41 +66,41 @@ 
         $total     = $sub_total + $tax;
 
     } else {
-        $total  = $total + $amount;
+        $total = $total + $amount;
     }
 
 }
 
 ?>
 <div class='border-top getpaid-payment-form-items-cart-totals'>
-    <?php foreach ( $totals as $key => $label ) : ?>
-        <div class="getpaid-form-cart-totals-col getpaid-form-cart-totals-<?php echo esc_attr( $key ); ?>">
+    <?php foreach ($totals as $key => $label) : ?>
+        <div class="getpaid-form-cart-totals-col getpaid-form-cart-totals-<?php echo esc_attr($key); ?>">
             <div class="row">
                 <div class="col-12 offset-sm-5 col-sm-4">
-                    <?php echo sanitize_text_field( $label ); ?>
+                    <?php echo sanitize_text_field($label); ?>
                 </div>
-                <div class="col-12 col-sm-3 getpaid-form-cart-totals-total-<?php echo esc_attr( $key ); ?>">
+                <div class="col-12 col-sm-3 getpaid-form-cart-totals-total-<?php echo esc_attr($key); ?>">
                     <?php
-                        do_action( "getpaid_payment_form_cart_totals_$key", $form );
+                        do_action("getpaid_payment_form_cart_totals_$key", $form);
 
                         // Total tax.
-                        if ( 'tax' == $key ) {
-                            echo wpinv_price( wpinv_format_amount( $tax ), $currency );
+                        if ('tax' == $key) {
+                            echo wpinv_price(wpinv_format_amount($tax), $currency);
                         }
 
                         // Total discount.
-                        if ( 'discount' == $key ) {
-                            echo wpinv_price( wpinv_format_amount( $discount ), $currency );
+                        if ('discount' == $key) {
+                            echo wpinv_price(wpinv_format_amount($discount), $currency);
                         }
 
                         // Sub total.
-                        if ( 'subtotal' == $key ) {
-                            echo wpinv_price( wpinv_format_amount( $sub_total ), $currency );
+                        if ('subtotal' == $key) {
+                            echo wpinv_price(wpinv_format_amount($sub_total), $currency);
                         }
 
                         // Total.
-                        if ( 'total' == $key ) {
-                            echo wpinv_price( wpinv_format_amount( $total ), $currency );
+                        if ('total' == $key) {
+                            echo wpinv_price(wpinv_format_amount($total), $currency);
                         }
                     ?>
                 </div>
@@ -110,4 +110,4 @@ 
 </div>
 
 <?php
-do_action(  'getpaid_payment_form_cart_totals', $form, $totals );
+do_action('getpaid_payment_form_cart_totals', $form, $totals);

includes/gateways/class-getpaid-bank-transfer-gateway.php

Spacing +66 added lines, -66 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Bank transfer Payment Gateway class.
@@ -32,14 +32,14 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title                = __( 'Direct bank transfer', 'invoicing' );
-        $this->method_title         = __( 'Bank transfer', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed', 'invoicing' );
-        $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
+        $this->title                = __('Direct bank transfer', 'invoicing');
+        $this->method_title         = __('Bank transfer', 'invoicing');
+        $this->checkout_button_text = __('Proceed', 'invoicing');
+        $this->instructions         = apply_filters('wpinv_bank_instructions', $this->get_option('info'));
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+		add_action('wpinv_receipt_end', array($this, 'thankyou_page'));
+		add_action('getpaid_invoice_line_items', array($this, 'thankyou_page'), 40);
+		add_action('wpinv_email_invoice_details', array($this, 'email_instructions'), 10, 3);
 
     }
 
@@ -52,23 +52,23 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Add a transaction id.
-        $invoice->set_transaction_id( $invoice->generate_key('trans_') );
+        $invoice->set_transaction_id($invoice->generate_key('trans_'));
 
         // Set it as pending payment.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-        } else if ( ! $invoice->is_paid() ) {
-            $invoice->set_status( 'wpi-onhold' );
+        } else if (!$invoice->is_paid()) {
+            $invoice->set_status('wpi-onhold');
         }
 
         // Save it.
         $invoice->save();
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -77,17 +77,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function thankyou_page( $invoice ) {
+	public function thankyou_page($invoice) {
 
-        if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ('bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
-            if ( ! empty( $this->instructions ) ) {
-                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
+            if (!empty($this->instructions)) {
+                echo wp_kses_post(wpautop(wptexturize($this->instructions)));
 			}
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 			
 			echo '</div>';
         
@@ -102,17 +102,17 @@ 
 	 * @param string     $email_type Email format: plain text or HTML.
 	 * @param bool     $sent_to_admin Sent to admin.
 	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+	public function email_instructions($invoice, $email_type, $sent_to_admin) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+		if (!$sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+			if ($this->instructions) {
+				echo wp_kses_post(wpautop(wptexturize($this->instructions)) . PHP_EOL);
             }
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 			
 			echo '</div>';
 
@@ -125,51 +125,51 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function bank_details( $invoice ) {
+	protected function bank_details($invoice) {
 
 		// Get the invoice country and country $locale.
 		$country = $invoice->get_country();
 		$locale  = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
         $bank_fields = array(
-            'ac_name'     => __( 'Account Name', 'invoicing' ),
-            'ac_no'       => __( 'Account Number', 'invoicing' ),
-            'bank_name'   => __( 'Bank Name', 'invoicing' ),
-            'ifsc'        => __( 'IFSC code', 'invoicing' ),
-            'iban'        => __( 'IBAN', 'invoicing' ),
-            'bic'         => __( 'BIC/Swift code', 'invoicing' ),
+            'ac_name'     => __('Account Name', 'invoicing'),
+            'ac_no'       => __('Account Number', 'invoicing'),
+            'bank_name'   => __('Bank Name', 'invoicing'),
+            'ifsc'        => __('IFSC code', 'invoicing'),
+            'iban'        => __('IBAN', 'invoicing'),
+            'bic'         => __('BIC/Swift code', 'invoicing'),
             'sort_code'   => $sortcode,
         );
 
         $bank_info = array();
 
-        foreach ( $bank_fields as $field => $label ) {
-            $value = $this->get_option( $field );
+        foreach ($bank_fields as $field => $label) {
+            $value = $this->get_option($field);
 
-            if ( ! empty( $value ) ) {
-                $bank_info[$field] = array( 'label' => $label, 'value' => $value );
+            if (!empty($value)) {
+                $bank_info[$field] = array('label' => $label, 'value' => $value);
             }
 
         }
 
-        $bank_info = apply_filters( 'wpinv_bank_info', $bank_info );
+        $bank_info = apply_filters('wpinv_bank_info', $bank_info);
 
-        if ( empty( $bank_info ) ) {
+        if (empty($bank_info)) {
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
+		echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters('wpinv_receipt_bank_details_title', __('Bank Details', 'invoicing')) . '</h3>' . PHP_EOL;
 
 		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
+		foreach ($bank_info as $key => $data) {
 
-			$key   = sanitize_html_class( $key );
-			$label = wp_kses_post( $data['label'] );
-			$value = wp_kses_post( wptexturize( $data['value'] ) );
+			$key   = sanitize_html_class($key);
+			$label = wp_kses_post($data['label']);
+			$value = wp_kses_post(wptexturize($data['value']));
 
 			echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
 		}
@@ -185,7 +185,7 @@ 
 	 */
 	public function get_country_locale() {
 
-		if ( empty( $this->locale ) ) {
+		if (empty($this->locale)) {
 
 			// Locale information to be used - only those that are not 'Sort Code'.
 			$this->locale = apply_filters(
@@ -193,42 +193,42 @@ 
 				array(
 					'AU' => array(
 						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
+							'label' => __('BSB', 'invoicing'),
 						),
 					),
 					'CA' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
+							'label' => __('Bank transit number', 'invoicing'),
 						),
 					),
 					'IN' => array(
 						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
+							'label' => __('IFSC', 'invoicing'),
 						),
 					),
 					'IT' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
+							'label' => __('Branch sort', 'invoicing'),
 						),
 					),
 					'NZ' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'SE' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'US' => array(
 						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
+							'label' => __('Routing number', 'invoicing'),
 						),
 					),
 					'ZA' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
+							'label' => __('Branch code', 'invoicing'),
 						),
 					),
 				)
@@ -245,51 +245,51 @@ 
 	 * 
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
-        $admin_settings['worldpay_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['worldpay_desc']['std'] = __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing');
+		$admin_settings['worldpay_active']['desc'] = __('Enable bank transfer', 'invoicing');
 
-		$locale  = $this->get_country_locale();
+		$locale = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
 		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
 		$admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
-            'name' => __( 'Account Name', 'invoicing' ),
+            'name' => __('Account Name', 'invoicing'),
 		);
 		
 		$admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
-            'name' => __( 'Account Number', 'invoicing' ),
+            'name' => __('Account Number', 'invoicing'),
 		);
 		
 		$admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
-            'name' => __( 'Bank Name', 'invoicing' ),
+            'name' => __('Bank Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
-            'name' => __( 'IFSC Code', 'invoicing' ),
+            'name' => __('IFSC Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
-            'name' => __( 'IBAN', 'invoicing' ),
+            'name' => __('IBAN', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
-            'name' => __( 'BIC/Swift Code', 'invoicing' ),
+            'name' => __('BIC/Swift Code', 'invoicing'),
 		);
 		
 		$admin_settings['bank_transfer_sort_code'] = array(
@@ -300,10 +300,10 @@ 
 
 		$admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
-            'name' => __( 'Instructions', 'invoicing' ),
-            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'name' => __('Instructions', 'invoicing'),
+            'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
             'type' => 'textarea',
-            'std'  => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
+            'std'  => __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing'),
             'cols' => 50,
             'rows' => 5
         );

Indentation +159 added lines, -159 removed lines

@@ -13,23 +13,23 @@ 
 class GetPaid_Bank_Transfer_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'bank_transfer';
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 8;
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 8;
     
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title                = __( 'Direct bank transfer', 'invoicing' );
@@ -37,22 +37,22 @@ 
         $this->checkout_button_text = __( 'Proceed', 'invoicing' );
         $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+        add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
+        add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
+        add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Add a transaction id.
         $invoice->set_transaction_id( $invoice->generate_key('trans_') );
@@ -73,66 +73,66 @@ 
     }
 
     /**
-	 * Output for the order received page.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function thankyou_page( $invoice ) {
+     * Output for the order received page.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function thankyou_page( $invoice ) {
 
         if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
+            echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
             if ( ! empty( $this->instructions ) ) {
                 echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
-			}
+            }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 			
-			echo '</div>';
+            echo '</div>';
         
         }
 
-	}
+    }
     
     /**
-	 * Add content to the WPI emails.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param string     $email_type Email format: plain text or HTML.
-	 * @param bool     $sent_to_admin Sent to admin.
-	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+     * Add content to the WPI emails.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param string     $email_type Email format: plain text or HTML.
+     * @param bool     $sent_to_admin Sent to admin.
+     */
+    public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
+            echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+            if ( $this->instructions ) {
+                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
             }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 			
-			echo '</div>';
+            echo '</div>';
 
-		}
+        }
 
     }
     
     /**
-	 * Get bank details and place into a list format.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function bank_details( $invoice ) {
+     * Get bank details and place into a list format.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    protected function bank_details( $invoice ) {
 
-		// Get the invoice country and country $locale.
-		$country = $invoice->get_country();
-		$locale  = $this->get_country_locale();
+        // Get the invoice country and country $locale.
+        $country = $invoice->get_country();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
         $bank_fields = array(
             'ac_name'     => __( 'Account Name', 'invoicing' ),
@@ -161,144 +161,144 @@ 
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
+        echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
 
-		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+        echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
+        foreach ( $bank_info as $key => $data ) {
 
-			$key   = sanitize_html_class( $key );
-			$label = wp_kses_post( $data['label'] );
-			$value = wp_kses_post( wptexturize( $data['value'] ) );
+            $key   = sanitize_html_class( $key );
+            $label = wp_kses_post( $data['label'] );
+            $value = wp_kses_post( wptexturize( $data['value'] ) );
 
-			echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
-		}
+            echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
+        }
 
-		echo '</table>';
+        echo '</table>';
 
     }
     
     /**
-	 * Get country locale if localized.
-	 *
-	 * @return array
-	 */
-	public function get_country_locale() {
-
-		if ( empty( $this->locale ) ) {
-
-			// Locale information to be used - only those that are not 'Sort Code'.
-			$this->locale = apply_filters(
-				'getpaid_get_bank_transfer_locale',
-				array(
-					'AU' => array(
-						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
-						),
-					),
-					'CA' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
-						),
-					),
-					'IN' => array(
-						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
-						),
-					),
-					'IT' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
-						),
-					),
-					'NZ' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'SE' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'US' => array(
-						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
-						),
-					),
-					'ZA' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
-						),
-					),
-				)
-			);
-
-		}
-
-		return $this->locale;
-
-	}
-
-	/**
-	 * Filters the gateway settings.
-	 * 
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Get country locale if localized.
+     *
+     * @return array
+     */
+    public function get_country_locale() {
+
+        if ( empty( $this->locale ) ) {
+
+            // Locale information to be used - only those that are not 'Sort Code'.
+            $this->locale = apply_filters(
+                'getpaid_get_bank_transfer_locale',
+                array(
+                    'AU' => array(
+                        'sortcode' => array(
+                            'label' => __( 'BSB', 'invoicing' ),
+                        ),
+                    ),
+                    'CA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank transit number', 'invoicing' ),
+                        ),
+                    ),
+                    'IN' => array(
+                        'sortcode' => array(
+                            'label' => __( 'IFSC', 'invoicing' ),
+                        ),
+                    ),
+                    'IT' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch sort', 'invoicing' ),
+                        ),
+                    ),
+                    'NZ' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'SE' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'US' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Routing number', 'invoicing' ),
+                        ),
+                    ),
+                    'ZA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch code', 'invoicing' ),
+                        ),
+                    ),
+                )
+            );
+
+        }
+
+        return $this->locale;
+
+    }
+
+    /**
+     * Filters the gateway settings.
+     * 
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $admin_settings['worldpay_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
 
-		$locale  = $this->get_country_locale();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $country  = wpinv_default_billing_country();
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
-		$admin_settings['bank_transfer_ac_name'] = array(
+        $admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
             'name' => __( 'Account Name', 'invoicing' ),
-		);
+        );
 		
-		$admin_settings['bank_transfer_ac_no'] = array(
+        $admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
             'name' => __( 'Account Number', 'invoicing' ),
-		);
+        );
 		
-		$admin_settings['bank_transfer_bank_name'] = array(
+        $admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
             'name' => __( 'Bank Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ifsc'] = array(
+        $admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
             'name' => __( 'IFSC Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_iban'] = array(
+        $admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
             'name' => __( 'IBAN', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bic'] = array(
+        $admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
             'name' => __( 'BIC/Swift Code', 'invoicing' ),
-		);
+        );
 		
-		$admin_settings['bank_transfer_sort_code'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_sort_code',
-			'name' => $sortcode,
-		);
+        $admin_settings['bank_transfer_sort_code'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_sort_code',
+            'name' => $sortcode,
+        );
 
-		$admin_settings['bank_transfer_info'] = array(
+        $admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
             'name' => __( 'Instructions', 'invoicing' ),
             'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
@@ -308,7 +308,7 @@ 
             'rows' => 5
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
 }

includes/gateways/class-getpaid-worldpay-gateway.php

Indentation +94 added lines, -94 removed lines

@@ -13,65 +13,65 @@ 
 class GetPaid_Worldpay_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'worldpay';
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
+     * Payment method order.
+     *
+     * @var int
+     */
     public $order = 5;
 
     /**
-	 * Endpoint for requests from Worldpay.
-	 *
-	 * @var string
-	 */
-	protected $notify_url;
-
-	/**
-	 * Endpoint for requests to Worldpay.
-	 *
-	 * @var string
-	 */
+     * Endpoint for requests from Worldpay.
+     *
+     * @var string
+     */
+    protected $notify_url;
+
+    /**
+     * Endpoint for requests to Worldpay.
+     *
+     * @var string
+     */
     protected $endpoint;
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'sandbox' );
     
     /**
-	 * Currencies this gateway is allowed for.
-	 *
-	 * @var array
-	 */
-	public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
+     * Currencies this gateway is allowed for.
+     *
+     * @var array
+     */
+    public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
 
     /**
-	 * URL to view a transaction.
-	 *
-	 * @var string
-	 */
+     * URL to view a transaction.
+     *
+     * @var string
+     */
     public $view_transaction_url = 'https://www.{sandbox}paypal.com/activity/payment/%s';
 
     /**
-	 * URL to view a subscription.
-	 *
-	 * @var string
-	 */
-	public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
+     * URL to view a subscription.
+     *
+     * @var string
+     */
+    public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
 
         $this->method_title         = __( 'Worldpay', 'invoicing' );
         $this->title                = __( 'Worldpay - Credit Card / Debit Card', 'invoicing' );
@@ -85,15 +85,15 @@ 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Get redirect url.
         $worldpay_redirect = esc_url( $this->get_request_url( $invoice ) );
@@ -128,31 +128,31 @@ 
     }
 
     /**
-	 * Get the Worldpay request URL for an invoice.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return string
-	 */
-	public function get_request_url( $invoice ) {
+     * Get the Worldpay request URL for an invoice.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return string
+     */
+    public function get_request_url( $invoice ) {
 
         // Endpoint for this request
-		$this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+        $this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
 
         return $this->endpoint;
 
-	}
+    }
 
     /**
-	 * Get Worldpay Args for passing to Worldpay.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_worldpay_args( $invoice ) {
-
-		return apply_filters(
-			'getpaid_worldpay_args',
-			array(
+     * Get Worldpay Args for passing to Worldpay.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    protected function get_worldpay_args( $invoice ) {
+
+        return apply_filters(
+            'getpaid_worldpay_args',
+            array(
                 'amount'         => wpinv_sanitize_amount( $invoice->get_total() ), // mandatory
                 'cartId'         => wpinv_clean( $invoice->get_number() ), // mandatory reference for the item purchased
                 'currency'       => wpinv_clean( $invoice->get_currency() ), // mandatory
@@ -177,18 +177,18 @@ 
                 'countryString'  => wpinv_clean( wpinv_country_name( $invoice->get_country() ) ),
                 'compName'       => wpinv_clean( $invoice->get_company() ),
             ),
-			$invoice
-		);
+            $invoice
+        );
 
     }
 
     /**
-	 * Secures worldpay args with an md5 hash.
-	 *
-	 * @param  array $args Gateway args.
-	 * @return array
-	 */
-	public function hash_args( $args ) {
+     * Secures worldpay args with an md5 hash.
+     *
+     * @param  array $args Gateway args.
+     * @return array
+     */
+    public function hash_args( $args ) {
 
         $md5_secret = $this->get_option( 'md5_secret' );
 
@@ -204,16 +204,16 @@ 
     }
 
     /**
-	 * Processes ipns and marks payments as complete.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {
+     * Processes ipns and marks payments as complete.
+     *
+     * @return void
+     */
+    public function verify_ipn() {
 
         // Validate the IPN.
         if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
-		}
+            wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
+        }
 
         // Process the IPN.
         $posted  = wp_unslash( $_POST );
@@ -229,8 +229,8 @@ 
                 $invoice->set_transaction_id( wpinv_clean( $posted['transId'] ) );
             }
 
-             // Update the ip address.
-             if ( ! empty( $posted['ipAddress'] ) ) {
+                // Update the ip address.
+                if ( ! empty( $posted['ipAddress'] ) ) {
                 $invoice->set_ip( wpinv_clean( $posted['ipAddress'] ) );
             }
 
@@ -257,9 +257,9 @@ 
     }
 
     /**
-	 * Check Worldpay IPN validity.
-	 */
-	public function validate_ipn() {
+     * Check Worldpay IPN validity.
+     */
+    public function validate_ipn() {
 
         wpinv_error_log( 'Validating Worldpay IPN response' );
 
@@ -305,11 +305,11 @@ 
     }
 
     /**
-	 * Filters the gateway settings.
-	 * 
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Filters the gateway settings.
+     * 
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $currencies = sprintf(
             __( 'Supported Currencies: %s', 'invoicing' ),
@@ -350,7 +350,7 @@ 
             'readonly' => true
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
 }

Spacing +86 added lines, -86 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Worldpay Payment Gateway class.
@@ -45,14 +45,14 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'sandbox' );
+    protected $supports = array('sandbox');
     
     /**
 	 * Currencies this gateway is allowed for.
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
+	public $currencies = array('AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR');
 
     /**
 	 * URL to view a transaction.
@@ -73,13 +73,13 @@ 
 	 */
 	public function __construct() {
 
-        $this->method_title         = __( 'Worldpay', 'invoicing' );
-        $this->title                = __( 'Worldpay - Credit Card / Debit Card', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to Worldpay', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->method_title         = __('Worldpay', 'invoicing');
+        $this->title                = __('Worldpay - Credit Card / Debit Card', 'invoicing');
+        $this->checkout_button_text = __('Proceed to Worldpay', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-        add_filter( 'wpinv_gateway_description', array( $this, 'sandbox_notice' ), 10, 2 );
-        add_filter( 'getpaid_worldpay_args', array( $this, 'hash_args' ) );
+        add_filter('wpinv_gateway_description', array($this, 'sandbox_notice'), 10, 2);
+        add_filter('getpaid_worldpay_args', array($this, 'hash_args'));
 
         parent::__construct();
     }
@@ -93,24 +93,24 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Get redirect url.
-        $worldpay_redirect = esc_url( $this->get_request_url( $invoice ) );
+        $worldpay_redirect = esc_url($this->get_request_url($invoice));
 
         // Get submission args.
-        $worldpay_args     = $this->get_worldpay_args( $invoice );
+        $worldpay_args     = $this->get_worldpay_args($invoice);
 
         $form = "<form action='$worldpay_redirect' name='wpi_worldpay_form' method='POST'>";
 
-        foreach ( $worldpay_args as $key => $value ) {
+        foreach ($worldpay_args as $key => $value) {
 
-            if ( false === $value || '' === trim( $value ) ) {
+            if (false === $value || '' === trim($value)) {
                 continue;
             }
 
-            $value = esc_attr( $value );
-            $key   = wpinv_clean( $key );
+            $value = esc_attr($value);
+            $key   = wpinv_clean($key);
             $form .= "<input type='hidden' name='$key' value='$value'>";
         }
 
@@ -133,10 +133,10 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
 
         return $this->endpoint;
 
@@ -148,34 +148,34 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_worldpay_args( $invoice ) {
+	protected function get_worldpay_args($invoice) {
 
 		return apply_filters(
 			'getpaid_worldpay_args',
 			array(
-                'amount'         => wpinv_sanitize_amount( $invoice->get_total() ), // mandatory
-                'cartId'         => wpinv_clean( $invoice->get_number() ), // mandatory reference for the item purchased
-                'currency'       => wpinv_clean( $invoice->get_currency() ), // mandatory
-                'instId'         => wpinv_clean( $this->get_option( 'instId', '' ) ), // mandatory
-                'testMode'       => $this->is_sandbox( $invoice ) ? 100 : 0, // mandatory
-                'name'           => wpinv_clean( $invoice->get_full_name() ),
-                'address'        => wpinv_clean( $invoice->get_address() ),
-                'postcode'       => wpinv_clean( $invoice->get_zip() ),
-                'tel'            => wpinv_clean( $invoice->get_phone() ),
-                'email'          => sanitize_email( $invoice->get_email() ),
-                'country'        => wpinv_clean( $invoice->get_country() ),
-                'desc'           => sprintf( __( 'Payment for invoice %s.', 'invoicing' ), wpinv_clean( $invoice->get_number() ) ),
-                'MC_description' => sprintf( __( 'Payment for invoice %s.', 'invoicing' ), wpinv_clean( $invoice->get_number() ) ),
-                'MC_callback'    => esc_url_raw( $this->notify_url ),
-                'resultfile'     => esc_url_raw( $this->get_return_url( $invoice ) ),
-                'MC_key'         => wpinv_clean( $invoice->get_key() ),
+                'amount'         => wpinv_sanitize_amount($invoice->get_total()), // mandatory
+                'cartId'         => wpinv_clean($invoice->get_number()), // mandatory reference for the item purchased
+                'currency'       => wpinv_clean($invoice->get_currency()), // mandatory
+                'instId'         => wpinv_clean($this->get_option('instId', '')), // mandatory
+                'testMode'       => $this->is_sandbox($invoice) ? 100 : 0, // mandatory
+                'name'           => wpinv_clean($invoice->get_full_name()),
+                'address'        => wpinv_clean($invoice->get_address()),
+                'postcode'       => wpinv_clean($invoice->get_zip()),
+                'tel'            => wpinv_clean($invoice->get_phone()),
+                'email'          => sanitize_email($invoice->get_email()),
+                'country'        => wpinv_clean($invoice->get_country()),
+                'desc'           => sprintf(__('Payment for invoice %s.', 'invoicing'), wpinv_clean($invoice->get_number())),
+                'MC_description' => sprintf(__('Payment for invoice %s.', 'invoicing'), wpinv_clean($invoice->get_number())),
+                'MC_callback'    => esc_url_raw($this->notify_url),
+                'resultfile'     => esc_url_raw($this->get_return_url($invoice)),
+                'MC_key'         => wpinv_clean($invoice->get_key()),
                 'MC_invoice_id'  => $invoice->get_id(),
-                'address1'       => wpinv_clean( $invoice->get_address() ),
-                'town'           => wpinv_clean( $invoice->get_city() ),
-                'region'         => wpinv_clean( $invoice->get_state() ),
-                'amountString'   => wpinv_price( wpinv_format_amount( $invoice->get_total() ), $invoice->get_currency() ),
-                'countryString'  => wpinv_clean( wpinv_country_name( $invoice->get_country() ) ),
-                'compName'       => wpinv_clean( $invoice->get_company() ),
+                'address1'       => wpinv_clean($invoice->get_address()),
+                'town'           => wpinv_clean($invoice->get_city()),
+                'region'         => wpinv_clean($invoice->get_state()),
+                'amountString'   => wpinv_price(wpinv_format_amount($invoice->get_total()), $invoice->get_currency()),
+                'countryString'  => wpinv_clean(wpinv_country_name($invoice->get_country())),
+                'compName'       => wpinv_clean($invoice->get_company()),
             ),
 			$invoice
 		);
@@ -188,17 +188,17 @@ 
 	 * @param  array $args Gateway args.
 	 * @return array
 	 */
-	public function hash_args( $args ) {
+	public function hash_args($args) {
 
-        $md5_secret = $this->get_option( 'md5_secret' );
+        $md5_secret = $this->get_option('md5_secret');
 
         // Abort if there is no secret.
-        if ( empty( $md5_secret ) ) {
+        if (empty($md5_secret)) {
             return $args;
         }
 
         // Hash the args.
-        $args['signature'] = md5( "$md5_secret:{$args['instId']}:{$args['amount']}:{$args['currency']}:{$args['cartId']}" );
+        $args['signature'] = md5("$md5_secret:{$args['instId']}:{$args['amount']}:{$args['currency']}:{$args['cartId']}");
 
         return $args;
     }
@@ -211,43 +211,43 @@ 
 	public function verify_ipn() {
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('Worldpay IPN Request Failure', 'Worldpay IPN', array('response' => 500));
 		}
 
         // Process the IPN.
-        $posted  = wp_unslash( $_POST );
-        $invoice = wpinv_get_invoice( $posted['MC_invoice_id'] );
+        $posted  = wp_unslash($_POST);
+        $invoice = wpinv_get_invoice($posted['MC_invoice_id']);
 
-        if ( $invoice && $this->id == $invoice->get_gateway() ) {
+        if ($invoice && $this->id == $invoice->get_gateway()) {
 
-            wpinv_error_log( 'Found invoice #' . $invoice->get_number() );
-            wpinv_error_log( 'Payment status:' . $posted['transStatus'] );
+            wpinv_error_log('Found invoice #' . $invoice->get_number());
+            wpinv_error_log('Payment status:' . $posted['transStatus']);
 
             // Update the transaction id.
-            if ( ! empty( $posted['transId'] ) ) {
-                $invoice->set_transaction_id( wpinv_clean( $posted['transId'] ) );
+            if (!empty($posted['transId'])) {
+                $invoice->set_transaction_id(wpinv_clean($posted['transId']));
             }
 
              // Update the ip address.
-             if ( ! empty( $posted['ipAddress'] ) ) {
-                $invoice->set_ip( wpinv_clean( $posted['ipAddress'] ) );
+             if (!empty($posted['ipAddress'])) {
+                $invoice->set_ip(wpinv_clean($posted['ipAddress']));
             }
 
-            if ( $posted['transStatus'] == 'Y' ) {
-                $invoice->set_completed_date( date( 'Y-m-d H:i:s', $posted['transTime'] ) );
+            if ($posted['transStatus'] == 'Y') {
+                $invoice->set_completed_date(date('Y-m-d H:i:s', $posted['transTime']));
                 $invoice->mark_paid();
                 return;
             }
 
-            if ( $posted['transStatus'] == 'C' ) {
-                $invoice->set_status( 'wpi-failed' );
-                $invoice->add_note( __( 'Payment transaction failed while processing Worldpay payment.', 'invoicing' ), false, false, true );
+            if ($posted['transStatus'] == 'C') {
+                $invoice->set_status('wpi-failed');
+                $invoice->add_note(__('Payment transaction failed while processing Worldpay payment.', 'invoicing'), false, false, true);
                 $invoice->save();
                 return;
             }
 
-            wpinv_error_log( 'Aborting, Invalid transaction status:' . $posted['transStatus'] );
+            wpinv_error_log('Aborting, Invalid transaction status:' . $posted['transStatus']);
             $invoice->save();
 
         }
@@ -261,27 +261,27 @@ 
 	 */
 	public function validate_ipn() {
 
-        wpinv_error_log( 'Validating Worldpay IPN response' );
+        wpinv_error_log('Validating Worldpay IPN response');
 
-        $data = wp_unslash( $_POST );
+        $data = wp_unslash($_POST);
 
         // Verify installation.
-        if ( empty( $data['instId'] ) || $data['instId'] != wpinv_clean( $this->get_option( 'instId', '' ) ) ) {
-            wpinv_error_log( 'Received invalid installation ID from Worldpay IPN' );
+        if (empty($data['instId']) || $data['instId'] != wpinv_clean($this->get_option('instId', ''))) {
+            wpinv_error_log('Received invalid installation ID from Worldpay IPN');
             return false;
         }
 
         // Verify invoice.
-        if ( empty( $data['cartId'] ) || !  wpinv_get_id_by_invoice_number( $data['cartId'] ) ) {
-            wpinv_error_log( 'Received invalid invoice number from Worldpay IPN' );
+        if (empty($data['cartId']) || !wpinv_get_id_by_invoice_number($data['cartId'])) {
+            wpinv_error_log('Received invalid invoice number from Worldpay IPN');
             return false;
         }
         
         // (maybe) verify password.
-        $password = $this->get_option( 'callback_password' );
+        $password = $this->get_option('callback_password');
 
-        if ( ! empty( $password ) && ( empty( $data['callbackPW'] ) || $password != $data['callbackPW'] ) ) {
-            wpinv_error_log( 'Received invalid invoice number from Worldpay IPN' );
+        if (!empty($password) && (empty($data['callbackPW']) || $password != $data['callbackPW'])) {
+            wpinv_error_log('Received invalid invoice number from Worldpay IPN');
             return false;
         }
 
@@ -292,10 +292,10 @@ 
     /**
      * Displays a notice on the checkout page if sandbox is enabled.
      */
-    public function sandbox_notice( $description, $gateway ) {
-        if ( 'worldpay' == $gateway && wpinv_is_test_mode( 'worldpay' ) ) {
+    public function sandbox_notice($description, $gateway) {
+        if ('worldpay' == $gateway && wpinv_is_test_mode('worldpay')) {
             $description .= '<br>' . sprintf(
-                __( 'SANDBOX ENABLED. See the %sWorldpay Sandbox Testing Guide%s for more details.', 'invoicing' ),
+                __('SANDBOX ENABLED. See the %sWorldpay Sandbox Testing Guide%s for more details.', 'invoicing'),
                 '<a href="https://developer.worldpay.com/docs/wpg/directintegration/abouttesting">',
                 '</a>'
             );
@@ -309,43 +309,43 @@ 
 	 * 
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['worldpay_active']['desc'] = $admin_settings['worldpay_active']['desc'] . " ($currencies)";
-        $admin_settings['worldpay_desc']['std']    = __( 'Pay securely via Worldpay using your PayPal account, credit or debit card.', 'invoicing' );
+        $admin_settings['worldpay_desc']['std']    = __('Pay securely via Worldpay using your PayPal account, credit or debit card.', 'invoicing');
 
         $admin_settings['worldpay_instId'] = array(
             'type' => 'text',
             'id'   => 'worldpay_instId',
-            'name' => __( 'Installation Id', 'invoicing' ),
-            'desc' => __( 'Your installation id. Ex: 211616', 'invoicing' ),
+            'name' => __('Installation Id', 'invoicing'),
+            'desc' => __('Your installation id. Ex: 211616', 'invoicing'),
         );
 
         $admin_settings['worldpay_md5_secret'] = array(
             'type' => 'text',
             'id'   => 'worldpay_md5_secret',
-            'name' => __( 'MD5 secret', 'invoicing' ),
-            'desc' => __( 'Optionally enter your MD5 secret here. Next, open your installation settings and ensure that your SignatureFields parameter is set to ', 'invoicing' ) . '<code>instId:amount:currency:cartId</code>',
+            'name' => __('MD5 secret', 'invoicing'),
+            'desc' => __('Optionally enter your MD5 secret here. Next, open your installation settings and ensure that your SignatureFields parameter is set to ', 'invoicing') . '<code>instId:amount:currency:cartId</code>',
         );
 
         $admin_settings['worldpay_callbackPW'] = array(
             'type' => 'text',
             'id'   => 'worldpay_callbackPW',
-            'name' => __( 'Payment Response password', 'invoicing' ),
-            'desc' => __( 'Recommended. Enter your WorldPay response password to validate payment notifications.', 'invoicing' ),
+            'name' => __('Payment Response password', 'invoicing'),
+            'desc' => __('Recommended. Enter your WorldPay response password to validate payment notifications.', 'invoicing'),
         );
 
         $admin_settings['worldpay_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'worldpay_ipn_url',
-            'name'     => __( 'Payment Response URL', 'invoicing' ),
+            'name'     => __('Payment Response URL', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( 'Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and enter the above URL.', 'invoicing' ),
+            'desc'     => __('Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and enter the above URL.', 'invoicing'),
             'custom'   => 'worldpay',
             'readonly' => true
         );

includes/data/invoice-schema.php

Indentation +621 added lines, -621 removed lines

@@ -13,629 +13,629 @@
 
 return array(
 
-	'id'              => array(
-		'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'parent_id'       => array(
-		'description' => __( 'Parent invoice ID.', 'invoicing' ),
-		'type'        => 'integer',
-		'minimum'     => 0,
-		'default'     => 0,
-		'context'     => array( 'view', 'edit' ),
-	),
-
-	'key'			  => array(
-		'description' => __( 'A unique key for the invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'number'		  => array(
-		'description' => __( 'A unique number for the invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'type'			  => array(
-		'description' => __( 'Get the invoice type (e.g invoice, quote etc).', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'post_type'		  => array(
-		'description' => __( 'Get the invoice post type (e.g wpi_invoice, wpi_quote etc).', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'version'         => array(
-		'description' => __( 'Version of GetPaid/Invoicing which last updated the invoice.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'template'        => array(
-		'description' => __( 'The invoice template.', 'invoicing' ),
-		'type'        => 'string',
-		'default'     => 'quantity',
-		'enum'        => array( 'quantity', 'hours', 'amount' ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'status'          => array(
-		'description' => __( 'Invoice status.', 'invoicing' ),
-		'type'        => 'string',
-		'default'     => 'wpi-pending',
-		'enum'        => array_keys( wpinv_get_invoice_statuses( true ) ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'status_nicename' => array(
-		'description' => __( 'A human readable name for the invoice status.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'currency'        => array(
-		'description' => __( 'The invoice currency in ISO format.', 'invoicing' ),
-		'type'        => 'string',
-		'default'     => wpinv_get_currency(),
-		'enum'        => array_keys( wpinv_get_currencies() ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'date_created'    => array(
-		'description' => __( "The date the invoice was created, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'date_created_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was created.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'date_modified'   => array(
-		'description' => __( "The date the invoice was last modified, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'date_modified_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was last modified.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'due_date'        => array(
-		'description' => __( "The invoice's due date, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'due_date_gmt'    => array(
-		'description' => __( 'The GMT date the invoice is/was due.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'completed_date'  => array(
-		'description' => __( "The date the invoice was paid, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'completed_date_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was paid.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'total_discount'   => array(
-		'description' => __( 'Total discount amount for the invoice.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'total_tax'       => array(
-		'description' => __( 'Total tax amount for the invoice.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'total_fees'      => array(
-		'description' => __( 'Total fees amount for the invoice.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'subtotal'        => array(
-		'description' => __( 'Invoice subtotal.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'total'           => array(
-		'description' => __( 'Grand total.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'initial_total'   => array(
-		'description' => __( 'Initial total (for recurring invoices).', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'recurring_total'  => array(
-		'description' => __( 'Recurring total (for recurring invoices).', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'totals'          => array(
-		'description' => __( 'Invoice totals.', 'invoicing' ),
-		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'fees'            => array(
-		'description' => __( 'Invoice fees (Name => properties).', 'invoicing' ),
-		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'required'            => array( 'amount' ),
-			'properties'          => array(
-				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time fee.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'discounts'       => array(
-		'description' => __( 'Invoice discounts (Name => properties).', 'invoicing' ),
-		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'required'            => array( 'amount' ),
-			'properties'          => array(
-				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time discount.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'taxes'           => array(
-		'description' => __( 'Invoice taxes (Name => properties).', 'invoicing' ),
-		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'required'            => array( 'amount' ),
-			'properties'          => array(
-				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time tax.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'items'           => array(
-		'description' => __( 'Invoice items.', 'invoicing' ),
-		'type'        => 'array',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'required'            => array( 'item_id' ),
-			'properties'          => array(
-				'item_id'         => array(
-					'description' => __( 'Item ID.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'item_name'       => array(
-					'description' => __( 'Item Name.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'item_description' => array(
-					'description'  => __( 'Item Description.', 'invoicing' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-				),
-				'item_price'      => array(
-					'description' => __( 'Item Price.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'quantity'        => array(
-					'description' => __( 'Item Quantity.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'subtotal'        => array(
-					'description' => __( 'Item Subtotal.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-				'meta'            => array(
-					'description' => __( 'Item Meta.', 'invoicing' ),
-					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'mode'			  => array(
-		'description' => __( 'The invoice transaction mode.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'live', 'test' ),
-		'readonly'    => true,
-	),
+    'id'              => array(
+        'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'parent_id'       => array(
+        'description' => __( 'Parent invoice ID.', 'invoicing' ),
+        'type'        => 'integer',
+        'minimum'     => 0,
+        'default'     => 0,
+        'context'     => array( 'view', 'edit' ),
+    ),
+
+    'key'			  => array(
+        'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'number'		  => array(
+        'description' => __( 'A unique number for the invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'type'			  => array(
+        'description' => __( 'Get the invoice type (e.g invoice, quote etc).', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'post_type'		  => array(
+        'description' => __( 'Get the invoice post type (e.g wpi_invoice, wpi_quote etc).', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'version'         => array(
+        'description' => __( 'Version of GetPaid/Invoicing which last updated the invoice.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'template'        => array(
+        'description' => __( 'The invoice template.', 'invoicing' ),
+        'type'        => 'string',
+        'default'     => 'quantity',
+        'enum'        => array( 'quantity', 'hours', 'amount' ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'status'          => array(
+        'description' => __( 'Invoice status.', 'invoicing' ),
+        'type'        => 'string',
+        'default'     => 'wpi-pending',
+        'enum'        => array_keys( wpinv_get_invoice_statuses( true ) ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'status_nicename' => array(
+        'description' => __( 'A human readable name for the invoice status.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'currency'        => array(
+        'description' => __( 'The invoice currency in ISO format.', 'invoicing' ),
+        'type'        => 'string',
+        'default'     => wpinv_get_currency(),
+        'enum'        => array_keys( wpinv_get_currencies() ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'date_created'    => array(
+        'description' => __( "The date the invoice was created, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'date_created_gmt'    => array(
+        'description' => __( 'The GMT date the invoice was created.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'date_modified'   => array(
+        'description' => __( "The date the invoice was last modified, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'date_modified_gmt'    => array(
+        'description' => __( 'The GMT date the invoice was last modified.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'due_date'        => array(
+        'description' => __( "The invoice's due date, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'due_date_gmt'    => array(
+        'description' => __( 'The GMT date the invoice is/was due.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'completed_date'  => array(
+        'description' => __( "The date the invoice was paid, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'completed_date_gmt'    => array(
+        'description' => __( 'The GMT date the invoice was paid.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'total_discount'   => array(
+        'description' => __( 'Total discount amount for the invoice.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'total_tax'       => array(
+        'description' => __( 'Total tax amount for the invoice.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'total_fees'      => array(
+        'description' => __( 'Total fees amount for the invoice.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'subtotal'        => array(
+        'description' => __( 'Invoice subtotal.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'total'           => array(
+        'description' => __( 'Grand total.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'initial_total'   => array(
+        'description' => __( 'Initial total (for recurring invoices).', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'recurring_total'  => array(
+        'description' => __( 'Recurring total (for recurring invoices).', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'totals'          => array(
+        'description' => __( 'Invoice totals.', 'invoicing' ),
+        'type'        => 'object',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'fees'            => array(
+        'description' => __( 'Invoice fees (Name => properties).', 'invoicing' ),
+        'type'        => 'object',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'required'            => array( 'amount' ),
+            'properties'          => array(
+                'amount'          => array(
+                    'description' => __( 'Fee amount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'recurring'       => array(
+                    'description' => __( 'Whether this is a recurring or one-time fee.', 'invoicing' ),
+                    'type'        => array( 'boolean', 'integer' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'discounts'       => array(
+        'description' => __( 'Invoice discounts (Name => properties).', 'invoicing' ),
+        'type'        => 'object',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'required'            => array( 'amount' ),
+            'properties'          => array(
+                'amount'          => array(
+                    'description' => __( 'Fee amount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'recurring'       => array(
+                    'description' => __( 'Whether this is a recurring or one-time discount.', 'invoicing' ),
+                    'type'        => array( 'boolean', 'integer' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'taxes'           => array(
+        'description' => __( 'Invoice taxes (Name => properties).', 'invoicing' ),
+        'type'        => 'object',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'required'            => array( 'amount' ),
+            'properties'          => array(
+                'amount'          => array(
+                    'description' => __( 'Fee amount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'recurring'       => array(
+                    'description' => __( 'Whether this is a recurring or one-time tax.', 'invoicing' ),
+                    'type'        => array( 'boolean', 'integer' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'items'           => array(
+        'description' => __( 'Invoice items.', 'invoicing' ),
+        'type'        => 'array',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'required'            => array( 'item_id' ),
+            'properties'          => array(
+                'item_id'         => array(
+                    'description' => __( 'Item ID.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'item_name'       => array(
+                    'description' => __( 'Item Name.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'item_description' => array(
+                    'description'  => __( 'Item Description.', 'invoicing' ),
+                    'type'         => 'string',
+                    'context'      => array( 'view', 'edit', 'embed' ),
+                ),
+                'item_price'      => array(
+                    'description' => __( 'Item Price.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'quantity'        => array(
+                    'description' => __( 'Item Quantity.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'subtotal'        => array(
+                    'description' => __( 'Item Subtotal.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+                'meta'            => array(
+                    'description' => __( 'Item Meta.', 'invoicing' ),
+                    'type'        => 'object',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'mode'			  => array(
+        'description' => __( 'The invoice transaction mode.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'enum'        => array( 'live', 'test' ),
+        'readonly'    => true,
+    ),
 	
-	'discount_code'   => array(
-		'description' => __( 'The discount code used on this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'gateway'         => array(
-		'description' => __( 'The gateway used to pay this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'gateway_title'   => array(
-		'description' => __( 'The title of the gateway used to pay this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'transaction_id'  => array(
-		'description' => __( 'The transaction id for this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
+    'discount_code'   => array(
+        'description' => __( 'The discount code used on this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'gateway'         => array(
+        'description' => __( 'The gateway used to pay this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'gateway_title'   => array(
+        'description' => __( 'The title of the gateway used to pay this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'transaction_id'  => array(
+        'description' => __( 'The transaction id for this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
 	
-	'disable_taxes'   => array(
-		'description' => __( 'Whether or not taxes should be disabled for this invoice.', 'invoicing' ),
-		'type'        => 'boolean ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'is_viewed'       => array(
-		'description' => __( 'Whether or not this invoice has been viewed by the user.', 'invoicing' ),
-		'type'        => 'boolean ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'email_cc'        => array(
-		'description' => __( 'A comma separated list of other emails that should receive communications for this invoice.', 'invoicing' ),
-		'type'        => 'string ',
-		'context'     => array( 'view', 'edit' ),
-	),
-
-	'subscription_id' => array(
-		'description' => __( 'The ID of the subscription associated with this invoice.', 'invoicing' ),
-		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'subscription_name' => array(
-		'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
-		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'subscription_name' => array(
-		'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
-		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_parent'		  => array(
-		'description' => __( 'Whether or not this is a parent invoice.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_renewal'      => array(
-		'description' => __( 'Whether or not this is a renewal invoice.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_recurring'    => array(
-		'description' => __( 'Whether or not this is a recurring invoice.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_free'         => array(
-		'description' => __( 'Whether or not this invoice is free.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_paid'         => array(
-		'description' => __( 'Whether or not this invoice has been paid.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'needs_payment'   => array(
-		'description' => __( 'Whether or not this invoice needs payment.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_refunded'     => array(
-		'description' => __( 'Whether or not this invoice was refunded.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_due'          => array(
-		'description' => __( 'Whether or not this invoice is due.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_held'         => array(
-		'description' => __( 'Whether or not this invoice has been held for payment confirmation.', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'is_draft'        => array(
-		'description' => __( 'Whether or not this invoice is marked as draft (cannot be viewed on the frontend).', 'invoicing' ),
-		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'path'			  => array(
-		'description' => __( 'The invoice path/slug/name.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'description'     => array(
-		'description' => __( 'The invoice description.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'payment_form'    => array(
-		'description' => __( 'The id of the payment form used to pay for this invoice.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'submission_id'   => array(
-		'description' => __( 'A uniques ID of the submission details used to pay for this invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'customer_id'     => array(
-		'description' => __( 'The customer id.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'customer_ip'     => array(
-		'description' => __( "The customer's ip address.", 'invoicing' ),
-		'type'        => 'string',
-		'format'      => 'ip',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'first_name'     => array(
-		'description' => __( "The customer's first name.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'last_name'       => array(
-		'description' => __( "The customer's last name.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
+    'disable_taxes'   => array(
+        'description' => __( 'Whether or not taxes should be disabled for this invoice.', 'invoicing' ),
+        'type'        => 'boolean ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'is_viewed'       => array(
+        'description' => __( 'Whether or not this invoice has been viewed by the user.', 'invoicing' ),
+        'type'        => 'boolean ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'email_cc'        => array(
+        'description' => __( 'A comma separated list of other emails that should receive communications for this invoice.', 'invoicing' ),
+        'type'        => 'string ',
+        'context'     => array( 'view', 'edit' ),
+    ),
+
+    'subscription_id' => array(
+        'description' => __( 'The ID of the subscription associated with this invoice.', 'invoicing' ),
+        'type'        => 'string ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'subscription_name' => array(
+        'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
+        'type'        => 'string ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'subscription_name' => array(
+        'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
+        'type'        => 'string ',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_parent'		  => array(
+        'description' => __( 'Whether or not this is a parent invoice.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_renewal'      => array(
+        'description' => __( 'Whether or not this is a renewal invoice.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_recurring'    => array(
+        'description' => __( 'Whether or not this is a recurring invoice.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_free'         => array(
+        'description' => __( 'Whether or not this invoice is free.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_paid'         => array(
+        'description' => __( 'Whether or not this invoice has been paid.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'needs_payment'   => array(
+        'description' => __( 'Whether or not this invoice needs payment.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_refunded'     => array(
+        'description' => __( 'Whether or not this invoice was refunded.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_due'          => array(
+        'description' => __( 'Whether or not this invoice is due.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_held'         => array(
+        'description' => __( 'Whether or not this invoice has been held for payment confirmation.', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'is_draft'        => array(
+        'description' => __( 'Whether or not this invoice is marked as draft (cannot be viewed on the frontend).', 'invoicing' ),
+        'type'        => 'boolean',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'path'			  => array(
+        'description' => __( 'The invoice path/slug/name.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'description'     => array(
+        'description' => __( 'The invoice description.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'payment_form'    => array(
+        'description' => __( 'The id of the payment form used to pay for this invoice.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'submission_id'   => array(
+        'description' => __( 'A uniques ID of the submission details used to pay for this invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'customer_id'     => array(
+        'description' => __( 'The customer id.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'customer_ip'     => array(
+        'description' => __( "The customer's ip address.", 'invoicing' ),
+        'type'        => 'string',
+        'format'      => 'ip',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'first_name'     => array(
+        'description' => __( "The customer's first name.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'last_name'       => array(
+        'description' => __( "The customer's last name.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
 	
-	'full_name'       => array(
-		'description' => __( "The customer's full name.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'phone_number'    => array(
-		'description' => __( "The customer's phone number.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'email_address'   => array(
-		'description' => __( "The customer's email address.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'customer_country'   => array(
-		'description'    => __( "The customer's country.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-		'default'        => wpinv_get_default_country(),
-	),
-
-	'customer_state'     => array(
-		'description'    => __( "The customer's state.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'customer_city'      => array(
-		'description'    => __( "The customer's city.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'customer_zip'       => array(
-		'description'    => __( "The customer's zip/postal code.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'customer_company'   => array(
-		'description'    => __( "The customer's company name.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'vat_number'         => array(
-		'description'    => __( "The customer's VAT number.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'vat_rate'           => array(
-		'description'    => __( "The customer's VAT rate.", 'invoicing' ),
-		'type'           => 'number',
-		'context'        => array( 'view', 'edit', 'embed' ),
-		'readonly'       => true,
-	),
-
-	'customer_address'   => array(
-		'description'    => __( "The customer's address.", 'invoicing' ),
-		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'address_confirmed'  => array(
-		'description'    => __( "Whether or not the customer's address is confirmed.", 'invoicing' ),
-		'type'           => 'boolean',
-		'context'        => array( 'view', 'edit', 'embed' ),
-	),
-
-	'meta_data'       => array(
-		'description' => __( 'Invoice meta data.', 'invoicing' ),
-		'type'        => 'array',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'items'       => array(
-			'type'                => 'object',
-			'properties'          => array(
-				'id'              => array(
-					'description' => __( 'Meta ID.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'key'             => array(
-					'description' => __( 'Meta key.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'value'           => array(
-					'description' => __( 'Meta Value.', 'invoicing' ),
-					'type'        => array( 'string', 'array', 'object', 'integer', 'null' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			),
-		),
-	),
-
-	'view_url'        => array(
-		'description' => __( 'URL to the invoice.', 'invoicing' ),
-		'type'        => 'string',
-		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'checkout_payment_url'         => array(
-		'description' => __( 'URL to the invoice checkout page.', 'invoicing' ),
-		'type'        => 'string',
-		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'receipt_url'     => array(
-		'description' => __( 'URL to the invoice receipt page.', 'invoicing' ),
-		'type'        => 'string',
-		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
+    'full_name'       => array(
+        'description' => __( "The customer's full name.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'phone_number'    => array(
+        'description' => __( "The customer's phone number.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'email_address'   => array(
+        'description' => __( "The customer's email address.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'customer_country'   => array(
+        'description'    => __( "The customer's country.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+        'default'        => wpinv_get_default_country(),
+    ),
+
+    'customer_state'     => array(
+        'description'    => __( "The customer's state.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'customer_city'      => array(
+        'description'    => __( "The customer's city.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'customer_zip'       => array(
+        'description'    => __( "The customer's zip/postal code.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'customer_company'   => array(
+        'description'    => __( "The customer's company name.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'vat_number'         => array(
+        'description'    => __( "The customer's VAT number.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'vat_rate'           => array(
+        'description'    => __( "The customer's VAT rate.", 'invoicing' ),
+        'type'           => 'number',
+        'context'        => array( 'view', 'edit', 'embed' ),
+        'readonly'       => true,
+    ),
+
+    'customer_address'   => array(
+        'description'    => __( "The customer's address.", 'invoicing' ),
+        'type'           => 'string',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'address_confirmed'  => array(
+        'description'    => __( "Whether or not the customer's address is confirmed.", 'invoicing' ),
+        'type'           => 'boolean',
+        'context'        => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'meta_data'       => array(
+        'description' => __( 'Invoice meta data.', 'invoicing' ),
+        'type'        => 'array',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'items'       => array(
+            'type'                => 'object',
+            'properties'          => array(
+                'id'              => array(
+                    'description' => __( 'Meta ID.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'key'             => array(
+                    'description' => __( 'Meta key.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+                'value'           => array(
+                    'description' => __( 'Meta Value.', 'invoicing' ),
+                    'type'        => array( 'string', 'array', 'object', 'integer', 'null' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+            ),
+        ),
+    ),
+
+    'view_url'        => array(
+        'description' => __( 'URL to the invoice.', 'invoicing' ),
+        'type'        => 'string',
+        'format'      => 'uri',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'checkout_payment_url'         => array(
+        'description' => __( 'URL to the invoice checkout page.', 'invoicing' ),
+        'type'        => 'string',
+        'format'      => 'uri',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'receipt_url'     => array(
+        'description' => __( 'URL to the invoice receipt page.', 'invoicing' ),
+        'type'        => 'string',
+        'format'      => 'uri',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
 
 );

Spacing +197 added lines, -197 removed lines

@@ -9,632 +9,632 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
 	'id'              => array(
-		'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+		'description' => __('Unique identifier for the invoice.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'parent_id'       => array(
-		'description' => __( 'Parent invoice ID.', 'invoicing' ),
+		'description' => __('Parent invoice ID.', 'invoicing'),
 		'type'        => 'integer',
 		'minimum'     => 0,
 		'default'     => 0,
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 	),
 
 	'key'			  => array(
-		'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+		'description' => __('A unique key for the invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'number'		  => array(
-		'description' => __( 'A unique number for the invoice.', 'invoicing' ),
+		'description' => __('A unique number for the invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'type'			  => array(
-		'description' => __( 'Get the invoice type (e.g invoice, quote etc).', 'invoicing' ),
+		'description' => __('Get the invoice type (e.g invoice, quote etc).', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'post_type'		  => array(
-		'description' => __( 'Get the invoice post type (e.g wpi_invoice, wpi_quote etc).', 'invoicing' ),
+		'description' => __('Get the invoice post type (e.g wpi_invoice, wpi_quote etc).', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'version'         => array(
-		'description' => __( 'Version of GetPaid/Invoicing which last updated the invoice.', 'invoicing' ),
+		'description' => __('Version of GetPaid/Invoicing which last updated the invoice.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'template'        => array(
-		'description' => __( 'The invoice template.', 'invoicing' ),
+		'description' => __('The invoice template.', 'invoicing'),
 		'type'        => 'string',
 		'default'     => 'quantity',
-		'enum'        => array( 'quantity', 'hours', 'amount' ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array('quantity', 'hours', 'amount'),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'status'          => array(
-		'description' => __( 'Invoice status.', 'invoicing' ),
+		'description' => __('Invoice status.', 'invoicing'),
 		'type'        => 'string',
 		'default'     => 'wpi-pending',
-		'enum'        => array_keys( wpinv_get_invoice_statuses( true ) ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array_keys(wpinv_get_invoice_statuses(true)),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'status_nicename' => array(
-		'description' => __( 'A human readable name for the invoice status.', 'invoicing' ),
+		'description' => __('A human readable name for the invoice status.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'currency'        => array(
-		'description' => __( 'The invoice currency in ISO format.', 'invoicing' ),
+		'description' => __('The invoice currency in ISO format.', 'invoicing'),
 		'type'        => 'string',
 		'default'     => wpinv_get_currency(),
-		'enum'        => array_keys( wpinv_get_currencies() ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array_keys(wpinv_get_currencies()),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'date_created'    => array(
-		'description' => __( "The date the invoice was created, in the site's timezone.", 'invoicing' ),
+		'description' => __("The date the invoice was created, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'date_created_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was created.', 'invoicing' ),
+		'description' => __('The GMT date the invoice was created.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'date_modified'   => array(
-		'description' => __( "The date the invoice was last modified, in the site's timezone.", 'invoicing' ),
+		'description' => __("The date the invoice was last modified, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'date_modified_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was last modified.', 'invoicing' ),
+		'description' => __('The GMT date the invoice was last modified.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'due_date'        => array(
-		'description' => __( "The invoice's due date, in the site's timezone.", 'invoicing' ),
+		'description' => __("The invoice's due date, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'due_date_gmt'    => array(
-		'description' => __( 'The GMT date the invoice is/was due.', 'invoicing' ),
+		'description' => __('The GMT date the invoice is/was due.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'completed_date'  => array(
-		'description' => __( "The date the invoice was paid, in the site's timezone.", 'invoicing' ),
+		'description' => __("The date the invoice was paid, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'completed_date_gmt'    => array(
-		'description' => __( 'The GMT date the invoice was paid.', 'invoicing' ),
+		'description' => __('The GMT date the invoice was paid.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'total_discount'   => array(
-		'description' => __( 'Total discount amount for the invoice.', 'invoicing' ),
+		'description' => __('Total discount amount for the invoice.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'total_tax'       => array(
-		'description' => __( 'Total tax amount for the invoice.', 'invoicing' ),
+		'description' => __('Total tax amount for the invoice.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'total_fees'      => array(
-		'description' => __( 'Total fees amount for the invoice.', 'invoicing' ),
+		'description' => __('Total fees amount for the invoice.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'subtotal'        => array(
-		'description' => __( 'Invoice subtotal.', 'invoicing' ),
+		'description' => __('Invoice subtotal.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'total'           => array(
-		'description' => __( 'Grand total.', 'invoicing' ),
+		'description' => __('Grand total.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'initial_total'   => array(
-		'description' => __( 'Initial total (for recurring invoices).', 'invoicing' ),
+		'description' => __('Initial total (for recurring invoices).', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'recurring_total'  => array(
-		'description' => __( 'Recurring total (for recurring invoices).', 'invoicing' ),
+		'description' => __('Recurring total (for recurring invoices).', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'totals'          => array(
-		'description' => __( 'Invoice totals.', 'invoicing' ),
+		'description' => __('Invoice totals.', 'invoicing'),
 		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'fees'            => array(
-		'description' => __( 'Invoice fees (Name => properties).', 'invoicing' ),
+		'description' => __('Invoice fees (Name => properties).', 'invoicing'),
 		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
-			'required'            => array( 'amount' ),
+			'required'            => array('amount'),
 			'properties'          => array(
 				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
+					'description' => __('Fee amount.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time fee.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'description' => __('Whether this is a recurring or one-time fee.', 'invoicing'),
+					'type'        => array('boolean', 'integer'),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'discounts'       => array(
-		'description' => __( 'Invoice discounts (Name => properties).', 'invoicing' ),
+		'description' => __('Invoice discounts (Name => properties).', 'invoicing'),
 		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
-			'required'            => array( 'amount' ),
+			'required'            => array('amount'),
 			'properties'          => array(
 				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
+					'description' => __('Fee amount.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time discount.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'description' => __('Whether this is a recurring or one-time discount.', 'invoicing'),
+					'type'        => array('boolean', 'integer'),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'taxes'           => array(
-		'description' => __( 'Invoice taxes (Name => properties).', 'invoicing' ),
+		'description' => __('Invoice taxes (Name => properties).', 'invoicing'),
 		'type'        => 'object',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
-			'required'            => array( 'amount' ),
+			'required'            => array('amount'),
 			'properties'          => array(
 				'amount'          => array(
-					'description' => __( 'Fee amount.', 'invoicing' ),
+					'description' => __('Fee amount.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'recurring'       => array(
-					'description' => __( 'Whether this is a recurring or one-time tax.', 'invoicing' ),
-					'type'        => array( 'boolean', 'integer' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'description' => __('Whether this is a recurring or one-time tax.', 'invoicing'),
+					'type'        => array('boolean', 'integer'),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'items'           => array(
-		'description' => __( 'Invoice items.', 'invoicing' ),
+		'description' => __('Invoice items.', 'invoicing'),
 		'type'        => 'array',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
-			'required'            => array( 'item_id' ),
+			'required'            => array('item_id'),
 			'properties'          => array(
 				'item_id'         => array(
-					'description' => __( 'Item ID.', 'invoicing' ),
+					'description' => __('Item ID.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'item_name'       => array(
-					'description' => __( 'Item Name.', 'invoicing' ),
+					'description' => __('Item Name.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'item_description' => array(
-					'description'  => __( 'Item Description.', 'invoicing' ),
+					'description'  => __('Item Description.', 'invoicing'),
 					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
+					'context'      => array('view', 'edit', 'embed'),
 				),
 				'item_price'      => array(
-					'description' => __( 'Item Price.', 'invoicing' ),
+					'description' => __('Item Price.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'quantity'        => array(
-					'description' => __( 'Item Quantity.', 'invoicing' ),
+					'description' => __('Item Quantity.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'subtotal'        => array(
-					'description' => __( 'Item Subtotal.', 'invoicing' ),
+					'description' => __('Item Subtotal.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 				'meta'            => array(
-					'description' => __( 'Item Meta.', 'invoicing' ),
+					'description' => __('Item Meta.', 'invoicing'),
 					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'mode'			  => array(
-		'description' => __( 'The invoice transaction mode.', 'invoicing' ),
+		'description' => __('The invoice transaction mode.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'live', 'test' ),
+		'context'     => array('view', 'edit', 'embed'),
+		'enum'        => array('live', 'test'),
 		'readonly'    => true,
 	),
 	
 	'discount_code'   => array(
-		'description' => __( 'The discount code used on this invoice.', 'invoicing' ),
+		'description' => __('The discount code used on this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'gateway'         => array(
-		'description' => __( 'The gateway used to pay this invoice.', 'invoicing' ),
+		'description' => __('The gateway used to pay this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'gateway_title'   => array(
-		'description' => __( 'The title of the gateway used to pay this invoice.', 'invoicing' ),
+		'description' => __('The title of the gateway used to pay this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'transaction_id'  => array(
-		'description' => __( 'The transaction id for this invoice.', 'invoicing' ),
+		'description' => __('The transaction id for this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 	
 	'disable_taxes'   => array(
-		'description' => __( 'Whether or not taxes should be disabled for this invoice.', 'invoicing' ),
+		'description' => __('Whether or not taxes should be disabled for this invoice.', 'invoicing'),
 		'type'        => 'boolean ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'is_viewed'       => array(
-		'description' => __( 'Whether or not this invoice has been viewed by the user.', 'invoicing' ),
+		'description' => __('Whether or not this invoice has been viewed by the user.', 'invoicing'),
 		'type'        => 'boolean ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'email_cc'        => array(
-		'description' => __( 'A comma separated list of other emails that should receive communications for this invoice.', 'invoicing' ),
+		'description' => __('A comma separated list of other emails that should receive communications for this invoice.', 'invoicing'),
 		'type'        => 'string ',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 	),
 
 	'subscription_id' => array(
-		'description' => __( 'The ID of the subscription associated with this invoice.', 'invoicing' ),
+		'description' => __('The ID of the subscription associated with this invoice.', 'invoicing'),
 		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'subscription_name' => array(
-		'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
+		'description' => __('The name of the subscription associated with this invoice.', 'invoicing'),
 		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'subscription_name' => array(
-		'description' => __( 'The name of the subscription associated with this invoice.', 'invoicing' ),
+		'description' => __('The name of the subscription associated with this invoice.', 'invoicing'),
 		'type'        => 'string ',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_parent'		  => array(
-		'description' => __( 'Whether or not this is a parent invoice.', 'invoicing' ),
+		'description' => __('Whether or not this is a parent invoice.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_renewal'      => array(
-		'description' => __( 'Whether or not this is a renewal invoice.', 'invoicing' ),
+		'description' => __('Whether or not this is a renewal invoice.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_recurring'    => array(
-		'description' => __( 'Whether or not this is a recurring invoice.', 'invoicing' ),
+		'description' => __('Whether or not this is a recurring invoice.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_free'         => array(
-		'description' => __( 'Whether or not this invoice is free.', 'invoicing' ),
+		'description' => __('Whether or not this invoice is free.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_paid'         => array(
-		'description' => __( 'Whether or not this invoice has been paid.', 'invoicing' ),
+		'description' => __('Whether or not this invoice has been paid.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'needs_payment'   => array(
-		'description' => __( 'Whether or not this invoice needs payment.', 'invoicing' ),
+		'description' => __('Whether or not this invoice needs payment.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_refunded'     => array(
-		'description' => __( 'Whether or not this invoice was refunded.', 'invoicing' ),
+		'description' => __('Whether or not this invoice was refunded.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_due'          => array(
-		'description' => __( 'Whether or not this invoice is due.', 'invoicing' ),
+		'description' => __('Whether or not this invoice is due.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_held'         => array(
-		'description' => __( 'Whether or not this invoice has been held for payment confirmation.', 'invoicing' ),
+		'description' => __('Whether or not this invoice has been held for payment confirmation.', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'is_draft'        => array(
-		'description' => __( 'Whether or not this invoice is marked as draft (cannot be viewed on the frontend).', 'invoicing' ),
+		'description' => __('Whether or not this invoice is marked as draft (cannot be viewed on the frontend).', 'invoicing'),
 		'type'        => 'boolean',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'path'			  => array(
-		'description' => __( 'The invoice path/slug/name.', 'invoicing' ),
+		'description' => __('The invoice path/slug/name.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'description'     => array(
-		'description' => __( 'The invoice description.', 'invoicing' ),
+		'description' => __('The invoice description.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'payment_form'    => array(
-		'description' => __( 'The id of the payment form used to pay for this invoice.', 'invoicing' ),
+		'description' => __('The id of the payment form used to pay for this invoice.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'submission_id'   => array(
-		'description' => __( 'A uniques ID of the submission details used to pay for this invoice.', 'invoicing' ),
+		'description' => __('A uniques ID of the submission details used to pay for this invoice.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'customer_id'     => array(
-		'description' => __( 'The customer id.', 'invoicing' ),
+		'description' => __('The customer id.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'customer_ip'     => array(
-		'description' => __( "The customer's ip address.", 'invoicing' ),
+		'description' => __("The customer's ip address.", 'invoicing'),
 		'type'        => 'string',
 		'format'      => 'ip',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'first_name'     => array(
-		'description' => __( "The customer's first name.", 'invoicing' ),
+		'description' => __("The customer's first name.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'last_name'       => array(
-		'description' => __( "The customer's last name.", 'invoicing' ),
+		'description' => __("The customer's last name.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 	
 	'full_name'       => array(
-		'description' => __( "The customer's full name.", 'invoicing' ),
+		'description' => __("The customer's full name.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'phone_number'    => array(
-		'description' => __( "The customer's phone number.", 'invoicing' ),
+		'description' => __("The customer's phone number.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'email_address'   => array(
-		'description' => __( "The customer's email address.", 'invoicing' ),
+		'description' => __("The customer's email address.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'customer_country'   => array(
-		'description'    => __( "The customer's country.", 'invoicing' ),
+		'description'    => __("The customer's country.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 		'default'        => wpinv_get_default_country(),
 	),
 
 	'customer_state'     => array(
-		'description'    => __( "The customer's state.", 'invoicing' ),
+		'description'    => __("The customer's state.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'customer_city'      => array(
-		'description'    => __( "The customer's city.", 'invoicing' ),
+		'description'    => __("The customer's city.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'customer_zip'       => array(
-		'description'    => __( "The customer's zip/postal code.", 'invoicing' ),
+		'description'    => __("The customer's zip/postal code.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'customer_company'   => array(
-		'description'    => __( "The customer's company name.", 'invoicing' ),
+		'description'    => __("The customer's company name.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'vat_number'         => array(
-		'description'    => __( "The customer's VAT number.", 'invoicing' ),
+		'description'    => __("The customer's VAT number.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'vat_rate'           => array(
-		'description'    => __( "The customer's VAT rate.", 'invoicing' ),
+		'description'    => __("The customer's VAT rate.", 'invoicing'),
 		'type'           => 'number',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 		'readonly'       => true,
 	),
 
 	'customer_address'   => array(
-		'description'    => __( "The customer's address.", 'invoicing' ),
+		'description'    => __("The customer's address.", 'invoicing'),
 		'type'           => 'string',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'address_confirmed'  => array(
-		'description'    => __( "Whether or not the customer's address is confirmed.", 'invoicing' ),
+		'description'    => __("Whether or not the customer's address is confirmed.", 'invoicing'),
 		'type'           => 'boolean',
-		'context'        => array( 'view', 'edit', 'embed' ),
+		'context'        => array('view', 'edit', 'embed'),
 	),
 
 	'meta_data'       => array(
-		'description' => __( 'Invoice meta data.', 'invoicing' ),
+		'description' => __('Invoice meta data.', 'invoicing'),
 		'type'        => 'array',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'items'       => array(
 			'type'                => 'object',
 			'properties'          => array(
 				'id'              => array(
-					'description' => __( 'Meta ID.', 'invoicing' ),
+					'description' => __('Meta ID.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'key'             => array(
-					'description' => __( 'Meta key.', 'invoicing' ),
+					'description' => __('Meta key.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 				'value'           => array(
-					'description' => __( 'Meta Value.', 'invoicing' ),
-					'type'        => array( 'string', 'array', 'object', 'integer', 'null' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'description' => __('Meta Value.', 'invoicing'),
+					'type'        => array('string', 'array', 'object', 'integer', 'null'),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 			),
 		),
 	),
 
 	'view_url'        => array(
-		'description' => __( 'URL to the invoice.', 'invoicing' ),
+		'description' => __('URL to the invoice.', 'invoicing'),
 		'type'        => 'string',
 		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'checkout_payment_url'         => array(
-		'description' => __( 'URL to the invoice checkout page.', 'invoicing' ),
+		'description' => __('URL to the invoice checkout page.', 'invoicing'),
 		'type'        => 'string',
 		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'receipt_url'     => array(
-		'description' => __( 'URL to the invoice receipt page.', 'invoicing' ),
+		'description' => __('URL to the invoice receipt page.', 'invoicing'),
 		'type'        => 'string',
 		'format'      => 'uri',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 

includes/data/currency-symbols.php

Indentation +162 added lines, -162 removed lines

@@ -11,166 +11,166 @@
 defined( 'ABSPATH' ) || exit;
 
 return array(
-	'AED' => 'د.إ',
-	'AFN' => '؋',
-	'ALL' => 'L',
-	'AMD' => 'AMD',
-	'ANG' => 'ƒ',
-	'AOA' => 'Kz',
-	'ARS' => '$',
-	'AUD' => '$',
-	'AWG' => 'ƒ',
-	'AZN' => 'AZN',
-	'BAM' => 'KM',
-	'BBD' => '$',
-	'BDT' => '৳',
-	'BGN' => 'лв.',
-	'BHD' => '.د.ب',
-	'BIF' => 'Fr',
-	'BMD' => '$',
-	'BND' => '$',
-	'BOB' => 'Bs.',
-	'BRL' => 'R$',
-	'BSD' => '$',
-	'BTC' => '฿',
-	'BTN' => 'Nu.',
-	'BWP' => 'P',
-	'BYN' => 'Br',
-	'BZD' => '$',
-	'CAD' => '$',
-	'CDF' => 'Fr',
-	'CHF' => 'CHF',
-	'CLP' => '$',
-	'CNY' => '¥',
-	'COP' => '$',
-	'CRC' => '₡',
-	'CUC' => '$',
-	'CUP' => '$',
-	'CVE' => '$',
-	'CZK' => 'Kč',
-	'DJF' => 'Fr',
-	'DKK' => 'DKK',
-	'DOP' => 'RD$',
-	'DZD' => 'د.ج',
-	'EGP' => 'EGP',
-	'ERN' => 'Nfk',
-	'ETB' => 'Br',
-	'EUR' => '€',
-	'FJD' => '$',
-	'FKP' => '£',
-	'GBP' => '£',
-	'GEL' => 'ლ',
-	'GGP' => '£',
-	'GHS' => '₵',
-	'GIP' => '£',
-	'GMD' => 'D',
-	'GNF' => 'Fr',
-	'GTQ' => 'Q',
-	'GYD' => '$',
-	'HKD' => '$',
-	'HNL' => 'L',
-	'HRK' => 'Kn',
-	'HTG' => 'G',
-	'HUF' => 'Ft',
-	'IDR' => 'Rp',
-	'ILS' => '₪',
-	'IMP' => '£',
-	'INR' => '₹',
-	'IQD' => 'ع.د',
-	'IRR' => '﷼',
-	'IRT' => 'تومان',
-	'ISK' => 'kr.',
-	'JEP' => '£',
-	'JMD' => '$',
-	'JOD' => 'د.ا',
-	'JPY' => '¥',
-	'KES' => 'KSh',
-	'KGS' => 'сом',
-	'KHR' => '៛',
-	'KMF' => 'Fr',
-	'KPW' => '₩',
-	'KRW' => '₩',
-	'KWD' => 'د.ك',
-	'KYD' => '$',
-	'KZT' => 'KZT',
-	'LAK' => '₭',
-	'LBP' => 'ل.ل',
-	'LKR' => 'රු',
-	'LRD' => '$',
-	'LSL' => 'L',
-	'LYD' => 'ل.د',
-	'MAD' => 'د.م.',
-	'MDL' => 'MDL',
-	'MGA' => 'Ar',
-	'MKD' => 'ден',
-	'MMK' => 'Ks',
-	'MNT' => '₮',
-	'MOP' => 'P',
-	'MRO' => 'UM',
-	'MUR' => '₨',
-	'MVR' => '.ރ',
-	'MWK' => 'MK',
-	'MXN' => '$',
-	'MYR' => 'RM',
-	'MZN' => 'MT',
-	'NAD' => '$',
-	'NGN' => '₦',
-	'NIO' => 'C$',
-	'NOK' => 'kr',
-	'NPR' => '₨',
-	'NZD' => '$',
-	'OMR' => 'ر.ع.',
-	'PAB' => 'B/.',
-	'PEN' => 'S/.',
-	'PGK' => 'K',
-	'PHP' => '₱',
-	'PKR' => '₨',
-	'PLN' => 'zł',
-	'PRB' => 'р.',
-	'PYG' => '₲',
-	'QAR' => 'ر.ق',
-	'RMB' => '¥',
-	'RON' => 'lei',
-	'RSD' => 'дин.',
-	'RUB' => '₽',
-	'RWF' => 'Fr',
-	'SAR' => 'ر.س',
-	'SBD' => '$',
-	'SCR' => '₨',
-	'SDG' => 'ج.س.',
-	'SEK' => 'kr',
-	'SGD' => '$',
-	'SHP' => '£',
-	'SLL' => 'Le',
-	'SOS' => 'Sh',
-	'SRD' => '$',
-	'SSP' => '£',
-	'STD' => 'Db',
-	'SYP' => 'ل.س',
-	'SZL' => 'L',
-	'THB' => '฿',
-	'TJS' => 'ЅМ',
-	'TMT' => 'm',
-	'TND' => 'د.ت',
-	'TOP' => 'T$',
-	'TRY' => '₺',
-	'TTD' => '$',
-	'TWD' => 'NT$',
-	'TZS' => 'Sh',
-	'UAH' => '₴',
-	'UGX' => 'UGX',
-	'USD' => '$',
-	'UYU' => '$',
-	'UZS' => 'UZS',
-	'VEF' => 'Bs.',
-	'VND' => '₫',
-	'VUV' => 'Vt',
-	'WST' => 'T',
-	'XAF' => 'Fr',
-	'XCD' => '$',
-	'XOF' => 'Fr',
-	'XPF' => 'Fr',
-	'YER' => '﷼',
-	'ZAR' => 'R',
-	'ZMW' => 'ZK',
+    'AED' => 'د.إ',
+    'AFN' => '؋',
+    'ALL' => 'L',
+    'AMD' => 'AMD',
+    'ANG' => 'ƒ',
+    'AOA' => 'Kz',
+    'ARS' => '$',
+    'AUD' => '$',
+    'AWG' => 'ƒ',
+    'AZN' => 'AZN',
+    'BAM' => 'KM',
+    'BBD' => '$',
+    'BDT' => '৳',
+    'BGN' => 'лв.',
+    'BHD' => '.د.ب',
+    'BIF' => 'Fr',
+    'BMD' => '$',
+    'BND' => '$',
+    'BOB' => 'Bs.',
+    'BRL' => 'R$',
+    'BSD' => '$',
+    'BTC' => '฿',
+    'BTN' => 'Nu.',
+    'BWP' => 'P',
+    'BYN' => 'Br',
+    'BZD' => '$',
+    'CAD' => '$',
+    'CDF' => 'Fr',
+    'CHF' => 'CHF',
+    'CLP' => '$',
+    'CNY' => '¥',
+    'COP' => '$',
+    'CRC' => '₡',
+    'CUC' => '$',
+    'CUP' => '$',
+    'CVE' => '$',
+    'CZK' => 'Kč',
+    'DJF' => 'Fr',
+    'DKK' => 'DKK',
+    'DOP' => 'RD$',
+    'DZD' => 'د.ج',
+    'EGP' => 'EGP',
+    'ERN' => 'Nfk',
+    'ETB' => 'Br',
+    'EUR' => '€',
+    'FJD' => '$',
+    'FKP' => '£',
+    'GBP' => '£',
+    'GEL' => 'ლ',
+    'GGP' => '£',
+    'GHS' => '₵',
+    'GIP' => '£',
+    'GMD' => 'D',
+    'GNF' => 'Fr',
+    'GTQ' => 'Q',
+    'GYD' => '$',
+    'HKD' => '$',
+    'HNL' => 'L',
+    'HRK' => 'Kn',
+    'HTG' => 'G',
+    'HUF' => 'Ft',
+    'IDR' => 'Rp',
+    'ILS' => '₪',
+    'IMP' => '£',
+    'INR' => '₹',
+    'IQD' => 'ع.د',
+    'IRR' => '﷼',
+    'IRT' => 'تومان',
+    'ISK' => 'kr.',
+    'JEP' => '£',
+    'JMD' => '$',
+    'JOD' => 'د.ا',
+    'JPY' => '¥',
+    'KES' => 'KSh',
+    'KGS' => 'сом',
+    'KHR' => '៛',
+    'KMF' => 'Fr',
+    'KPW' => '₩',
+    'KRW' => '₩',
+    'KWD' => 'د.ك',
+    'KYD' => '$',
+    'KZT' => 'KZT',
+    'LAK' => '₭',
+    'LBP' => 'ل.ل',
+    'LKR' => 'රු',
+    'LRD' => '$',
+    'LSL' => 'L',
+    'LYD' => 'ل.د',
+    'MAD' => 'د.م.',
+    'MDL' => 'MDL',
+    'MGA' => 'Ar',
+    'MKD' => 'ден',
+    'MMK' => 'Ks',
+    'MNT' => '₮',
+    'MOP' => 'P',
+    'MRO' => 'UM',
+    'MUR' => '₨',
+    'MVR' => '.ރ',
+    'MWK' => 'MK',
+    'MXN' => '$',
+    'MYR' => 'RM',
+    'MZN' => 'MT',
+    'NAD' => '$',
+    'NGN' => '₦',
+    'NIO' => 'C$',
+    'NOK' => 'kr',
+    'NPR' => '₨',
+    'NZD' => '$',
+    'OMR' => 'ر.ع.',
+    'PAB' => 'B/.',
+    'PEN' => 'S/.',
+    'PGK' => 'K',
+    'PHP' => '₱',
+    'PKR' => '₨',
+    'PLN' => 'zł',
+    'PRB' => 'р.',
+    'PYG' => '₲',
+    'QAR' => 'ر.ق',
+    'RMB' => '¥',
+    'RON' => 'lei',
+    'RSD' => 'дин.',
+    'RUB' => '₽',
+    'RWF' => 'Fr',
+    'SAR' => 'ر.س',
+    'SBD' => '$',
+    'SCR' => '₨',
+    'SDG' => 'ج.س.',
+    'SEK' => 'kr',
+    'SGD' => '$',
+    'SHP' => '£',
+    'SLL' => 'Le',
+    'SOS' => 'Sh',
+    'SRD' => '$',
+    'SSP' => '£',
+    'STD' => 'Db',
+    'SYP' => 'ل.س',
+    'SZL' => 'L',
+    'THB' => '฿',
+    'TJS' => 'ЅМ',
+    'TMT' => 'm',
+    'TND' => 'د.ت',
+    'TOP' => 'T$',
+    'TRY' => '₺',
+    'TTD' => '$',
+    'TWD' => 'NT$',
+    'TZS' => 'Sh',
+    'UAH' => '₴',
+    'UGX' => 'UGX',
+    'USD' => '$',
+    'UYU' => '$',
+    'UZS' => 'UZS',
+    'VEF' => 'Bs.',
+    'VND' => '₫',
+    'VUV' => 'Vt',
+    'WST' => 'T',
+    'XAF' => 'Fr',
+    'XCD' => '$',
+    'XOF' => 'Fr',
+    'XPF' => 'Fr',
+    'YER' => '﷼',
+    'ZAR' => 'R',
+    'ZMW' => 'ZK',
 );

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 	'AED' => 'د.إ',