AyeCode / invoicing

includes/gateways/bank_transfer.php

Spacing +27 added lines, -27 removed lines

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

includes/wpinv-address-functions.php

Spacing +979 added lines, -979 removed lines

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

invoicing.php

Spacing +11 added lines, -11 removed lines

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

includes/class-wpinv-reports.php

Spacing +169 added lines, -169 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -21,68 +21,68 @@ 
     public function init() {
         global $wp_filesystem;
 
-        if ( empty( $wp_filesystem ) ) {
-            require_once( ABSPATH . '/wp-admin/includes/file.php' );
+        if (empty($wp_filesystem)) {
+            require_once(ABSPATH . '/wp-admin/includes/file.php');
             WP_Filesystem();
             global $wp_filesystem;
         }
         $this->wp_filesystem    = $wp_filesystem;
         
         $this->export_dir       = $this->export_location();
-        $this->export_url       = $this->export_location( true );
+        $this->export_url       = $this->export_location(true);
         $this->export           = 'invoicing';
         $this->filetype         = 'csv';
         $this->per_page         = 20;
         
-        do_action( 'wpinv_class_reports_init', $this );
+        do_action('wpinv_class_reports_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_reports_includes', $this );
+        do_action('wpinv_class_reports_includes', $this);
     }
     
     public function actions() {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'add_submenu' ), 10 );
-            add_action( 'wpinv_reports_tab_export', array( $this, 'export' ) );
-            add_action( 'wp_ajax_wpinv_ajax_export', array( $this, 'ajax_export' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'add_submenu'), 10);
+            add_action('wpinv_reports_tab_export', array($this, 'export'));
+            add_action('wp_ajax_wpinv_ajax_export', array($this, 'ajax_export'));
             
             // Export Invoices.
-            add_action( 'wpinv_export_set_params_invoices', array( $this, 'set_invoices_export' ) );
-            add_filter( 'wpinv_export_get_columns_invoices', array( $this, 'get_invoices_columns' ) );
-            add_filter( 'wpinv_export_get_data_invoices', array( $this, 'get_invoices_data' ) );
-            add_filter( 'wpinv_get_export_status_invoices', array( $this, 'invoices_export_status' ) );
+            add_action('wpinv_export_set_params_invoices', array($this, 'set_invoices_export'));
+            add_filter('wpinv_export_get_columns_invoices', array($this, 'get_invoices_columns'));
+            add_filter('wpinv_export_get_data_invoices', array($this, 'get_invoices_data'));
+            add_filter('wpinv_get_export_status_invoices', array($this, 'invoices_export_status'));
         }
-        do_action( 'wpinv_class_reports_actions', $this );
+        do_action('wpinv_class_reports_actions', $this);
     }
     
     public function add_submenu() {
         global $wpi_reports_page;
-        $wpi_reports_page = add_submenu_page( 'wpinv', __( 'Reports', 'invoicing' ), __( 'Reports', 'invoicing' ), 'manage_options', 'wpinv-reports', array( $this, 'reports_page' ) );
+        $wpi_reports_page = add_submenu_page('wpinv', __('Reports', 'invoicing'), __('Reports', 'invoicing'), 'manage_options', 'wpinv-reports', array($this, 'reports_page'));
     }
     
     public function reports_page() {
-        if ( !wp_script_is( 'postbox', 'enqueued' ) ) {
-            wp_enqueue_script( 'postbox' );
+        if (!wp_script_is('postbox', 'enqueued')) {
+            wp_enqueue_script('postbox');
         }
-        if ( !wp_script_is( 'jquery-ui-datepicker', 'enqueued' ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if (!wp_script_is('jquery-ui-datepicker', 'enqueued')) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        $current_page = admin_url( 'admin.php?page=wpinv-reports' );
-        $active_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'export';
+        $current_page = admin_url('admin.php?page=wpinv-reports');
+        $active_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'export';
         ?>
         <div class="wrap wpi-reports-wrap">
-            <h1><?php echo esc_html( __( 'Reports', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Reports', 'invoicing')); ?></h1>
             <h2 class="nav-tab-wrapper wp-clearfix">
-                <a href="<?php echo add_query_arg( array( 'tab' => 'export', 'settings-updated' => false ), $current_page ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'invoicing' ); ?></a>
-                <?php do_action( 'wpinv_reports_page_tabs' ); ;?>
+                <a href="<?php echo add_query_arg(array('tab' => 'export', 'settings-updated' => false), $current_page); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'invoicing'); ?></a>
+                <?php do_action('wpinv_reports_page_tabs'); ;?>
             </h2>
             <div class="wpi-reports-content wpi-reports-<?php echo $active_tab; ?>">
             <?php
-                do_action( 'wpinv_reports_page_top' );
-                do_action( 'wpinv_reports_tab_' . $active_tab );
-                do_action( 'wpinv_reports_page_bottom' );
+                do_action('wpinv_reports_page_top');
+                do_action('wpinv_reports_tab_' . $active_tab);
+                do_action('wpinv_reports_page_bottom');
             ?>
         </div>
         <?php
@@ -90,97 +90,97 @@ 
     
     public function export() {
         $statuses = wpinv_get_invoice_statuses();
-        $statuses = array_merge( array( 'any' => __( 'All Statuses', 'invoicing' ) ), $statuses );
+        $statuses = array_merge(array('any' => __('All Statuses', 'invoicing')), $statuses);
         ?>
         <div class="metabox-holder">
             <div id="post-body">
                 <div id="post-body-content">
-                    <?php do_action( 'wpinv_reports_tab_export_content_top' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_top'); ?>
                     
                     <div class="postbox wpi-export-invoices">
-                        <h2 class="hndle ui-sortabled-handle"><span><?php _e( 'Invoices','invoicing' ); ?></span></h2>
+                        <h2 class="hndle ui-sortabled-handle"><span><?php _e('Invoices', 'invoicing'); ?></span></h2>
                         <div class="inside">
-                            <p><?php _e( 'Download a CSV of all payment invoices.', 'invoicing' ); ?></p>
+                            <p><?php _e('Download a CSV of all payment invoices.', 'invoicing'); ?></p>
                             <form id="wpi-export-invoices" class="wpi-export-form" method="post">
-                                <?php echo wpinv_html_date_field( array( 
+                                <?php echo wpinv_html_date_field(array( 
                                     'id' => 'wpi_export_from_date', 
                                     'name' => 'from_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'From date', 'invoicing' ) )
+                                    'placeholder' => __('From date', 'invoicing') )
                                 ); ?>
-                                <?php echo wpinv_html_date_field( array( 
+                                <?php echo wpinv_html_date_field(array( 
                                     'id' => 'wpi_export_to_date',
                                     'name' => 'to_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'To date', 'invoicing' ) )
+                                    'placeholder' => __('To date', 'invoicing') )
                                 ); ?>
                                 <span id="wpinv-status-wrap">
-                                <?php echo wpinv_html_select( array(
+                                <?php echo wpinv_html_select(array(
                                     'options'          => $statuses,
                                     'name'             => 'status',
                                     'id'               => 'wpi_export_status',
                                     'show_option_all'  => false,
                                     'show_option_none' => false,
                                     'class'            => '',
-                                ) ); ?>
-                                <?php wp_nonce_field( 'wpi_ajax_export', 'wpi_ajax_export' ); ?>
+                                )); ?>
+                                <?php wp_nonce_field('wpi_ajax_export', 'wpi_ajax_export'); ?>
                                 </span>
                                 <span id="wpinv-submit-wrap">
                                     <input type="hidden" value="invoices" name="export" />
-                                    <input type="submit" value="<?php _e( 'Generate CSV', 'invoicing' ); ?>" class="button-primary" />
+                                    <input type="submit" value="<?php _e('Generate CSV', 'invoicing'); ?>" class="button-primary" />
                                 </span>
                             </form>
                         </div>
                     </div>
                     
-                    <?php do_action( 'wpinv_reports_tab_export_content_bottom' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_bottom'); ?>
                 </div>
             </div>
         </div>
         <?php
     }
     
-    public function export_location( $relative = false ) {
+    public function export_location($relative = false) {
         $upload_dir         = wp_upload_dir();
-        $export_location    = $relative ? trailingslashit( $upload_dir['baseurl'] ) . 'cache' : trailingslashit( $upload_dir['basedir'] ) . 'cache';
-        $export_location    = apply_filters( 'wpinv_export_location', $export_location, $relative );
+        $export_location    = $relative ? trailingslashit($upload_dir['baseurl']) . 'cache' : trailingslashit($upload_dir['basedir']) . 'cache';
+        $export_location    = apply_filters('wpinv_export_location', $export_location, $relative);
         
-        return trailingslashit( $export_location );
+        return trailingslashit($export_location);
     }
     
     public function check_export_location() {
         try {
-            if ( empty( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: Could not access filesystem.', 'invoicing' );
+            if (empty($this->wp_filesystem)) {
+                return __('Filesystem ERROR: Could not access filesystem.', 'invoicing');
             }
 
-            if ( is_wp_error( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing' );
+            if (is_wp_error($this->wp_filesystem)) {
+                return __('Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing');
             }
         
-            $is_dir         = $this->wp_filesystem->is_dir( $this->export_dir );
-            $is_writeable   = $is_dir && is_writeable( $this->export_dir );
+            $is_dir         = $this->wp_filesystem->is_dir($this->export_dir);
+            $is_writeable   = $is_dir && is_writeable($this->export_dir);
             
-            if ( $is_dir && $is_writeable ) {
+            if ($is_dir && $is_writeable) {
                return true;
-            } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+            } else if ($is_dir && !$is_writeable) {
+               if (!$this->wp_filesystem->chmod($this->export_dir, FS_CHMOD_DIR)) {
+                   return wp_sprintf(__('Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing'), $this->export_dir);
                }
                
                return true;
             } else {
-                if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
-                    return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );
+                if (!$this->wp_filesystem->mkdir($this->export_dir, FS_CHMOD_DIR)) {
+                    return wp_sprintf(__('Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing'), $this->export_dir);
                 }
                 
                 return true;
             }
-        } catch ( Exception $e ) {
+        } catch (Exception $e) {
             return $e->getMessage();
         }
     }
@@ -188,130 +188,130 @@ 
     public function ajax_export() {
         $response               = array();
         $response['success']    = false;
-        $response['msg']        = __( 'Invalid export request found.', 'invoicing' );
+        $response['msg']        = __('Invalid export request found.', 'invoicing');
         
-        if ( empty( $_POST['data'] ) || !current_user_can( 'manage_options' ) ) {
-            wp_send_json( $response );
+        if (empty($_POST['data']) || !current_user_can('manage_options')) {
+            wp_send_json($response);
         }
 
-        parse_str( $_POST['data'], $data );
+        parse_str($_POST['data'], $data);
         
-        $data['step']   = !empty( $_POST['step'] ) ? absint( $_POST['step'] ) : 1;
+        $data['step'] = !empty($_POST['step']) ? absint($_POST['step']) : 1;
 
         $_REQUEST = (array)$data;
-        if ( !( !empty( $_REQUEST['wpi_ajax_export'] ) && wp_verify_nonce( $_REQUEST['wpi_ajax_export'], 'wpi_ajax_export' ) ) ) {
-            $response['msg']    = __( 'Security check failed.', 'invoicing' );
-            wp_send_json( $response );
+        if (!(!empty($_REQUEST['wpi_ajax_export']) && wp_verify_nonce($_REQUEST['wpi_ajax_export'], 'wpi_ajax_export'))) {
+            $response['msg'] = __('Security check failed.', 'invoicing');
+            wp_send_json($response);
         }
         
-        if ( ( $error = $this->check_export_location( true ) ) !== true ) {
-            $response['msg'] = __( 'Filesystem ERROR: ' . $error, 'invoicing' );
-            wp_send_json( $response );
+        if (($error = $this->check_export_location(true)) !== true) {
+            $response['msg'] = __('Filesystem ERROR: ' . $error, 'invoicing');
+            wp_send_json($response);
         }
                         
-        $this->set_export_params( $_REQUEST );
+        $this->set_export_params($_REQUEST);
         
         $return = $this->process_export_step();
         $done   = $this->get_export_status();
         
-        if ( $return ) {
+        if ($return) {
             $this->step += 1;
             
             $response['success']    = true;
             $response['msg']        = '';
             
-            if ( $done >= 100 ) {
+            if ($done >= 100) {
                 $this->step     = 'done';
-                $new_filename   = 'wpi-' . $this->export . '-' . date( 'y-m-d-H-i' ) . '.' . $this->filetype;
+                $new_filename   = 'wpi-' . $this->export . '-' . date('y-m-d-H-i') . '.' . $this->filetype;
                 $new_file       = $this->export_dir . $new_filename;
                 
-                if ( file_exists( $this->file ) ) {
-                    $this->wp_filesystem->move( $this->file, $new_file, true );
+                if (file_exists($this->file)) {
+                    $this->wp_filesystem->move($this->file, $new_file, true);
                 }
                 
-                if ( file_exists( $new_file ) ) {
-                    $response['data']['file'] = array( 'u' => $this->export_url . $new_filename, 's' => size_format( filesize( $new_file ), 2 ) );
+                if (file_exists($new_file)) {
+                    $response['data']['file'] = array('u' => $this->export_url . $new_filename, 's' => size_format(filesize($new_file), 2));
                 }
             }
             
             $response['data']['step']   = $this->step;
             $response['data']['done']   = $done;
         } else {
-            $response['msg']    = __( 'No data found for export.', 'invoicing' );
+            $response['msg'] = __('No data found for export.', 'invoicing');
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
-    public function set_export_params( $request ) {
+    public function set_export_params($request) {
         $this->empty    = false;
-        $this->step     = !empty( $request['step'] ) ? absint( $request['step'] ) : 1;
-        $this->export   = !empty( $request['export'] ) ? $request['export'] : $this->export;
+        $this->step     = !empty($request['step']) ? absint($request['step']) : 1;
+        $this->export   = !empty($request['export']) ? $request['export'] : $this->export;
         $this->filename = 'wpi-' . $this->export . '-' . $request['wpi_ajax_export'] . '.' . $this->filetype;
         $this->file     = $this->export_dir . $this->filename;
         
-        do_action( 'wpinv_export_set_params_' . $this->export, $request );
+        do_action('wpinv_export_set_params_' . $this->export, $request);
     }
     
     public function get_columns() {
         $columns = array(
-            'id'   => __( 'ID',   'invoicing' ),
-            'date' => __( 'Date', 'invoicing' )
+            'id'   => __('ID', 'invoicing'),
+            'date' => __('Date', 'invoicing')
         );
         
-        return apply_filters( 'wpinv_export_get_columns_' . $this->export, $columns );
+        return apply_filters('wpinv_export_get_columns_' . $this->export, $columns);
     }
     
     protected function get_export_file() {
         $file = '';
 
-        if ( $this->wp_filesystem->exists( $this->file ) ) {
-            $file = $this->wp_filesystem->get_contents( $this->file );
+        if ($this->wp_filesystem->exists($this->file)) {
+            $file = $this->wp_filesystem->get_contents($this->file);
         } else {
-            $this->wp_filesystem->put_contents( $this->file, '' );
+            $this->wp_filesystem->put_contents($this->file, '');
         }
 
         return $file;
     }
     
-    protected function attach_export_data( $data = '' ) {
-        $filedata   = $this->get_export_file();
-        $filedata   .= $data;
+    protected function attach_export_data($data = '') {
+        $filedata = $this->get_export_file();
+        $filedata .= $data;
         
-        $this->wp_filesystem->put_contents( $this->file, $filedata );
+        $this->wp_filesystem->put_contents($this->file, $filedata);
 
-        $rows       = file( $this->file, FILE_SKIP_EMPTY_LINES );
+        $rows       = file($this->file, FILE_SKIP_EMPTY_LINES);
         $columns    = $this->get_columns();
-        $columns    = empty( $columns ) ? 0 : 1;
+        $columns    = empty($columns) ? 0 : 1;
 
-        $this->empty = count( $rows ) == $columns ? true : false;
+        $this->empty = count($rows) == $columns ? true : false;
     }
     
     public function print_columns() {
         $column_data    = '';
         $columns        = $this->get_columns();
         $i              = 1;
-        foreach( $columns as $key => $column ) {
-            $column_data .= '"' . addslashes( $column ) . '"';
-            $column_data .= $i == count( $columns ) ? '' : ',';
+        foreach ($columns as $key => $column) {
+            $column_data .= '"' . addslashes($column) . '"';
+            $column_data .= $i == count($columns) ? '' : ',';
             $i++;
         }
         $column_data .= "\r\n";
 
-        $this->attach_export_data( $column_data );
+        $this->attach_export_data($column_data);
 
         return $column_data;
     }
     
     public function process_export_step() {
-        if ( $this->step < 2 ) {
-            @unlink( $this->file );
+        if ($this->step < 2) {
+            @unlink($this->file);
             $this->print_columns();
         }
         
         $return = $this->print_rows();
         
-        if ( $return ) {
+        if ($return) {
             return true;
         } else {
             return false;
@@ -320,23 +320,23 @@ 
     
     public function get_export_status() {
         $status = 100;
-        return apply_filters( 'wpinv_get_export_status_' . $this->export, $status );
+        return apply_filters('wpinv_get_export_status_' . $this->export, $status);
     }
     
     public function get_export_data() {
         $data = array(
             0 => array(
                 'id'   => '',
-                'data' => date( 'F j, Y' )
+                'data' => date('F j, Y')
             ),
             1 => array(
                 'id'   => '',
-                'data' => date( 'F j, Y' )
+                'data' => date('F j, Y')
             )
         );
 
-        $data = apply_filters( 'wpinv_export_get_data', $data );
-        $data = apply_filters( 'wpinv_export_get_data_' . $this->export, $data );
+        $data = apply_filters('wpinv_export_get_data', $data);
+        $data = apply_filters('wpinv_export_get_data_' . $this->export, $data);
 
         return $data;
     }
@@ -346,20 +346,20 @@ 
         $data       = $this->get_export_data();
         $columns    = $this->get_columns();
 
-        if ( $data ) {
-            foreach ( $data as $row ) {
+        if ($data) {
+            foreach ($data as $row) {
                 $i = 1;
-                foreach ( $row as $key => $column ) {
-                    if ( array_key_exists( $key, $columns ) ) {
-                        $row_data .= '"' . addslashes( preg_replace( "/\"/","'", $column ) ) . '"';
-                        $row_data .= $i == count( $columns ) ? '' : ',';
+                foreach ($row as $key => $column) {
+                    if (array_key_exists($key, $columns)) {
+                        $row_data .= '"' . addslashes(preg_replace("/\"/", "'", $column)) . '"';
+                        $row_data .= $i == count($columns) ? '' : ',';
                         $i++;
                     }
                 }
                 $row_data .= "\r\n";
             }
 
-            $this->attach_export_data( $row_data );
+            $this->attach_export_data($row_data);
 
             return $row_data;
         }
@@ -368,46 +368,46 @@ 
     }
     
     // Export Invoices.
-    public function set_invoices_export( $request ) {
-        $this->from_date    = isset( $request['from_date'] ) ? sanitize_text_field( $request['from_date'] ) : '';
-        $this->to_date      = isset( $request['to_date'] ) ? sanitize_text_field( $request['to_date'] ) : '';
-        $this->status       = isset( $request['status'] ) ? sanitize_text_field( $request['status'] ) : 'publich';
+    public function set_invoices_export($request) {
+        $this->from_date    = isset($request['from_date']) ? sanitize_text_field($request['from_date']) : '';
+        $this->to_date      = isset($request['to_date']) ? sanitize_text_field($request['to_date']) : '';
+        $this->status       = isset($request['status']) ? sanitize_text_field($request['status']) : 'publich';
     }
     
-    public function get_invoices_columns( $columns = array() ) {
+    public function get_invoices_columns($columns = array()) {
         $columns = array(
-            'id'            => __( 'ID',   'invoicing' ),
-            'number'        => __( 'Number',   'invoicing' ),
-            'date'          => __( 'Date', 'invoicing' ),
-            'amount'        => __( 'Amount', 'invoicing' ),
-            'status_nicename'  => __( 'Status Nicename', 'invoicing' ),
-            'status'        => __( 'Status', 'invoicing' ),
-            'tax'           => __( 'Tax', 'invoicing' ),
-            'discount'      => __( 'Discount', 'invoicing' ),
-            'user_id'       => __( 'User ID', 'invoicing' ),
-            'email'         => __( 'Email', 'invoicing' ),
-            'first_name'    => __( 'First Name', 'invoicing' ),
-            'last_name'     => __( 'Last Name', 'invoicing' ),
-            'address'       => __( 'Address', 'invoicing' ),
-            'city'          => __( 'City', 'invoicing' ),
-            'state'         => __( 'State', 'invoicing' ),
-            'country'       => __( 'Country', 'invoicing' ),
-            'zip'           => __( 'Zipcode', 'invoicing' ),
-            'phone'         => __( 'Phone', 'invoicing' ),
-            'company'       => __( 'Company', 'invoicing' ),
-            'vat_number'    => __( 'Vat Number', 'invoicing' ),
-            'ip'            => __( 'IP', 'invoicing' ),
-            'gateway'       => __( 'Gateway', 'invoicing' ),
-            'gateway_nicename'       => __( 'Gateway Nicename', 'invoicing' ),
-            'transaction_id'=> __( 'Transaction ID', 'invoicing' ),
-            'currency'      => __( 'Currency', 'invoicing' ),
-            'due_date'      => __( 'Due Date', 'invoicing' ),
+            'id'            => __('ID', 'invoicing'),
+            'number'        => __('Number', 'invoicing'),
+            'date'          => __('Date', 'invoicing'),
+            'amount'        => __('Amount', 'invoicing'),
+            'status_nicename'  => __('Status Nicename', 'invoicing'),
+            'status'        => __('Status', 'invoicing'),
+            'tax'           => __('Tax', 'invoicing'),
+            'discount'      => __('Discount', 'invoicing'),
+            'user_id'       => __('User ID', 'invoicing'),
+            'email'         => __('Email', 'invoicing'),
+            'first_name'    => __('First Name', 'invoicing'),
+            'last_name'     => __('Last Name', 'invoicing'),
+            'address'       => __('Address', 'invoicing'),
+            'city'          => __('City', 'invoicing'),
+            'state'         => __('State', 'invoicing'),
+            'country'       => __('Country', 'invoicing'),
+            'zip'           => __('Zipcode', 'invoicing'),
+            'phone'         => __('Phone', 'invoicing'),
+            'company'       => __('Company', 'invoicing'),
+            'vat_number'    => __('Vat Number', 'invoicing'),
+            'ip'            => __('IP', 'invoicing'),
+            'gateway'       => __('Gateway', 'invoicing'),
+            'gateway_nicename'       => __('Gateway Nicename', 'invoicing'),
+            'transaction_id'=> __('Transaction ID', 'invoicing'),
+            'currency'      => __('Currency', 'invoicing'),
+            'due_date'      => __('Due Date', 'invoicing'),
         );
 
         return $columns;
     }
         
-    public function get_invoices_data( $response = array() ) {
+    public function get_invoices_data($response = array()) {
         $args = array(
             'limit'    => $this->per_page,
             'page'     => $this->step,
@@ -415,35 +415,35 @@ 
             'orderby'  => 'date',
         );
         
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
         
         $data = array();
         
-        if ( !empty( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (!empty($invoices)) {
+            foreach ($invoices as $invoice) {
                 $row = array(
                     'id'            => $invoice->ID,
                     'number'        => $invoice->get_number(),
-                    'date'          => $invoice->get_invoice_date( false ),
-                    'amount'        => wpinv_format_amount( $invoice->get_total(), NULL, true ),
-                    'status_nicename' => $invoice->get_status( true ),
+                    'date'          => $invoice->get_invoice_date(false),
+                    'amount'        => wpinv_format_amount($invoice->get_total(), NULL, true),
+                    'status_nicename' => $invoice->get_status(true),
                     'status'        => $invoice->get_status(),
-                    'tax'           => $invoice->get_tax() > 0 ? wpinv_format_amount( $invoice->get_tax(), NULL, true ) : '',
-                    'discount'      => $invoice->get_discount() > 0 ? wpinv_format_amount( $invoice->get_discount(), NULL, true ) : '',
+                    'tax'           => $invoice->get_tax() > 0 ? wpinv_format_amount($invoice->get_tax(), NULL, true) : '',
+                    'discount'      => $invoice->get_discount() > 0 ? wpinv_format_amount($invoice->get_discount(), NULL, true) : '',
                     'user_id'       => $invoice->get_user_id(),
                     'email'         => $invoice->get_email(),
                     'first_name'    => $invoice->get_first_name(),
@@ -464,7 +464,7 @@ 
                     'due_date'      => $invoice->needs_payment() ? $invoice->get_due_date() : '',
                 );
                 
-                $data[] = apply_filters( 'wpinv_export_invoice_row', $row, $invoice );
+                $data[] = apply_filters('wpinv_export_invoice_row', $row, $invoice);
             }
 
             return $data;
@@ -480,29 +480,29 @@ 
             'return'   => 'ids',
         );
         
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices   = wpinv_get_invoices( $args );
-        $total      = !empty( $invoices ) ? count( $invoices ) : 0;
+        $invoices   = wpinv_get_invoices($args);
+        $total      = !empty($invoices) ? count($invoices) : 0;
         $status     = 100;
 
-        if ( $total > 0 ) {
-            $status = ( ( $this->per_page * $this->step ) / $total ) * 100;
+        if ($total > 0) {
+            $status = (($this->per_page * $this->step) / $total) * 100;
         }
 
-        if ( $status > 100 ) {
+        if ($status > 100) {
             $status = 100;
         }
 

includes/wpinv-template-functions.php

Spacing +666 added lines, -666 removed lines

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

includes/admin/admin-pages.php

Spacing +145 added lines, -145 removed lines

@@ -1,66 +1,66 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-add_action( 'admin_menu', 'wpinv_add_options_link', 10 );
+add_action('admin_menu', 'wpinv_add_options_link', 10);
 function wpinv_add_options_link() {
     global $menu;
 
-    if ( current_user_can( 'manage_options' ) ) {
-        $menu[] = array( '', 'read', 'separator-wpinv', '', 'wp-menu-separator wpinv' );
+    if (current_user_can('manage_options')) {
+        $menu[] = array('', 'read', 'separator-wpinv', '', 'wp-menu-separator wpinv');
     }
     
-    $wpi_invoice            = get_post_type_object( 'wpi_invoice' );
+    $wpi_invoice = get_post_type_object('wpi_invoice');
 
-    add_menu_page( __( 'Invoicing', 'invoicing' ), __( 'Invoicing', 'invoicing' ), 'manage_options', 'wpinv', null, $wpi_invoice->menu_icon, '54.123460' );
+    add_menu_page(__('Invoicing', 'invoicing'), __('Invoicing', 'invoicing'), 'manage_options', 'wpinv', null, $wpi_invoice->menu_icon, '54.123460');
     
-    $wpi_settings_page   = add_submenu_page( 'wpinv', __( 'Invoice Settings', 'invoicing' ), __( 'Settings', 'invoicing' ), 'manage_options', 'wpinv-settings', 'wpinv_options_page' );
+    $wpi_settings_page = add_submenu_page('wpinv', __('Invoice Settings', 'invoicing'), __('Settings', 'invoicing'), 'manage_options', 'wpinv-settings', 'wpinv_options_page');
 }
 
-add_action( 'admin_menu', 'wpinv_remove_admin_submenus', 999 );
+add_action('admin_menu', 'wpinv_remove_admin_submenus', 999);
 function wpinv_remove_admin_submenus() {
-    remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+    remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
 }
 
-add_filter( 'manage_wpi_discount_posts_columns', 'wpinv_discount_columns' );
-function wpinv_discount_columns( $existing_columns ) {
+add_filter('manage_wpi_discount_posts_columns', 'wpinv_discount_columns');
+function wpinv_discount_columns($existing_columns) {
     $columns                = array();
     $columns['cb']          = $existing_columns['cb'];
-    $columns['name']        = __( 'Name', 'invoicing' );
-    $columns['code']        = __( 'Code', 'invoicing' );
-    $columns['amount']      = __( 'Amount', 'invoicing' );
-    $columns['usage']       = __( 'Usage / Limit', 'invoicing' );
-    $columns['expiry_date'] = __( 'Expiry Date', 'invoicing' );
-    $columns['status']      = __( 'Status', 'invoicing' );
+    $columns['name']        = __('Name', 'invoicing');
+    $columns['code']        = __('Code', 'invoicing');
+    $columns['amount']      = __('Amount', 'invoicing');
+    $columns['usage']       = __('Usage / Limit', 'invoicing');
+    $columns['expiry_date'] = __('Expiry Date', 'invoicing');
+    $columns['status']      = __('Status', 'invoicing');
 
     return $columns;
 }
 
-add_action( 'manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column' );
-function wpinv_discount_custom_column( $column ) {
+add_action('manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column');
+function wpinv_discount_custom_column($column) {
     global $post;
     
     $discount = $post;
 
-    switch ( $column ) {
+    switch ($column) {
         case 'name' :
-            echo get_the_title( $discount->ID );
+            echo get_the_title($discount->ID);
         break;
         case 'code' :
-            echo wpinv_get_discount_code( $discount->ID );
+            echo wpinv_get_discount_code($discount->ID);
         break;
         case 'amount' :
-            echo wpinv_format_discount_rate( wpinv_get_discount_type( $discount->ID ), wpinv_get_discount_amount( $discount->ID ) );
+            echo wpinv_format_discount_rate(wpinv_get_discount_type($discount->ID), wpinv_get_discount_amount($discount->ID));
         break;
         case 'usage_limit' :
-            echo wpinv_get_discount_uses( $discount->ID );
+            echo wpinv_get_discount_uses($discount->ID);
         break;
         case 'usage' :
-            $usage = wpinv_get_discount_uses( $discount->ID ) . ' / ';
-            if ( wpinv_get_discount_max_uses( $discount->ID ) ) {
-                $usage .= wpinv_get_discount_max_uses( $discount->ID );
+            $usage = wpinv_get_discount_uses($discount->ID) . ' / ';
+            if (wpinv_get_discount_max_uses($discount->ID)) {
+                $usage .= wpinv_get_discount_max_uses($discount->ID);
             } else {
                 $usage .= ' &infin;';
             }
@@ -68,162 +68,162 @@ 
             echo $usage;
         break;
         case 'expiry_date' :
-            if ( wpinv_get_discount_expiration( $discount->ID ) ) {
-                $expiration = date_i18n( get_option( 'date_format' ), strtotime( wpinv_get_discount_expiration( $discount->ID ) ) );
+            if (wpinv_get_discount_expiration($discount->ID)) {
+                $expiration = date_i18n(get_option('date_format'), strtotime(wpinv_get_discount_expiration($discount->ID)));
             } else {
-                $expiration = __( 'Never', 'invoicing' );
+                $expiration = __('Never', 'invoicing');
             }
                 
             echo $expiration;
         break;
         case 'description' :
-            echo wp_kses_post( $post->post_excerpt );
+            echo wp_kses_post($post->post_excerpt);
         break;
         case 'status' :
-            $status = wpinv_is_discount_expired( $discount->ID ) ? 'expired' : $discount->post_status;
+            $status = wpinv_is_discount_expired($discount->ID) ? 'expired' : $discount->post_status;
             
-            echo wpinv_discount_status( $status );
+            echo wpinv_discount_status($status);
         break;
     }
 }
 
-add_filter( 'post_row_actions', 'wpinv_post_row_actions', 9999, 2 );
-function wpinv_post_row_actions( $actions, $post ) {
-    $post_type = !empty( $post->post_type ) ? $post->post_type : '';
+add_filter('post_row_actions', 'wpinv_post_row_actions', 9999, 2);
+function wpinv_post_row_actions($actions, $post) {
+    $post_type = !empty($post->post_type) ? $post->post_type : '';
     
-    if ( $post_type == 'wpi_invoice' ) {
+    if ($post_type == 'wpi_invoice') {
         $actions = array();
     }
     
-    if ( $post_type == 'wpi_discount' ) {
-        $actions = wpinv_discount_row_actions( $post, $actions );
+    if ($post_type == 'wpi_discount') {
+        $actions = wpinv_discount_row_actions($post, $actions);
     }
     
     return $actions;
 }
 
-function wpinv_discount_row_actions( $discount, $row_actions ) {
-    $row_actions  = array();
-    $edit_link = get_edit_post_link( $discount->ID );
-    $row_actions['edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit', 'invoicing' ) . '</a>';
+function wpinv_discount_row_actions($discount, $row_actions) {
+    $row_actions = array();
+    $edit_link = get_edit_post_link($discount->ID);
+    $row_actions['edit'] = '<a href="' . esc_url($edit_link) . '">' . __('Edit', 'invoicing') . '</a>';
 
-    if( in_array( strtolower( $discount->post_status ),  array(  'publish' ) ) ) {
-        $row_actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'deactivate_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Deactivate', 'invoicing' ) . '</a>';
-    } elseif( in_array( strtolower( $discount->post_status ),  array( 'pending', 'draft' ) ) ) {
-        $row_actions['activate'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'activate_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Activate', 'invoicing' ) . '</a>';
+    if (in_array(strtolower($discount->post_status), array('publish'))) {
+        $row_actions['deactivate'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'deactivate_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Deactivate', 'invoicing') . '</a>';
+    } elseif (in_array(strtolower($discount->post_status), array('pending', 'draft'))) {
+        $row_actions['activate'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'activate_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Activate', 'invoicing') . '</a>';
     }
 
-    if ( wpinv_get_discount_uses( $discount->ID ) > 0 ) {
-        if ( isset( $row_actions['delete'] ) ) {
-            unset( $row_actions['delete'] ); // Don't delete used discounts.
+    if (wpinv_get_discount_uses($discount->ID) > 0) {
+        if (isset($row_actions['delete'])) {
+            unset($row_actions['delete']); // Don't delete used discounts.
         }
     } else {
-        $row_actions['delete'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'delete_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Delete', 'invoicing' ) . '</a>';
+        $row_actions['delete'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'delete_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Delete', 'invoicing') . '</a>';
     }
     
 
-    $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );
+    $row_actions = apply_filters('wpinv_discount_row_actions', $row_actions, $discount);
 
     return $row_actions;
 }
 
-add_filter( 'list_table_primary_column', 'wpinv_table_primary_column', 10, 2 );
-function wpinv_table_primary_column( $default, $screen_id ) {
-    if ( 'edit-wpi_invoice' === $screen_id ) {
+add_filter('list_table_primary_column', 'wpinv_table_primary_column', 10, 2);
+function wpinv_table_primary_column($default, $screen_id) {
+    if ('edit-wpi_invoice' === $screen_id) {
         return 'name';
     }
     
     return $default;
 }
 
-function wpinv_discount_bulk_actions( $actions, $display = false ) {    
-    if ( !$display ) {
+function wpinv_discount_bulk_actions($actions, $display = false) {    
+    if (!$display) {
         return array();
     }
     
     $actions = array(
-        'activate'   => __( 'Activate', 'invoicing' ),
-        'deactivate' => __( 'Deactivate', 'invoicing' ),
-        'delete'     => __( 'Delete', 'invoicing' ),
+        'activate'   => __('Activate', 'invoicing'),
+        'deactivate' => __('Deactivate', 'invoicing'),
+        'delete'     => __('Delete', 'invoicing'),
     );
     $two = '';
     $which = 'top';
     echo '</div><div class="alignleft actions bulkactions">';
-    echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
-    echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">";
-    echo '<option value="-1">' . __( 'Bulk Actions' ) . "</option>";
+    echo '<label for="bulk-action-selector-' . esc_attr($which) . '" class="screen-reader-text">' . __('Select bulk action') . '</label>';
+    echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr($which) . "\">";
+    echo '<option value="-1">' . __('Bulk Actions') . "</option>";
 
-    foreach ( $actions as $name => $title ) {
+    foreach ($actions as $name => $title) {
         $class = 'edit' === $name ? ' class="hide-if-no-js"' : '';
 
         echo "" . '<option value="' . $name . '"' . $class . '>' . $title . "</option>";
     }
     echo "</select>";
 
-    submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+    submit_button(__('Apply'), 'action', '', false, array('id' => "doaction$two"));
     
     echo '</div><div class="alignleft actions">';
 }
-add_filter( 'bulk_actions-edit-wpi_discount', 'wpinv_discount_bulk_actions', 10 );
+add_filter('bulk_actions-edit-wpi_discount', 'wpinv_discount_bulk_actions', 10);
 
-function wpinv_disable_months_dropdown( $disable, $post_type ) {
-    if ( $post_type == 'wpi_discount' ) {
+function wpinv_disable_months_dropdown($disable, $post_type) {
+    if ($post_type == 'wpi_discount') {
         $disable = true;
     }
     
     return $disable;
 }
-add_filter( 'disable_months_dropdown', 'wpinv_disable_months_dropdown', 10, 2 );
+add_filter('disable_months_dropdown', 'wpinv_disable_months_dropdown', 10, 2);
 
 function wpinv_restrict_manage_posts() {
     global $typenow;
 
-    if( 'wpi_discount' == $typenow ) {
+    if ('wpi_discount' == $typenow) {
         wpinv_discount_filters();
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_restrict_manage_posts', 10 );
+add_action('restrict_manage_posts', 'wpinv_restrict_manage_posts', 10);
 
 function wpinv_discount_filters() {
-    echo wpinv_discount_bulk_actions( array(), true );
+    echo wpinv_discount_bulk_actions(array(), true);
     
     ?>
     <select name="discount_type" id="dropdown_wpinv_discount_type">
-        <option value=""><?php _e( 'Show all types', 'invoicing' ); ?></option>
+        <option value=""><?php _e('Show all types', 'invoicing'); ?></option>
         <?php
             $types = wpinv_get_discount_types();
 
-            foreach ( $types as $name => $type ) {
-                echo '<option value="' . esc_attr( $name ) . '"';
+            foreach ($types as $name => $type) {
+                echo '<option value="' . esc_attr($name) . '"';
 
-                if ( isset( $_GET['discount_type'] ) )
-                    selected( $name, $_GET['discount_type'] );
+                if (isset($_GET['discount_type']))
+                    selected($name, $_GET['discount_type']);
 
-                echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+                echo '>' . esc_html__($type, 'invoicing') . '</option>';
             }
         ?>
     </select>
     <?php
 }
 
-function wpinv_request( $vars ) {
+function wpinv_request($vars) {
     global $typenow, $wp_query, $wp_post_statuses;
 
-    if ( 'wpi_invoice' === $typenow ) {
-        if ( !isset( $vars['post_status'] ) ) {
+    if ('wpi_invoice' === $typenow) {
+        if (!isset($vars['post_status'])) {
             $post_statuses = wpinv_get_invoice_statuses();
 
-            foreach ( $post_statuses as $status => $value ) {
-                if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
-                    unset( $post_statuses[ $status ] );
+            foreach ($post_statuses as $status => $value) {
+                if (isset($wp_post_statuses[$status]) && false === $wp_post_statuses[$status]->show_in_admin_all_list) {
+                    unset($post_statuses[$status]);
                 }
             }
 
-            $vars['post_status'] = array_keys( $post_statuses );
+            $vars['post_status'] = array_keys($post_statuses);
         }
         
-        if ( isset( $vars['orderby'] ) ) {
-            if ( 'amount' == $vars['orderby'] ) {
+        if (isset($vars['orderby'])) {
+            if ('amount' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -231,7 +231,7 @@ 
                         'orderby'  => 'meta_value_num'
                     )
                 );
-            } else if ( 'customer' == $vars['orderby'] ) {
+            } else if ('customer' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -241,9 +241,9 @@ 
                 );
             }
         }
-    } else if ( 'wpi_item' == $typenow ) {
+    } else if ('wpi_item' == $typenow) {
         // Check if 'orderby' is set to "price"
-        if ( isset( $vars['orderby'] ) && 'price' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'price' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -254,7 +254,7 @@ 
         }
 
         // Check if "orderby" is set to "vat_rule"
-        if ( isset( $vars['orderby'] ) && 'vat_rule' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'vat_rule' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -265,7 +265,7 @@ 
         }
 
         // Check if "orderby" is set to "vat_class"
-        if ( isset( $vars['orderby'] ) && 'vat_class' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'vat_class' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -276,7 +276,7 @@ 
         }
         
         // Check if "orderby" is set to "type"
-        if ( isset( $vars['orderby'] ) && 'type' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'type' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -287,7 +287,7 @@ 
         }
         
         // Check if "orderby" is set to "recurring"
-        if ( isset( $vars['orderby'] ) && 'recurring' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'recurring' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -297,120 +297,120 @@ 
             );
         }
 
-        $meta_query = !empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['vat_rule'] ) && $_GET['vat_rule'] !== '' ) {
+        if (isset($_GET['vat_rule']) && $_GET['vat_rule'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_vat_rule',
-                    'value' => sanitize_text_field( $_GET['vat_rule'] ),
+                    'value' => sanitize_text_field($_GET['vat_rule']),
                     'compare' => '='
                 );
         }
         
         // Filter vat class
-        if ( isset( $_GET['vat_class'] ) && $_GET['vat_class'] !== '' ) {
+        if (isset($_GET['vat_class']) && $_GET['vat_class'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_vat_class',
-                    'value' => sanitize_text_field( $_GET['vat_class'] ),
+                    'value' => sanitize_text_field($_GET['vat_class']),
                     'compare' => '='
                 );
         }
         
         // Filter item type
-        if ( isset( $_GET['type'] ) && $_GET['type'] !== '' ) {
+        if (isset($_GET['type']) && $_GET['type'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_type',
-                    'value' => sanitize_text_field( $_GET['type'] ),
+                    'value' => sanitize_text_field($_GET['type']),
                     'compare' => '='
                 );
         }
         
-        if ( !empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
         }
-    } else if ( 'wpi_discount' == $typenow ) {
-        $meta_query = !empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+    } else if ('wpi_discount' == $typenow) {
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
+        if (isset($_GET['discount_type']) && $_GET['discount_type'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpi_discount_type',
-                    'value' => sanitize_text_field( $_GET['discount_type'] ),
+                    'value' => sanitize_text_field($_GET['discount_type']),
                     'compare' => '='
                 );
         }
         
-        if ( !empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
         }
     }
 
     return $vars;
 }
-add_filter( 'request', 'wpinv_request' );
+add_filter('request', 'wpinv_request');
 
 function wpinv_options_page() {
-    $page       = isset( $_GET['page'] )                ? strtolower( $_GET['page'] )               : false;
+    $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
     
-    if ( $page !== 'wpinv-settings' ) {
+    if ($page !== 'wpinv-settings') {
         return;
     }
     
     $settings_tabs = wpinv_get_settings_tabs();
     $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
-    $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
-    $sections      = wpinv_get_settings_tab_sections( $active_tab );
+    $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
+    $sections      = wpinv_get_settings_tab_sections($active_tab);
     $key           = 'main';
 
-    if ( is_array( $sections ) ) {
-        $key = key( $sections );
+    if (is_array($sections)) {
+        $key = key($sections);
     }
 
-    $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
-    $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? $_GET['section'] : $key;
+    $registered_sections = wpinv_get_settings_tab_sections($active_tab);
+    $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? $_GET['section'] : $key;
     ob_start();
     ?>
     <div class="wrap">
         <h1 class="nav-tab-wrapper">
             <?php
-            foreach( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
-                $tab_url = add_query_arg( array(
+            foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
+                $tab_url = add_query_arg(array(
                     'settings-updated' => false,
                     'tab' => $tab_id,
-                ) );
+                ));
 
                 // Remove the section from the tabs so we always end up at the main section
-                $tab_url = remove_query_arg( 'section', $tab_url );
-                $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                $tab_url = remove_query_arg('section', $tab_url);
+                $tab_url = remove_query_arg('wpi_sub', $tab_url);
 
                 $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
 
-                echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';
-                    echo esc_html( $tab_name );
+                echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . $active . '">';
+                    echo esc_html($tab_name);
                 echo '</a>';
             }
             ?>
         </h1>
         <?php
-        $number_of_sections = count( $sections );
+        $number_of_sections = count($sections);
         $number = 0;
-        if ( $number_of_sections > 1 ) {
+        if ($number_of_sections > 1) {
             echo '<div><ul class="subsubsub">';
-            foreach( $sections as $section_id => $section_name ) {
+            foreach ($sections as $section_id => $section_name) {
                 echo '<li>';
                 $number++;
-                $tab_url = add_query_arg( array(
+                $tab_url = add_query_arg(array(
                     'settings-updated' => false,
                     'tab' => $active_tab,
                     'section' => $section_id
-                ) );
-                $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                ));
+                $tab_url = remove_query_arg('wpi_sub', $tab_url);
                 $class = '';
-                if ( $section == $section_id ) {
+                if ($section == $section_id) {
                     $class = 'current';
                 }
-                echo '<a class="' . $class . '" href="' . esc_url( $tab_url ) . '">' . $section_name . '</a>';
+                echo '<a class="' . $class . '" href="' . esc_url($tab_url) . '">' . $section_name . '</a>';
 
-                if ( $number != $number_of_sections ) {
+                if ($number != $number_of_sections) {
                     echo ' | ';
                 }
                 echo '</li>';
@@ -422,19 +422,19 @@ 
             <form method="post" action="options.php">
                 <table class="form-table">
                 <?php
-                settings_fields( 'wpinv_settings' );
+                settings_fields('wpinv_settings');
 
-                if ( 'main' === $section ) {
-                    do_action( 'wpinv_settings_tab_top', $active_tab );
+                if ('main' === $section) {
+                    do_action('wpinv_settings_tab_top', $active_tab);
                 }
 
-                do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section );
-                do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section );
-                do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section  );
+                do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section);
+                do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section);
+                do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section);
 
                 // For backwards compatibility
-                if ( 'main' === $section ) {
-                    do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                if ('main' === $section) {
+                    do_action('wpinv_settings_tab_bottom', $active_tab);
                 }
                 ?>
                 </table>
@@ -447,12 +447,12 @@ 
     echo $content;
 }
 
-function wpinv_item_type_class( $classes, $class, $post_id ) {
+function wpinv_item_type_class($classes, $class, $post_id) {
     global $pagenow, $typenow;
 
-    if ( $pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type( $post_id ) == $typenow && $type = get_post_meta( $post_id, '_wpinv_type', true ) ) {
-        $classes[] = 'wpi-type-' . sanitize_html_class( $type );
+    if ($pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type($post_id) == $typenow && $type = get_post_meta($post_id, '_wpinv_type', true)) {
+        $classes[] = 'wpi-type-' . sanitize_html_class($type);
     }
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_item_type_class', 10, 3 );
\ No newline at end of file
+add_filter('post_class', 'wpinv_item_type_class', 10, 3);
\ No newline at end of file

includes/admin/wpinv-admin-functions.php

Spacing +196 added lines, -196 removed lines

@@ -7,228 +7,228 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_columns( $columns ) {
+function wpinv_columns($columns) {
     $columns = array(
         'cb'                => $columns['cb'],
-        'ID'                => __( 'ID', 'invoicing' ),
-        'details'           => __( 'Details', 'invoicing' ),
+        'ID'                => __('ID', 'invoicing'),
+        'details'           => __('Details', 'invoicing'),
         //'email'             => __( 'Email', 'invoicing' ),
-        'customer'          => __( 'Customer', 'invoicing' ),
-        'amount'            => __( 'Amount', 'invoicing' ),
-        'invoice_date'      => __( 'Date', 'invoicing' ),
-        'status'            => __( 'Status', 'invoicing' ),
-        'wpi_actions'       => __( 'Actions', 'invoicing' ),
+        'customer'          => __('Customer', 'invoicing'),
+        'amount'            => __('Amount', 'invoicing'),
+        'invoice_date'      => __('Date', 'invoicing'),
+        'status'            => __('Status', 'invoicing'),
+        'wpi_actions'       => __('Actions', 'invoicing'),
     );
 
-    return apply_filters( 'wpi_invoice_table_columns', $columns );
+    return apply_filters('wpi_invoice_table_columns', $columns);
 }
-add_filter( 'manage_wpi_invoice_posts_columns', 'wpinv_columns' );
+add_filter('manage_wpi_invoice_posts_columns', 'wpinv_columns');
 
-function wpinv_bulk_actions( $actions ) {
-    if ( isset( $actions['edit'] ) ) {
-        unset( $actions['edit'] );
+function wpinv_bulk_actions($actions) {
+    if (isset($actions['edit'])) {
+        unset($actions['edit']);
     }
 
     return $actions;
 }
-add_filter( 'bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions' );
+add_filter('bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions');
 
-function wpinv_sortable_columns( $columns ) {
+function wpinv_sortable_columns($columns) {
     $columns = array(
-        'ID'     => array( 'ID', true ),
-        'amount' => array( 'amount', false ),
-        'invoice_date'   => array( 'date', false ),
-        'customer'   => array( 'customer', false ),
+        'ID'     => array('ID', true),
+        'amount' => array('amount', false),
+        'invoice_date'   => array('date', false),
+        'customer'   => array('customer', false),
         ///'email'   => array( 'email', false ),
-        'status'   => array( 'status', false ),
+        'status'   => array('status', false),
     );
     
-    return apply_filters( 'wpi_invoice_table_sortable_columns', $columns );
+    return apply_filters('wpi_invoice_table_sortable_columns', $columns);
 }
-add_filter( 'manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns' );
+add_filter('manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns');
 
-add_action( 'manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
-function wpinv_posts_custom_column( $column_name, $post_id = 0 ) {
+add_action('manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
+function wpinv_posts_custom_column($column_name, $post_id = 0) {
     global $post, $wpi_invoice;
     
-    if ( empty( $wpi_invoice ) || ( !empty( $wpi_invoice ) && $post->ID != $wpi_invoice->ID ) ) {
-        $wpi_invoice = new WPInv_Invoice( $post->ID );
+    if (empty($wpi_invoice) || (!empty($wpi_invoice) && $post->ID != $wpi_invoice->ID)) {
+        $wpi_invoice = new WPInv_Invoice($post->ID);
     }
 
     $value = NULL;
     
-    switch ( $column_name ) {
+    switch ($column_name) {
         case 'email' :
-            $value   = $wpi_invoice->get_email();
+            $value = $wpi_invoice->get_email();
             break;
         case 'customer' :
             $customer_name = $wpi_invoice->get_user_full_name();
-            $customer_name = $customer_name != '' ? $customer_name : __( 'Customer', 'invoicing' );
-            $value = '<a href="' . esc_url( get_edit_user_link( $wpi_invoice->get_user_id() ) ) . '">' . $customer_name . '</a>';
-            if ( $email = $wpi_invoice->get_email() ) {
+            $customer_name = $customer_name != '' ? $customer_name : __('Customer', 'invoicing');
+            $value = '<a href="' . esc_url(get_edit_user_link($wpi_invoice->get_user_id())) . '">' . $customer_name . '</a>';
+            if ($email = $wpi_invoice->get_email()) {
                 $value .= '<br><a class="email" href="mailto:' . $email . '">' . $email . '</a>';
             }
             break;
         case 'amount' :
-            echo $wpi_invoice->get_total( true );
+            echo $wpi_invoice->get_total(true);
             break;
         case 'invoice_date' :
-            $date_format = get_option( 'date_format' );
-            $time_format = get_option( 'time_format' );
-            $date_time_format = $date_format . ' '. $time_format;
+            $date_format = get_option('date_format');
+            $time_format = get_option('time_format');
+            $date_time_format = $date_format . ' ' . $time_format;
             
-            $t_time = get_the_time( $date_time_format );
+            $t_time = get_the_time($date_time_format);
             $m_time = $post->post_date;
-            $h_time = mysql2date( $date_format, $m_time );
+            $h_time = mysql2date($date_format, $m_time);
             
             $value   = '<abbr title="' . $t_time . '">' . $h_time . '</abbr>';
             break;
         case 'status' :
-            $value   = $wpi_invoice->get_status( true ) . ( $wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '' );
+            $value   = $wpi_invoice->get_status(true) . ($wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '');
             break;
         case 'details' :
-            $edit_link = get_edit_post_link( $post->ID );
-            $value = '<a href="' . esc_url( $edit_link ) . '">' . __( 'View Invoice Details', 'invoicing' ) . '</a>';
+            $edit_link = get_edit_post_link($post->ID);
+            $value = '<a href="' . esc_url($edit_link) . '">' . __('View Invoice Details', 'invoicing') . '</a>';
             break;
         case 'wpi_actions' :
             $value = '';
-            if ( !empty( $post->post_name ) ) {
-                $value .= '<a title="' . esc_attr__( 'Print invoice', 'invoicing' ) . '" href="' . esc_url( get_permalink( $post->ID ) ) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
+            if (!empty($post->post_name)) {
+                $value .= '<a title="' . esc_attr__('Print invoice', 'invoicing') . '" href="' . esc_url(get_permalink($post->ID)) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
             }
             
-            if ( $email = $wpi_invoice->get_email() ) {
-                $value .= '<a title="' . esc_attr__( 'Send invoice to customer', 'invoicing' ) . '" href="' . esc_url( add_query_arg( array( 'wpi_action' => 'send_invoice', 'invoice_id' => $post->ID ) ) ) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
+            if ($email = $wpi_invoice->get_email()) {
+                $value .= '<a title="' . esc_attr__('Send invoice to customer', 'invoicing') . '" href="' . esc_url(add_query_arg(array('wpi_action' => 'send_invoice', 'invoice_id' => $post->ID))) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
             }
             
             break;
         default:
-            $value = isset( $post->$column_name ) ? $post->$column_name : '';
+            $value = isset($post->$column_name) ? $post->$column_name : '';
             break;
 
     }
-    $value = apply_filters( 'wpinv_payments_table_column', $value, $post->ID, $column_name );
+    $value = apply_filters('wpinv_payments_table_column', $value, $post->ID, $column_name);
     
-    if ( $value !== NULL ) {
+    if ($value !== NULL) {
         echo $value;
     }
 }
 
-function wpinv_admin_post_id( $id = 0 ) {
+function wpinv_admin_post_id($id = 0) {
     global $post;
 
-    if ( isset( $id ) && ! empty( $id ) ) {
+    if (isset($id) && !empty($id)) {
         return (int)$id;
-    } else if ( get_the_ID() ) {
-        return (int) get_the_ID();
-    } else if ( isset( $post->ID ) && !empty( $post->ID ) ) {
-        return (int) $post->ID;
-    } else if ( isset( $_GET['post'] ) && !empty( $_GET['post'] ) ) {
-        return (int) $_GET['post'];
-    } else if ( isset( $_GET['id'] ) && !empty( $_GET['id'] ) ) {
-        return (int) $_GET['id'];
-    } else if ( isset( $_POST['id'] ) && !empty( $_POST['id'] ) ) {
-        return (int) $_POST['id'];
+    } else if (get_the_ID()) {
+        return (int)get_the_ID();
+    } else if (isset($post->ID) && !empty($post->ID)) {
+        return (int)$post->ID;
+    } else if (isset($_GET['post']) && !empty($_GET['post'])) {
+        return (int)$_GET['post'];
+    } else if (isset($_GET['id']) && !empty($_GET['id'])) {
+        return (int)$_GET['id'];
+    } else if (isset($_POST['id']) && !empty($_POST['id'])) {
+        return (int)$_POST['id'];
     } 
 
     return null;
 }
     
-function wpinv_admin_post_type( $id = 0 ) {
-    if ( !$id ) {
+function wpinv_admin_post_type($id = 0) {
+    if (!$id) {
         $id = wpinv_admin_post_id();
     }
     
-    $type = get_post_type( $id );
+    $type = get_post_type($id);
     
-    if ( !$type ) {
-        $type = isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) ? $_GET['post_type'] : null;
+    if (!$type) {
+        $type = isset($_GET['post_type']) && !empty($_GET['post_type']) ? $_GET['post_type'] : null;
     }
     
-    return apply_filters( 'wpinv_admin_post_type', $type, $id );
+    return apply_filters('wpinv_admin_post_type', $type, $id);
 }
 
 function wpinv_admin_messages() {
 	global $wpinv_options;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_added' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-added', __('Discount code added.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_add_failed' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-add-fail', __('There was a problem adding your discount code, please try again.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_exists' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-exists', __('A discount with that code already exists, please use a different code.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_updated' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-updated', __('Discount code updated.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_update_failed' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-updated-fail', __('There was a problem updating your discount code, please try again.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice_deleted' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-deleted', __('The invoice has been deleted.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'email_sent' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-sent', __('The email has been sent to customer.', 'invoicing'), 'updated');
     }
     
-    if ( isset( $_GET['wpinv-message'] ) && 'email_fail' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+    if (isset($_GET['wpinv-message']) && 'email_fail' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-sent-fail', __('Fail to send email to the customer.', 'invoicing'), 'error');
     }
 
-    if ( isset( $_GET['wpinv-message'] ) && 'invoice-note-deleted' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-        add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
+    if (isset($_GET['wpinv-message']) && 'invoice-note-deleted' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+        add_settings_error('wpinv-notices', 'wpinv-note-deleted', __('The invoice note has been deleted.', 'invoicing'), 'updated');
     }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'settings-imported' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-settings-imported', __('The settings have been imported.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'note-added' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-note-added', __('The invoice note has been added successfully.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && current_user_can( 'manage_options' ) ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice-updated' == $_GET['wpinv-message'] && current_user_can('manage_options')) {
+		add_settings_error('wpinv-notices', 'wpinv-updated', __('The invoice has been successfully updated.', 'invoicing'), 'updated');
 	}
 
-	settings_errors( 'wpinv-notices' );
+	settings_errors('wpinv-notices');
 }
-add_action( 'admin_notices', 'wpinv_admin_messages' );
+add_action('admin_notices', 'wpinv_admin_messages');
 
-function wpinv_items_columns( $existing_columns ) {
+function wpinv_items_columns($existing_columns) {
     global $wpinv_euvat;
     
     $columns                = array();
     $columns['cb']          = $existing_columns['cb'];
-    $columns['title']       = __( 'Title', 'invoicing' );
-    $columns['price']       = __( 'Price', 'invoicing' );
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        $columns['vat_rule']    = __( 'VAT rule type', 'invoicing' );
+    $columns['title']       = __('Title', 'invoicing');
+    $columns['price']       = __('Price', 'invoicing');
+    if ($wpinv_euvat->allow_vat_rules()) {
+        $columns['vat_rule']    = __('VAT rule type', 'invoicing');
     }
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        $columns['vat_class']   = __( 'VAT class', 'invoicing' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        $columns['vat_class']   = __('VAT class', 'invoicing');
     }
-    $columns['type']        = __( 'Type', 'invoicing' );
-    $columns['recurring']   = __( 'Recurring', 'invoicing' );
-    $columns['date']        = __( 'Date', 'invoicing' );
-    $columns['id']          = __( 'ID', 'invoicing' );
+    $columns['type']        = __('Type', 'invoicing');
+    $columns['recurring']   = __('Recurring', 'invoicing');
+    $columns['date']        = __('Date', 'invoicing');
+    $columns['id']          = __('ID', 'invoicing');
 
-    return apply_filters( 'wpinv_items_columns', $columns );
+    return apply_filters('wpinv_items_columns', $columns);
 }
-add_filter( 'manage_wpi_item_posts_columns', 'wpinv_items_columns' );
+add_filter('manage_wpi_item_posts_columns', 'wpinv_items_columns');
 
-function wpinv_items_sortable_columns( $columns ) {
+function wpinv_items_sortable_columns($columns) {
     $columns['price']       = 'price';
     $columns['vat_rule']    = 'vat_rule';
     $columns['vat_class']   = 'vat_class';
@@ -238,10 +238,10 @@ 
 
     return $columns;
 }
-add_filter( 'manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns' );
+add_filter('manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns');
 
-function wpinv_item_quick_edit( $column_name, $post_type ) {
-    if ( !( $post_type == 'wpi_item' && $column_name == 'price' ) ) {
+function wpinv_item_quick_edit($column_name, $post_type) {
+    if (!($post_type == 'wpi_item' && $column_name == 'price')) {
         return;
     }
     global $wpinv_euvat, $post;
@@ -249,23 +249,23 @@ 
     $symbol    = wpinv_currency_symbol();
     $position  = wpinv_currency_position();
 
-    $price     = wpinv_get_item_price( $post->ID );
-    $item_type = wpinv_get_item_type( $post->ID );
+    $price     = wpinv_get_item_price($post->ID);
+    $item_type = wpinv_get_item_type($post->ID);
     ?>
     <fieldset class="inline-edit-col-right wpi-inline-item-col">
         <div class="inline-edit-col">
             <div class="inline-edit-group wp-clearfix">
                 <label class="inline-edit-wpinv-price">
-                    <span class="title"><?php _e( 'Item price', 'invoicing' );?></span>
-                    <span class="input-text-wrap"><?php echo ( $position != 'right' ? $symbol . '&nbsp;' : '' );?><input type="text" placeholder="<?php echo wpinv_format_amount( 0 ); ?>" value="<?php echo wpinv_format_amount( $price );?>" name="_wpinv_item_price" class="wpi-field-price wpi-price" id="wpinv_item_price-<?php echo $post->ID;?>"><?php echo ( $position == 'right' ? $symbol . '&nbsp;' : '' );?></span>
+                    <span class="title"><?php _e('Item price', 'invoicing'); ?></span>
+                    <span class="input-text-wrap"><?php echo ($position != 'right' ? $symbol . '&nbsp;' : ''); ?><input type="text" placeholder="<?php echo wpinv_format_amount(0); ?>" value="<?php echo wpinv_format_amount($price); ?>" name="_wpinv_item_price" class="wpi-field-price wpi-price" id="wpinv_item_price-<?php echo $post->ID; ?>"><?php echo ($position == 'right' ? $symbol . '&nbsp;' : ''); ?></span>
                 </label>
             </div>
-            <?php if ( $wpinv_euvat->allow_vat_rules() ) { $rule_type = $wpinv_euvat->get_item_rule( $post->ID ); ?>
+            <?php if ($wpinv_euvat->allow_vat_rules()) { $rule_type = $wpinv_euvat->get_item_rule($post->ID); ?>
             <div class="inline-edit-group wp-clearfix">
                 <label class="inline-edit-wpinv-vat-rate">
-                    <span class="title"><?php _e( 'VAT rule type to use', 'invoicing' );?></span>
+                    <span class="title"><?php _e('VAT rule type to use', 'invoicing'); ?></span>
                     <span class="input-text-wrap">
-                        <?php echo wpinv_html_select( array(
+                        <?php echo wpinv_html_select(array(
                             'options'          => $wpinv_euvat->get_rules(),
                             'name'             => '_wpinv_vat_rules',
                             'id'               => 'wpinv_vat_rules-' . $post->ID,
@@ -273,16 +273,16 @@ 
                             'show_option_all'  => false,
                             'show_option_none' => false,
                             'class'            => 'gdmbx2-text-medium wpinv-vat-rules',
-                        ) ); ?>
+                        )); ?>
                     </span>
                 </label>
             </div>
-            <?php } if ( $wpinv_euvat->allow_vat_classes() ) { $vat_class = $wpinv_euvat->get_item_class( $post->ID ); ?>
+            <?php } if ($wpinv_euvat->allow_vat_classes()) { $vat_class = $wpinv_euvat->get_item_class($post->ID); ?>
             <div class="inline-edit-group wp-clearfix">
                 <label class="inline-edit-wpinv-vat-class">
-                    <span class="title"><?php _e( 'VAT class to use', 'invoicing' );?></span>
+                    <span class="title"><?php _e('VAT class to use', 'invoicing'); ?></span>
                     <span class="input-text-wrap">
-                        <?php echo wpinv_html_select( array(
+                        <?php echo wpinv_html_select(array(
                             'options'          => $wpinv_euvat->get_all_classes(),
                             'name'             => '_wpinv_vat_class',
                             'id'               => 'wpinv_vat_class-' . $post->ID,
@@ -290,16 +290,16 @@ 
                             'show_option_all'  => false,
                             'show_option_none' => false,
                             'class'            => 'gdmbx2-text-medium wpinv-vat-class',
-                        ) ); ?>
+                        )); ?>
                     </span>
                 </label>
             </div>
             <?php } ?>
             <div class="inline-edit-group wp-clearfix">
                 <label class="inline-edit-wpinv-type">
-                    <span class="title"><?php _e( 'Item type', 'invoicing' );?></span>
+                    <span class="title"><?php _e('Item type', 'invoicing'); ?></span>
                     <span class="input-text-wrap">
-                        <?php echo wpinv_html_select( array(
+                        <?php echo wpinv_html_select(array(
                             'options'          => wpinv_get_item_types(),
                             'name'             => '_wpinv_item_type',
                             'id'               => 'wpinv_item_type-' . $post->ID,
@@ -307,7 +307,7 @@ 
                             'show_option_all'  => false,
                             'show_option_none' => false,
                             'class'            => 'gdmbx2-text-medium wpinv-item-type',
-                        ) ); ?>
+                        )); ?>
                     </span>
                 </label>
             </div>
@@ -315,150 +315,150 @@ 
     </fieldset>
     <?php
 }
-add_action( 'quick_edit_custom_box', 'wpinv_item_quick_edit', 10, 2 );
-add_action( 'bulk_edit_custom_box', 'wpinv_item_quick_edit', 10, 2 );
+add_action('quick_edit_custom_box', 'wpinv_item_quick_edit', 10, 2);
+add_action('bulk_edit_custom_box', 'wpinv_item_quick_edit', 10, 2);
 
-function wpinv_items_table_custom_column( $column ) {
+function wpinv_items_table_custom_column($column) {
     global $wpinv_euvat, $post, $wpi_item;
     
-    if ( empty( $wpi_item ) || ( !empty( $wpi_item ) && $post->ID != $wpi_item->ID ) ) {
-        $wpi_item = new WPInv_Item( $post->ID );
+    if (empty($wpi_item) || (!empty($wpi_item) && $post->ID != $wpi_item->ID)) {
+        $wpi_item = new WPInv_Item($post->ID);
     }
 
-    switch ( $column ) {
+    switch ($column) {
         case 'price' :
-            echo wpinv_item_price( $post->ID );
+            echo wpinv_item_price($post->ID);
         break;
         case 'vat_rule' :
-            echo $wpinv_euvat->item_rule_label( $post->ID );
+            echo $wpinv_euvat->item_rule_label($post->ID);
         break;
         case 'vat_class' :
-            echo $wpinv_euvat->item_class_label( $post->ID );
+            echo $wpinv_euvat->item_class_label($post->ID);
         break;
         case 'type' :
-            echo wpinv_item_type( $post->ID ) . '<span class="meta">' . $wpi_item->get_cpt_singular_name() . '</span>';
+            echo wpinv_item_type($post->ID) . '<span class="meta">' . $wpi_item->get_cpt_singular_name() . '</span>';
         break;
         case 'recurring' :
-            echo ( wpinv_is_recurring_item( $post->ID ) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>' );
+            echo (wpinv_is_recurring_item($post->ID) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>');
         break;
         case 'id' :
            echo $post->ID;
            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
-                    <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
-                    if ( $wpinv_euvat->allow_vat_rules() ) {
-                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';
+                    <div class="price">' . wpinv_get_item_price($post->ID) . '</div>';
+                    if ($wpinv_euvat->allow_vat_rules()) {
+                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule($post->ID) . '</div>';
                     }
-                    if ( $wpinv_euvat->allow_vat_classes() ) {
-                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class( $post->ID ) . '</div>';
+                    if ($wpinv_euvat->allow_vat_classes()) {
+                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class($post->ID) . '</div>';
                     }
-                    echo '<div class="type">' . wpinv_get_item_type( $post->ID ) . '</div>
+                    echo '<div class="type">' . wpinv_get_item_type($post->ID) . '</div>
                 </div>';
         break;
     }
     
-    do_action( 'wpinv_items_table_column_item_' . $column, $wpi_item, $post );
+    do_action('wpinv_items_table_column_item_' . $column, $wpi_item, $post);
 }
-add_action( 'manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column' );
+add_action('manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column');
 
 function wpinv_add_items_filters() {
     global $wpinv_euvat, $typenow;
 
     // Checks if the current post type is 'item'
-    if ( $typenow == 'wpi_item') {
-        if ( $wpinv_euvat->allow_vat_rules() ) {
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT rules', 'invoicing' ) ), $wpinv_euvat->get_rules() ),
+    if ($typenow == 'wpi_item') {
+        if ($wpinv_euvat->allow_vat_rules()) {
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT rules', 'invoicing')), $wpinv_euvat->get_rules()),
                     'name'             => 'vat_rule',
                     'id'               => 'vat_rule',
-                    'selected'         => ( isset( $_GET['vat_rule'] ) ? $_GET['vat_rule'] : '' ),
+                    'selected'         => (isset($_GET['vat_rule']) ? $_GET['vat_rule'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium',
-                ) );
+                ));
         }
         
-        if ( $wpinv_euvat->allow_vat_classes() ) {
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT classes', 'invoicing' ) ), $wpinv_euvat->get_all_classes() ),
+        if ($wpinv_euvat->allow_vat_classes()) {
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT classes', 'invoicing')), $wpinv_euvat->get_all_classes()),
                     'name'             => 'vat_class',
                     'id'               => 'vat_class',
-                    'selected'         => ( isset( $_GET['vat_class'] ) ? $_GET['vat_class'] : '' ),
+                    'selected'         => (isset($_GET['vat_class']) ? $_GET['vat_class'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium',
-                ) );
+                ));
         }
             
-        echo wpinv_html_select( array(
-                'options'          => array_merge( array( '' => __( 'All item types', 'invoicing' ) ), wpinv_get_item_types() ),
+        echo wpinv_html_select(array(
+                'options'          => array_merge(array('' => __('All item types', 'invoicing')), wpinv_get_item_types()),
                 'name'             => 'type',
                 'id'               => 'type',
-                'selected'         => ( isset( $_GET['type'] ) ? $_GET['type'] : '' ),
+                'selected'         => (isset($_GET['type']) ? $_GET['type'] : ''),
                 'show_option_all'  => false,
                 'show_option_none' => false,
                 'class'            => 'gdmbx2-text-medium',
-            ) );
+            ));
 
-        if ( isset( $_REQUEST['all_posts'] ) && '1' === $_REQUEST['all_posts'] ) {
+        if (isset($_REQUEST['all_posts']) && '1' === $_REQUEST['all_posts']) {
             echo '<input type="hidden" name="all_posts" value="1" />';
         }
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_add_items_filters', 100 );
+add_action('restrict_manage_posts', 'wpinv_add_items_filters', 100);
 
-function wpinv_send_invoice_after_save( $post_id ) {
+function wpinv_send_invoice_after_save($post_id) {
     // If this is just a revision, don't send the email.
-    if ( wp_is_post_revision( $post_id ) ) {
+    if (wp_is_post_revision($post_id)) {
         return;
     }
     
-    if ( !current_user_can( 'manage_options' ) || get_post_type( $post_id ) != 'wpi_invoice' ) {
+    if (!current_user_can('manage_options') || get_post_type($post_id) != 'wpi_invoice') {
         return;
     }
     
-    if ( !empty( $_POST['wpi_save_send'] ) ) {
-        wpinv_user_invoice_notification( $post_id );
+    if (!empty($_POST['wpi_save_send'])) {
+        wpinv_user_invoice_notification($post_id);
     }
 }
-add_action( 'save_post', 'wpinv_send_invoice_after_save', 100, 1 );
+add_action('save_post', 'wpinv_send_invoice_after_save', 100, 1);
 
-function wpinv_send_register_new_user( $data, $postarr ) {
-    if ( current_user_can( 'manage_options' ) && !empty( $data['post_type'] ) && $data['post_type'] == 'wpi_invoice' ) {
-        $is_new_user = !empty( $postarr['wpinv_new_user'] ) ? true : false;
-        $email = !empty( $postarr['wpinv_email'] ) && $postarr['wpinv_email'] && is_email( $postarr['wpinv_email'] ) ? $postarr['wpinv_email'] : NULL;
+function wpinv_send_register_new_user($data, $postarr) {
+    if (current_user_can('manage_options') && !empty($data['post_type']) && $data['post_type'] == 'wpi_invoice') {
+        $is_new_user = !empty($postarr['wpinv_new_user']) ? true : false;
+        $email = !empty($postarr['wpinv_email']) && $postarr['wpinv_email'] && is_email($postarr['wpinv_email']) ? $postarr['wpinv_email'] : NULL;
         
-        if ( $is_new_user && $email && !email_exists( $email ) ) {
-            $first_name = !empty( $postarr['wpinv_first_name'] ) ? sanitize_text_field( $postarr['wpinv_first_name'] ) : '';
-            $last_name = !empty( $postarr['wpinv_last_name'] ) ? sanitize_text_field( $postarr['wpinv_last_name'] ) : '';
-            $display_name = $first_name || $last_name ? trim( $first_name . ' ' . $last_name ) : '';
-            $user_nicename = $display_name ? trim( $display_name ) : $email;
-            $user_company = !empty( $postarr['wpinv_company'] ) ? sanitize_text_field( $postarr['wpinv_company'] ) : '';
+        if ($is_new_user && $email && !email_exists($email)) {
+            $first_name = !empty($postarr['wpinv_first_name']) ? sanitize_text_field($postarr['wpinv_first_name']) : '';
+            $last_name = !empty($postarr['wpinv_last_name']) ? sanitize_text_field($postarr['wpinv_last_name']) : '';
+            $display_name = $first_name || $last_name ? trim($first_name . ' ' . $last_name) : '';
+            $user_nicename = $display_name ? trim($display_name) : $email;
+            $user_company = !empty($postarr['wpinv_company']) ? sanitize_text_field($postarr['wpinv_company']) : '';
             
-            $user_login = sanitize_user( str_replace( ' ', '', $display_name ), true );
-            if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
-                $user_login = sanitize_user( str_replace( ' ', '', $user_company ), true );
+            $user_login = sanitize_user(str_replace(' ', '', $display_name), true);
+            if (!(validate_username($user_login) && !username_exists($user_login))) {
+                $user_login = sanitize_user(str_replace(' ', '', $user_company), true);
                 
-                if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+                if (!(validate_username($user_login) && !username_exists($user_login))) {
                     $user_login = $email;
                 }
             }
             
             $userdata = array(
                 'user_login' => $user_login,
-                'user_pass' => wp_generate_password( 12, false ),
-                'user_email' => sanitize_text_field( $email ),
+                'user_pass' => wp_generate_password(12, false),
+                'user_email' => sanitize_text_field($email),
                 'first_name' => $first_name,
                 'last_name' => $last_name,
-                'user_nicename' => wpinv_utf8_substr( $user_nicename, 0, 50 ),
+                'user_nicename' => wpinv_utf8_substr($user_nicename, 0, 50),
                 'nickname' => $display_name,
                 'display_name' => $display_name,
             );
 
-            $userdata = apply_filters( 'wpinv_register_new_user_data', $userdata );
+            $userdata = apply_filters('wpinv_register_new_user_data', $userdata);
             
-            $new_user_id = wp_insert_user( $userdata );
+            $new_user_id = wp_insert_user($userdata);
             
-            if ( !is_wp_error( $new_user_id ) ) {
+            if (!is_wp_error($new_user_id)) {
                 $data['post_author'] = $new_user_id;
                 $_POST['post_author'] = $new_user_id;
                 $_POST['post_author_override'] = $new_user_id;
@@ -479,27 +479,27 @@ 
                 
                 $meta = array();
                 ///$meta['_wpinv_user_id'] = $new_user_id;
-                foreach ( $meta_fields as $field ) {
-                    $meta['_wpinv_' . $field] = isset( $postarr['wpinv_' . $field] ) ? sanitize_text_field( $postarr['wpinv_' . $field] ) : '';
+                foreach ($meta_fields as $field) {
+                    $meta['_wpinv_' . $field] = isset($postarr['wpinv_' . $field]) ? sanitize_text_field($postarr['wpinv_' . $field]) : '';
                 }
                 
-                $meta = apply_filters( 'wpinv_register_new_user_meta', $meta, $new_user_id );
+                $meta = apply_filters('wpinv_register_new_user_meta', $meta, $new_user_id);
 
                 // Update user meta.
-                foreach ( $meta as $key => $value ) {
-                    update_user_meta( $new_user_id, $key, $value );
+                foreach ($meta as $key => $value) {
+                    update_user_meta($new_user_id, $key, $value);
                 }
                 
-                if ( function_exists( 'wp_send_new_user_notifications' ) ) {
+                if (function_exists('wp_send_new_user_notifications')) {
                     // Send email notifications related to the creation of new user.
-                    wp_send_new_user_notifications( $new_user_id, 'user' );
+                    wp_send_new_user_notifications($new_user_id, 'user');
                 }
             } else {
-                wpinv_error_log( $new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__ );
+                wpinv_error_log($new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__);
             }
         }
     }
     
     return $data;
 }
-add_filter( 'wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2 );
\ No newline at end of file
+add_filter('wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2);
\ No newline at end of file

includes/wpinv-item-functions.php

Spacing +218 added lines, -218 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_item_by($field = '', $value = '', $type = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
     
     $posts = array();
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
         case 'id':
-            $item = get_post( $value );
+            $item = get_post($value);
 
-            if( get_post_type( $item ) != 'wpi_item' ) {
+            if (get_post_type($item) != 'wpi_item') {
                 return false;
             }
 
@@ -21,16 +21,16 @@ 
 
         case 'slug':
         case 'name':
-            $posts = get_posts( array(
+            $posts = get_posts(array(
                 'post_type'      => 'wpi_item',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
             break;
         case 'package_id':
-            $posts = get_posts( array(
+            $posts = get_posts(array(
                 'post_type'      => 'wpi_item',
                 'posts_per_page' => 1,
                 'post_status'    => 'any',
@@ -46,7 +46,7 @@ 
                         'value' => 'package',
                     )
                 )
-            ) );
+            ));
             
             break;
         case 'post':
@@ -55,7 +55,7 @@ 
                 'key'   => '_wpinv_post_id',
                 'value' => $value,
             );
-            if ( !empty( $type ) ) {
+            if (!empty($type)) {
                 $meta_query[] = array(
                     'key'   => '_wpinv_type',
                     'value' => $type,
@@ -68,14 +68,14 @@ 
                 'post_status'    => 'any',
                 'orderby'        => 'ID',
                 'order'          => 'ASC',
-                'meta_query'     => array( $meta_query )
+                'meta_query'     => array($meta_query)
             );
             
-            $posts = get_posts( $args );
+            $posts = get_posts($args);
             
             break;
         case 'custom':
-            if ( empty( $value ) || empty( $type ) ) {
+            if (empty($value) || empty($type)) {
                 return false;
             }
             
@@ -95,10 +95,10 @@ 
                 'post_status'    => 'any',
                 'orderby'        => 'ID',
                 'order'          => 'ASC',
-                'meta_query'     => array( $meta_query )
+                'meta_query'     => array($meta_query)
             );
             
-            $posts = get_posts( $args );
+            $posts = get_posts($args);
 
             break;
 
@@ -106,17 +106,17 @@ 
             return false;
     }
     
-    if ( !empty( $posts[0] ) ) {
-        return new WPInv_Item( $posts[0]->ID );
+    if (!empty($posts[0])) {
+        return new WPInv_Item($posts[0]->ID);
     }
 
     return false;
 }
 
-function wpinv_get_item( $item = 0 ) {
-    if ( is_numeric( $item ) ) {
-        $item = get_post( $item );
-        if ( ! $item || 'wpi_item' !== $item->post_type )
+function wpinv_get_item($item = 0) {
+    if (is_numeric($item)) {
+        $item = get_post($item);
+        if (!$item || 'wpi_item' !== $item->post_type)
             return null;
         return $item;
     }
@@ -129,136 +129,136 @@ 
 
     $item = get_posts($args);
 
-    if ( $item ) {
+    if ($item) {
         return $item[0];
     }
 
     return null;
 }
 
-function wpinv_is_free_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_free_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_free();
 }
 
-function wpinv_get_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_price();
 }
 
-function wpinv_is_recurring_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_recurring_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_recurring();
 }
 
-function wpinv_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $price = wpinv_get_item_price( $item_id );
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_get_item_price($item_id);
+    $price = wpinv_price(wpinv_format_amount($price));
     
-    return apply_filters( 'wpinv_item_price', $price, $item_id );
+    return apply_filters('wpinv_item_price', $price, $item_id);
 }
 
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
+    if (empty($item_id)) {
         $item_id = get_the_ID();
     }
 
-    $price = wpinv_item_price( $item_id );
+    $price = wpinv_item_price($item_id);
 
-    $price           = apply_filters( 'wpinv_item_price', wpinv_sanitize_amount( $price ), $item_id );
+    $price           = apply_filters('wpinv_item_price', wpinv_sanitize_amount($price), $item_id);
     $formatted_price = '<span class="wpinv_price" id="wpinv_item_' . $item_id . '">' . $price . '</span>';
-    $formatted_price = apply_filters( 'wpinv_item_price_after_html', $formatted_price, $item_id, $price );
+    $formatted_price = apply_filters('wpinv_item_price_after_html', $formatted_price, $item_id, $price);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $formatted_price;
     } else {
         return $formatted_price;
     }
 }
 
-function wpinv_get_item_final_price( $item_id = 0, $amount_override = null ) {
-    if ( is_null( $amount_override ) ) {
-        $original_price = get_post_meta( $item_id, '_wpinv_price', true );
+function wpinv_get_item_final_price($item_id = 0, $amount_override = null) {
+    if (is_null($amount_override)) {
+        $original_price = get_post_meta($item_id, '_wpinv_price', true);
     } else {
         $original_price = $amount_override;
     }
     
     $price = $original_price;
 
-    return apply_filters( 'wpinv_get_item_final_price', $price, $item_id );
+    return apply_filters('wpinv_get_item_final_price', $price, $item_id);
 }
 
-function wpinv_item_cpt_singular_name( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_cpt_singular_name($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_cpt_singular_name();
 }
 
 function wpinv_get_item_types() {
     $item_types = array(
-            'custom'    => __( 'Standard', 'invoicing' ),
-            'fee'       => __( 'Fee', 'invoicing' ),
+            'custom'    => __('Standard', 'invoicing'),
+            'fee'       => __('Fee', 'invoicing'),
         );
-    return apply_filters( 'wpinv_get_item_types', $item_types );
+    return apply_filters('wpinv_get_item_types', $item_types);
 }
 
 function wpinv_item_types() {
     $item_types = wpinv_get_item_types();
     
-    return ( !empty( $item_types ) ? array_keys( $item_types ) : array() );
+    return (!empty($item_types) ? array_keys($item_types) : array());
 }
 
-function wpinv_get_item_type( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_type($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_type();
 }
 
-function wpinv_item_type( $item_id ) {
+function wpinv_item_type($item_id) {
     $item_types = wpinv_get_item_types();
     
-    $item_type = wpinv_get_item_type( $item_id );
+    $item_type = wpinv_get_item_type($item_id);
     
-    if ( empty( $item_type ) ) {
+    if (empty($item_type)) {
         $item_type = '-';
     }
     
-    $item_type = isset( $item_types[$item_type] ) ? $item_types[$item_type] : __( $item_type, 'invoicing' );
+    $item_type = isset($item_types[$item_type]) ? $item_types[$item_type] : __($item_type, 'invoicing');
 
-    return apply_filters( 'wpinv_item_type', $item_type, $item_id );
+    return apply_filters('wpinv_item_type', $item_type, $item_id);
 }
 
-function wpinv_record_item_in_log( $item_id = 0, $file_id, $user_info, $ip, $invoice_id ) {
+function wpinv_record_item_in_log($item_id = 0, $file_id, $user_info, $ip, $invoice_id) {
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
@@ -267,7 +267,7 @@ 
         'log_type'		=> 'wpi_item'
     );
 
-    $user_id = isset( $user_info['user_id'] ) ? $user_info['user_id'] : (int) -1;
+    $user_id = isset($user_info['user_id']) ? $user_info['user_id'] : (int) -1;
 
     $log_meta = array(
         'user_info'	=> $user_info,
@@ -277,247 +277,247 @@ 
         'invoice_id'=> $invoice_id,
     );
 
-    $wpinv_logs->insert_log( $log_data, $log_meta );
+    $wpinv_logs->insert_log($log_data, $log_meta);
 }
 
-function wpinv_remove_item_logs_on_delete( $item_id = 0 ) {
-    if ( 'wpi_item' !== get_post_type( $item_id ) )
+function wpinv_remove_item_logs_on_delete($item_id = 0) {
+    if ('wpi_item' !== get_post_type($item_id))
         return;
 
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
     // Remove all log entries related to this item
-    $wpinv_logs->delete_logs( $item_id );
+    $wpinv_logs->delete_logs($item_id);
 }
-add_action( 'delete_post', 'wpinv_remove_item_logs_on_delete' );
+add_action('delete_post', 'wpinv_remove_item_logs_on_delete');
 
-function wpinv_get_random_item( $post_ids = true ) {
-    wpinv_get_random_items( 1, $post_ids );
+function wpinv_get_random_item($post_ids = true) {
+    wpinv_get_random_items(1, $post_ids);
 }
 
-function wpinv_get_random_items( $num = 3, $post_ids = true ) {
-    if ( $post_ids ) {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids' );
+function wpinv_get_random_items($num = 3, $post_ids = true) {
+    if ($post_ids) {
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids');
     } else {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num );
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num);
     }
     
-    $args  = apply_filters( 'wpinv_get_random_items', $args );
+    $args = apply_filters('wpinv_get_random_items', $args);
     
-    return get_posts( $args );
+    return get_posts($args);
 }
 
-function wpinv_get_item_token( $url = '' ) {
+function wpinv_get_item_token($url = '') {
     $args    = array();
-    $hash    = apply_filters( 'wpinv_get_url_token_algorithm', 'sha256' );
-    $secret  = apply_filters( 'wpinv_get_url_token_secret', hash( $hash, wp_salt() ) );
+    $hash    = apply_filters('wpinv_get_url_token_algorithm', 'sha256');
+    $secret  = apply_filters('wpinv_get_url_token_secret', hash($hash, wp_salt()));
 
-    $parts   = parse_url( $url );
+    $parts   = parse_url($url);
     $options = array();
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        if ( ! empty( $query_args['o'] ) ) {
-            $options = explode( ':', rawurldecode( $query_args['o'] ) );
+        if (!empty($query_args['o'])) {
+            $options = explode(':', rawurldecode($query_args['o']));
 
-            if ( in_array( 'ip', $options ) ) {
+            if (in_array('ip', $options)) {
                 $args['ip'] = wpinv_get_ip();
             }
 
-            if ( in_array( 'ua', $options ) ) {
+            if (in_array('ua', $options)) {
                 $ua = wpinv_get_user_agent();
-                $args['user_agent'] = rawurlencode( $ua );
+                $args['user_agent'] = rawurlencode($ua);
             }
         }
     }
 
-    $args = apply_filters( 'wpinv_get_url_token_args', $args, $url, $options );
+    $args = apply_filters('wpinv_get_url_token_args', $args, $url, $options);
 
     $args['secret'] = $secret;
     $args['token']  = false;
 
-    $url   = add_query_arg( $args, $url );
-    $parts = parse_url( $url );
+    $url   = add_query_arg($args, $url);
+    $parts = parse_url($url);
 
-    if ( ! isset( $parts['path'] ) ) {
+    if (!isset($parts['path'])) {
         $parts['path'] = '';
     }
 
-    $token = md5( $parts['path'] . '?' . $parts['query'] );
+    $token = md5($parts['path'] . '?' . $parts['query']);
 
     return $token;
 }
 
-function wpinv_validate_url_token( $url = '' ) {
+function wpinv_validate_url_token($url = '') {
     $ret   = false;
-    $parts = parse_url( $url );
+    $parts = parse_url($url);
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        $allowed = apply_filters( 'wpinv_url_token_allowed_params', array(
+        $allowed = apply_filters('wpinv_url_token_allowed_params', array(
             'item',
             'ttl',
             'token'
-        ) );
+        ));
 
         $remove = array();
 
-        foreach( $query_args as $key => $value ) {
-            if( false === in_array( $key, $allowed ) ) {
+        foreach ($query_args as $key => $value) {
+            if (false === in_array($key, $allowed)) {
                 $remove[] = $key;
             }
         }
 
-        if( ! empty( $remove ) ) {
-            $url = remove_query_arg( $remove, $url );
+        if (!empty($remove)) {
+            $url = remove_query_arg($remove, $url);
         }
 
-        if ( isset( $query_args['ttl'] ) && current_time( 'timestamp' ) > $query_args['ttl'] ) {
-            wp_die( apply_filters( 'wpinv_item_link_expired_text', __( 'Sorry but your item link has expired.', 'invoicing' ) ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+        if (isset($query_args['ttl']) && current_time('timestamp') > $query_args['ttl']) {
+            wp_die(apply_filters('wpinv_item_link_expired_text', __('Sorry but your item link has expired.', 'invoicing')), __('Error', 'invoicing'), array('response' => 403));
         }
 
-        if ( isset( $query_args['token'] ) && $query_args['token'] == wpinv_get_item_token( $url ) ) {
+        if (isset($query_args['token']) && $query_args['token'] == wpinv_get_item_token($url)) {
             $ret = true;
         }
 
     }
 
-    return apply_filters( 'wpinv_validate_url_token', $ret, $url, $query_args );
+    return apply_filters('wpinv_validate_url_token', $ret, $url, $query_args);
 }
 
-function wpinv_item_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_item_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
     $ret = false;
 
-    if ( is_array( $cart_items ) ) {
-        foreach ( $cart_items as $item ) {
-            if ( $item['id'] == $item_id ) {
+    if (is_array($cart_items)) {
+        foreach ($cart_items as $item) {
+            if ($item['id'] == $item_id) {
                 $ret = true;
                 break;
             }
         }
     }
 
-    return (bool) apply_filters( 'wpinv_item_in_cart', $ret, $item_id, $options );
+    return (bool)apply_filters('wpinv_item_in_cart', $ret, $item_id, $options);
 }
 
-function wpinv_get_cart_item_tax( $item_id = 0, $subtotal = '', $options = array() ) {
+function wpinv_get_cart_item_tax($item_id = 0, $subtotal = '', $options = array()) {
     $tax = 0;
-    if ( ! wpinv_item_is_tax_exclusive( $item_id ) ) {
-        $country = !empty( $_POST['country'] ) ? $_POST['country'] : false;
-        $state   = isset( $_POST['state'] ) ? $_POST['state'] : '';
+    if (!wpinv_item_is_tax_exclusive($item_id)) {
+        $country = !empty($_POST['country']) ? $_POST['country'] : false;
+        $state   = isset($_POST['state']) ? $_POST['state'] : '';
 
-        $tax = wpinv_calculate_tax( $subtotal, $country, $state, $item_id );
+        $tax = wpinv_calculate_tax($subtotal, $country, $state, $item_id);
     }
 
-    return apply_filters( 'wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options );
+    return apply_filters('wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options);
 }
 
-function wpinv_cart_item_price( $item ) {
+function wpinv_cart_item_price($item) {
     $use_taxes  = wpinv_use_taxes();
-    $item_id    = isset( $item['id'] ) ? $item['id'] : 0;
-    $price      = isset( $item['item_price'] ) ? wpinv_format_amount( $item['item_price'] ) : 0;
-    $options    = isset( $item['options'] ) ? $item['options'] : array();
-    $price_id   = isset( $options['price_id'] ) ? $options['price_id'] : false;
-    $tax        = wpinv_price( wpinv_format_amount( $item['tax'] ) );
-    
-    if ( !wpinv_is_free_item( $item_id, $price_id ) && !wpinv_item_is_tax_exclusive( $item_id ) ) {
-        if ( wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax() ) {
+    $item_id    = isset($item['id']) ? $item['id'] : 0;
+    $price      = isset($item['item_price']) ? wpinv_format_amount($item['item_price']) : 0;
+    $options    = isset($item['options']) ? $item['options'] : array();
+    $price_id   = isset($options['price_id']) ? $options['price_id'] : false;
+    $tax        = wpinv_price(wpinv_format_amount($item['tax']));
+    
+    if (!wpinv_is_free_item($item_id, $price_id) && !wpinv_item_is_tax_exclusive($item_id)) {
+        if (wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax()) {
             $price += $tax;
         }
         
-        if( !wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax() ) {
+        if (!wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax()) {
             $price -= $tax;
         }        
     }
 
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_price(wpinv_format_amount($price));
 
-    return apply_filters( 'wpinv_cart_item_price_label', $price, $item );
+    return apply_filters('wpinv_cart_item_price_label', $price, $item);
 }
 
-function wpinv_cart_item_subtotal( $item ) {
-    $subtotal   = isset( $item['subtotal'] ) ? $item['subtotal'] : 0;
-    $subtotal   = wpinv_price( wpinv_format_amount( $subtotal ) );
+function wpinv_cart_item_subtotal($item) {
+    $subtotal   = isset($item['subtotal']) ? $item['subtotal'] : 0;
+    $subtotal   = wpinv_price(wpinv_format_amount($subtotal));
 
-    return apply_filters( 'wpinv_cart_item_subtotal_label', $subtotal, $item );
+    return apply_filters('wpinv_cart_item_subtotal_label', $subtotal, $item);
 }
 
-function wpinv_cart_item_tax( $item ) {
+function wpinv_cart_item_tax($item) {
     $tax        = '';
     $tax_rate   = '';
     
-    if ( isset( $item['tax'] ) && $item['tax'] > 0 && $item['subtotal'] > 0 ) {
-        $tax      = wpinv_price( wpinv_format_amount( $item['tax'] ) );
-        $tax_rate = !empty( $item['vat_rate'] ) ? $item['vat_rate'] : ( $item['tax'] / $item['subtotal'] ) * 100;
-        $tax_rate = $tax_rate > 0 ? (float)wpinv_format_amount( $tax_rate, 2 ) : '';
+    if (isset($item['tax']) && $item['tax'] > 0 && $item['subtotal'] > 0) {
+        $tax      = wpinv_price(wpinv_format_amount($item['tax']));
+        $tax_rate = !empty($item['vat_rate']) ? $item['vat_rate'] : ($item['tax'] / $item['subtotal']) * 100;
+        $tax_rate = $tax_rate > 0 ? (float)wpinv_format_amount($tax_rate, 2) : '';
         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate normal small">(' . $tax_rate . '%)</small>' : '';
     }
     
-    $tax        = $tax . $tax_rate;
+    $tax = $tax . $tax_rate;
     
-    if ( $tax === '' ) {
+    if ($tax === '') {
         $tax = 0; // Zero tax
     }
 
-    return apply_filters( 'wpinv_cart_item_tax_label', $tax, $item );
+    return apply_filters('wpinv_cart_item_tax_label', $tax, $item);
 }
 
-function wpinv_get_cart_item_price( $item_id = 0, $options = array(), $remove_tax_from_inclusive = false ) {
+function wpinv_get_cart_item_price($item_id = 0, $options = array(), $remove_tax_from_inclusive = false) {
     $price = 0;
-    $variable_prices = wpinv_has_variable_prices( $item_id );
+    $variable_prices = wpinv_has_variable_prices($item_id);
 
-    if ( $variable_prices ) {
-        $prices = wpinv_get_variable_prices( $item_id );
+    if ($variable_prices) {
+        $prices = wpinv_get_variable_prices($item_id);
 
-        if ( $prices ) {
-            if( ! empty( $options ) ) {
-                $price = isset( $prices[ $options['price_id'] ] ) ? $prices[ $options['price_id'] ]['amount'] : false;
+        if ($prices) {
+            if (!empty($options)) {
+                $price = isset($prices[$options['price_id']]) ? $prices[$options['price_id']]['amount'] : false;
             } else {
                 $price = false;
             }
         }
     }
 
-    if( ! $variable_prices || false === $price ) {
+    if (!$variable_prices || false === $price) {
         // Get the standard Item price if not using variable prices
-        $price = wpinv_get_item_price( $item_id );
+        $price = wpinv_get_item_price($item_id);
     }
 
-    if ( $remove_tax_from_inclusive && wpinv_prices_include_tax() ) {
-        $price -= wpinv_get_cart_item_tax( $item_id, $price, $options );
+    if ($remove_tax_from_inclusive && wpinv_prices_include_tax()) {
+        $price -= wpinv_get_cart_item_tax($item_id, $price, $options);
     }
 
-    return apply_filters( 'wpinv_cart_item_price', $price, $item_id, $options );
+    return apply_filters('wpinv_cart_item_price', $price, $item_id, $options);
 }
 
-function wpinv_get_cart_item_price_id( $item = array() ) {
-    if( isset( $item['item_number'] ) ) {
-        $price_id = isset( $item['item_number']['options']['price_id'] ) ? $item['item_number']['options']['price_id'] : null;
+function wpinv_get_cart_item_price_id($item = array()) {
+    if (isset($item['item_number'])) {
+        $price_id = isset($item['item_number']['options']['price_id']) ? $item['item_number']['options']['price_id'] : null;
     } else {
-        $price_id = isset( $item['options']['price_id'] ) ? $item['options']['price_id'] : null;
+        $price_id = isset($item['options']['price_id']) ? $item['options']['price_id'] : null;
     }
     return $price_id;
 }
 
-function wpinv_get_cart_item_price_name( $item = array() ) {
-    $price_id = (int)wpinv_get_cart_item_price_id( $item );
-    $prices   = wpinv_get_variable_prices( $item['id'] );
-    $name     = ! empty( $prices[ $price_id ] ) ? $prices[ $price_id ]['name'] : '';
-    return apply_filters( 'wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item );
+function wpinv_get_cart_item_price_name($item = array()) {
+    $price_id = (int)wpinv_get_cart_item_price_id($item);
+    $prices   = wpinv_get_variable_prices($item['id']);
+    $name     = !empty($prices[$price_id]) ? $prices[$price_id]['name'] : '';
+    return apply_filters('wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item);
 }
 
-function wpinv_get_cart_item_name( $item = array() ) {
-    $item_title = !empty( $item['name'] ) ? $item['name'] : get_the_title( $item['id'] );
+function wpinv_get_cart_item_name($item = array()) {
+    $item_title = !empty($item['name']) ? $item['name'] : get_the_title($item['id']);
 
-    if ( empty( $item_title ) ) {
+    if (empty($item_title)) {
         $item_title = $item['id'];
     }
 
@@ -527,23 +527,23 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_get_cart_item_name', $item_title, $item['id'], $item );
+    return apply_filters('wpinv_get_cart_item_name', $item_title, $item['id'], $item);
 }
 
-function wpinv_has_variable_prices( $item_id = 0 ) {
+function wpinv_has_variable_prices($item_id = 0) {
     return false;
 }
 
-function wpinv_get_item_position_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_get_item_position_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
-    if ( !is_array( $cart_items ) ) {
+    if (!is_array($cart_items)) {
         return false; // Empty cart
     } else {
-        foreach ( $cart_items as $position => $item ) {
-            if ( $item['id'] == $item_id ) {
-                if ( isset( $options['price_id'] ) && isset( $item['options']['price_id'] ) ) {
-                    if ( (int) $options['price_id'] == (int) $item['options']['price_id'] ) {
+        foreach ($cart_items as $position => $item) {
+            if ($item['id'] == $item_id) {
+                if (isset($options['price_id']) && isset($item['options']['price_id'])) {
+                    if ((int)$options['price_id'] == (int)$item['options']['price_id']) {
                         return $position;
                     }
                 } else {
@@ -556,80 +556,80 @@ 
     return false; // Not found
 }
 
-function wpinv_get_cart_item_quantity( $item ) {
-    if ( wpinv_item_quantities_enabled() ) {
-        $quantity = !empty( $item['quantity'] ) && (int)$item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
+function wpinv_get_cart_item_quantity($item) {
+    if (wpinv_item_quantities_enabled()) {
+        $quantity = !empty($item['quantity']) && (int)$item['quantity'] > 0 ? absint($item['quantity']) : 1;
     } else {
         $quantity = 1;
     }
     
-    if ( $quantity < 1 ) {
+    if ($quantity < 1) {
         $quantity = 1;
     }
     
-    return apply_filters( 'wpinv_get_cart_item_quantity', $quantity, $item );
+    return apply_filters('wpinv_get_cart_item_quantity', $quantity, $item);
 }
 
-function wpinv_get_item_suffix( $item, $html = true ) {
-    if ( empty( $item ) ) {
+function wpinv_get_item_suffix($item, $html = true) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '';
+    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '';
     
-    if ( !$html && $suffix ) {
-        $suffix = strip_tags( $suffix );
+    if (!$html && $suffix) {
+        $suffix = strip_tags($suffix);
     }
     
-    return apply_filters( 'wpinv_get_item_suffix', $suffix, $item, $html );
+    return apply_filters('wpinv_get_item_suffix', $suffix, $item, $html);
 }
 
-function wpinv_remove_item( $item = 0, $force_delete = false ) {
-    if ( empty( $item ) ) {
+function wpinv_remove_item($item = 0, $force_delete = false) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    do_action( 'wpinv_pre_delete_item', $item );
+    do_action('wpinv_pre_delete_item', $item);
 
-    wp_delete_post( $item->ID, $force_delete );
+    wp_delete_post($item->ID, $force_delete);
 
-    do_action( 'wpinv_post_delete_item', $item );
+    do_action('wpinv_post_delete_item', $item);
 }
 
-function wpinv_can_delete_item( $post_id ) {
-    $return = current_user_can( 'manage_options' ) ? true : false;
+function wpinv_can_delete_item($post_id) {
+    $return = current_user_can('manage_options') ? true : false;
     
-    if ( $return && wpinv_item_in_use( $post_id ) ) {
+    if ($return && wpinv_item_in_use($post_id)) {
         $return = false; // Don't delete item already use in invoices.
     }
     
-    return apply_filters( 'wpinv_can_delete_item', $return, $post_id );
+    return apply_filters('wpinv_can_delete_item', $return, $post_id);
 }
 
 function wpinv_admin_action_delete() {
     $screen = get_current_screen();
     
-    if ( !empty( $screen->post_type ) && $screen->post_type == 'wpi_item' && !empty( $_REQUEST['post'] ) && is_array( $_REQUEST['post'] ) ) {
+    if (!empty($screen->post_type) && $screen->post_type == 'wpi_item' && !empty($_REQUEST['post']) && is_array($_REQUEST['post'])) {
         $post_ids = array();
         
-        foreach ( $_REQUEST['post'] as $post_id ) {
-            if ( !wpinv_can_delete_item( $post_id ) ) {
+        foreach ($_REQUEST['post'] as $post_id) {
+            if (!wpinv_can_delete_item($post_id)) {
                 continue;
             }
             
@@ -639,39 +639,39 @@ 
         $_REQUEST['post'] = $post_ids;
     }
 }
-add_action( 'admin_action_trash', 'wpinv_admin_action_delete', -10 );
-add_action( 'admin_action_delete', 'wpinv_admin_action_delete', -10 );
+add_action('admin_action_trash', 'wpinv_admin_action_delete', -10);
+add_action('admin_action_delete', 'wpinv_admin_action_delete', -10);
 
-function wpinv_check_delete_item( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_item' ) {
-        if ( $force_delete && !wpinv_can_delete_item( $post->ID ) ) {
+function wpinv_check_delete_item($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_item') {
+        if ($force_delete && !wpinv_can_delete_item($post->ID)) {
             return true;
         }
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_item', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_item', 10, 3);
 
-function wpinv_item_in_use( $item_id ) {
+function wpinv_item_in_use($item_id) {
     global $wpdb, $wpi_items_in_use;
     
-    if ( !$item_id > 0 ) {
+    if (!$item_id > 0) {
         return false;
     }
     
-    if ( !empty( $wpi_items_in_use ) ) {
-        if ( isset( $wpi_items_in_use[$item_id] ) ) {
+    if (!empty($wpi_items_in_use)) {
+        if (isset($wpi_items_in_use[$item_id])) {
             return $wpi_items_in_use[$item_id];
         }
     } else {
         $wpi_items_in_use = array();
     }
     
-    $statuses   = array_keys( wpinv_get_invoice_statuses( true ) );
+    $statuses = array_keys(wpinv_get_invoice_statuses(true));
     
-    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode( "','", $statuses ) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
-    $in_use = $wpdb->get_var( $query ) > 0 ? true : false;
+    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode("','", $statuses) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
+    $in_use = $wpdb->get_var($query) > 0 ? true : false;
     
     $wpi_items_in_use[$item_id] = $in_use;
     

includes/wpinv-discount-functions.php

Spacing +469 added lines, -469 removed lines

@@ -7,90 +7,90 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_get_discount_types() {
     $discount_types = array(
-                        'percent'   => __( 'Percentage', 'invoicing' ),
-                        'flat'     => __( 'Flat Amount', 'invoicing' ),
+                        'percent'   => __('Percentage', 'invoicing'),
+                        'flat'     => __('Flat Amount', 'invoicing'),
                     );
-    return (array)apply_filters( 'wpinv_discount_types', $discount_types );
+    return (array)apply_filters('wpinv_discount_types', $discount_types);
 }
 
-function wpinv_get_discount_type_name( $type = '' ) {
+function wpinv_get_discount_type_name($type = '') {
     $types = wpinv_get_discount_types();
-    return isset( $types[ $type ] ) ? $types[ $type ] : '';
+    return isset($types[$type]) ? $types[$type] : '';
 }
 
-function wpinv_delete_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_delete_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to delete discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to delete discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     $discount_id = $data['discount'];
-    wpinv_remove_discount( $discount_id );
+    wpinv_remove_discount($discount_id);
 }
-add_action( 'wpinv_delete_discount', 'wpinv_delete_discount' );
+add_action('wpinv_delete_discount', 'wpinv_delete_discount');
 
-function wpinv_activate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_activate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to edit discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to edit discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'publish' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'publish');
 }
-add_action( 'wpinv_activate_discount', 'wpinv_activate_discount' );
+add_action('wpinv_activate_discount', 'wpinv_activate_discount');
 
-function wpinv_deactivate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_deactivate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to create discount codes', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to create discount codes', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'pending' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'pending');
 }
-add_action( 'wpinv_deactivate_discount', 'wpinv_deactivate_discount' );
+add_action('wpinv_deactivate_discount', 'wpinv_deactivate_discount');
 
-function wpinv_get_discounts( $args = array() ) {
+function wpinv_get_discounts($args = array()) {
     $defaults = array(
         'post_type'      => 'wpi_discount',
         'posts_per_page' => 20,
         'paged'          => null,
-        'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+        'post_status'    => array('publish', 'pending', 'draft', 'expired')
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $discounts = get_posts( $args );
+    $discounts = get_posts($args);
 
-    if ( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
-    if( ! $discounts && ! empty( $args['s'] ) ) {
+    if (!$discounts && !empty($args['s'])) {
         $args['meta_key']     = 'gd_discount_code';
         $args['meta_value']   = $args['s'];
         $args['meta_compare'] = 'LIKE';
-        unset( $args['s'] );
-        $discounts = get_posts( $args );
+        unset($args['s']);
+        $discounts = get_posts($args);
     }
 
-    if( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
@@ -102,9 +102,9 @@ 
 
     $discounts  = wpinv_get_discounts();
 
-    if ( $discounts) {
-        foreach ( $discounts as $discount ) {
-            if ( wpinv_is_discount_active( $discount->ID ) ) {
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            if (wpinv_is_discount_active($discount->ID)) {
                 $has_active = true;
                 break;
             }
@@ -113,38 +113,38 @@ 
     return $has_active;
 }
 
-function wpinv_get_discount( $discount_id = 0 ) {
-    if( empty( $discount_id ) ) {
+function wpinv_get_discount($discount_id = 0) {
+    if (empty($discount_id)) {
         return false;
     }
     
-    if ( get_post_type( $discount_id ) != 'wpi_discount' ) {
+    if (get_post_type($discount_id) != 'wpi_discount') {
         return false;
     }
 
-    $discount = get_post( $discount_id );
+    $discount = get_post($discount_id);
 
     return $discount;
 }
 
-function wpinv_get_discount_by_code( $code = '' ) {
-    if( empty( $code ) || ! is_string( $code ) ) {
+function wpinv_get_discount_by_code($code = '') {
+    if (empty($code) || !is_string($code)) {
         return false;
     }
 
-    return wpinv_get_discount_by( 'code', $code );
+    return wpinv_get_discount_by('code', $code);
 }
 
-function wpinv_get_discount_by( $field = '', $value = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_discount_by($field = '', $value = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
 
-    if( ! is_string( $field ) ) {
+    if (!is_string($field)) {
         return false;
     }
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
 
         case 'code':
             $meta_query     = array();
@@ -154,32 +154,32 @@ 
                 'compare' => '='
             );
             
-            $discount = wpinv_get_discounts( array(
+            $discount = wpinv_get_discounts(array(
                 'posts_per_page' => 1,
                 'post_status'    => 'any',
                 'meta_query'     => $meta_query,
-            ) );
+            ));
             
-            if( $discount ) {
+            if ($discount) {
                 $discount = $discount[0];
             }
 
             break;
 
         case 'id':
-            $discount = wpinv_get_discount( $value );
+            $discount = wpinv_get_discount($value);
 
             break;
 
         case 'name':
-            $discount = get_posts( array(
+            $discount = get_posts(array(
                 'post_type'      => 'wpi_discount',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
-            if( $discount ) {
+            if ($discount) {
                 $discount = $discount[0];
             }
 
@@ -189,99 +189,99 @@ 
             return false;
     }
 
-    if( ! empty( $discount ) ) {
+    if (!empty($discount)) {
         return $discount;
     }
 
     return false;
 }
 
-function wpinv_store_discount( $post_id, $data, $post, $update = false ) {
+function wpinv_store_discount($post_id, $data, $post, $update = false) {
     $meta = array(
-        'code'              => isset( $data['code'] )             ? sanitize_text_field( $data['code'] )              : '',
-        'type'              => isset( $data['type'] )             ? sanitize_text_field( $data['type'] )              : 'percent',
-        'amount'            => isset( $data['amount'] )           ? wpinv_sanitize_amount( $data['amount'] )          : '',
-        'start'             => isset( $data['start'] )            ? sanitize_text_field( $data['start'] )             : '',
-        'expiration'        => isset( $data['expiration'] )       ? sanitize_text_field( $data['expiration'] )        : '',
-        'min_total'         => isset( $data['min_total'] )        ? wpinv_sanitize_amount( $data['min_total'] )       : '',
-        'max_total'         => isset( $data['max_total'] )        ? wpinv_sanitize_amount( $data['max_total'] )       : '',
-        'max_uses'          => isset( $data['max_uses'] )         ? absint( $data['max_uses'] )                       : '',
-        'items'             => isset( $data['items'] )            ? $data['items']                                    : array(),
-        'excluded_items'    => isset( $data['excluded_items'] )   ? $data['excluded_items']                           : array(),
-        'is_recurring'      => isset( $data['recurring'] )        ? (bool)$data['recurring']                          : false,
-        'is_single_use'     => isset( $data['single_use'] )       ? (bool)$data['single_use']                         : false,
-        'uses'              => isset( $data['uses'] )             ? (int)$data['uses']                                : false,
+        'code'              => isset($data['code']) ? sanitize_text_field($data['code']) : '',
+        'type'              => isset($data['type']) ? sanitize_text_field($data['type']) : 'percent',
+        'amount'            => isset($data['amount']) ? wpinv_sanitize_amount($data['amount']) : '',
+        'start'             => isset($data['start']) ? sanitize_text_field($data['start']) : '',
+        'expiration'        => isset($data['expiration']) ? sanitize_text_field($data['expiration']) : '',
+        'min_total'         => isset($data['min_total']) ? wpinv_sanitize_amount($data['min_total']) : '',
+        'max_total'         => isset($data['max_total']) ? wpinv_sanitize_amount($data['max_total']) : '',
+        'max_uses'          => isset($data['max_uses']) ? absint($data['max_uses']) : '',
+        'items'             => isset($data['items']) ? $data['items'] : array(),
+        'excluded_items'    => isset($data['excluded_items']) ? $data['excluded_items'] : array(),
+        'is_recurring'      => isset($data['recurring']) ? (bool)$data['recurring'] : false,
+        'is_single_use'     => isset($data['single_use']) ? (bool)$data['single_use'] : false,
+        'uses'              => isset($data['uses']) ? (int)$data['uses'] : false,
     );
     
-    $start_timestamp        = strtotime( $meta['start'] );
+    $start_timestamp        = strtotime($meta['start']);
 
-    if ( !empty( $meta['start'] ) ) {
-        $meta['start']      = date( 'Y-m-d H:i:s', $start_timestamp );
+    if (!empty($meta['start'])) {
+        $meta['start']      = date('Y-m-d H:i:s', $start_timestamp);
     }
         
-    if ( $meta['type'] == 'percent' && (float)$meta['amount'] > 100 ) {
+    if ($meta['type'] == 'percent' && (float)$meta['amount'] > 100) {
         $meta['amount'] = 100;
     }
 
-    if ( !empty( $meta['expiration'] ) ) {
-        $meta['expiration'] = date( 'Y-m-d H:i:s', strtotime( date( 'Y-m-d', strtotime( $meta['expiration'] ) ) . ' 23:59:59' ) );
-        $end_timestamp      = strtotime( $meta['expiration'] );
+    if (!empty($meta['expiration'])) {
+        $meta['expiration'] = date('Y-m-d H:i:s', strtotime(date('Y-m-d', strtotime($meta['expiration'])) . ' 23:59:59'));
+        $end_timestamp      = strtotime($meta['expiration']);
 
-        if ( !empty( $meta['start'] ) && $start_timestamp > $end_timestamp ) {
+        if (!empty($meta['start']) && $start_timestamp > $end_timestamp) {
             $meta['expiration'] = $meta['start']; // Set the expiration date to the start date if start is later than expiration date.
         }
     }
     
-    if ( $meta['uses'] === false ) {
-        unset( $meta['uses'] );
+    if ($meta['uses'] === false) {
+        unset($meta['uses']);
     }
     
-    if ( ! empty( $meta['items'] ) ) {
-        foreach ( $meta['items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['items'][ $key ] );
+    if (!empty($meta['items'])) {
+        foreach ($meta['items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['items'][$key]);
             }
         }
     }
     
-    if ( ! empty( $meta['excluded_items'] ) ) {
-        foreach ( $meta['excluded_items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['excluded_items'][ $key ] );
+    if (!empty($meta['excluded_items'])) {
+        foreach ($meta['excluded_items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['excluded_items'][$key]);
             }
         }
     }
     
-    $meta = apply_filters( 'wpinv_update_discount', $meta, $post_id, $post );
+    $meta = apply_filters('wpinv_update_discount', $meta, $post_id, $post);
     
-    do_action( 'wpinv_pre_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_pre_update_discount', $meta, $post_id, $post);
     
-    foreach( $meta as $key => $value ) {
-        update_post_meta( $post_id, '_wpi_discount_' . $key, $value );
+    foreach ($meta as $key => $value) {
+        update_post_meta($post_id, '_wpi_discount_' . $key, $value);
     }
     
-    do_action( 'wpinv_post_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_post_update_discount', $meta, $post_id, $post);
     
     return $post_id;
 }
 
-function wpinv_remove_discount( $discount_id = 0 ) {
-    do_action( 'wpinv_pre_delete_discount', $discount_id );
+function wpinv_remove_discount($discount_id = 0) {
+    do_action('wpinv_pre_delete_discount', $discount_id);
 
-    wp_delete_post( $discount_id, true );
+    wp_delete_post($discount_id, true);
 
-    do_action( 'wpinv_post_delete_discount', $discount_id );
+    do_action('wpinv_post_delete_discount', $discount_id);
 }
 
-function wpinv_update_discount_status( $code_id = 0, $new_status = 'publish' ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_update_discount_status($code_id = 0, $new_status = 'publish') {
+    $discount = wpinv_get_discount($code_id);
 
-    if ( $discount ) {
-        do_action( 'wpinv_pre_update_discount_status', $code_id, $new_status, $discount->post_status );
+    if ($discount) {
+        do_action('wpinv_pre_update_discount_status', $code_id, $new_status, $discount->post_status);
 
-        wp_update_post( array( 'ID' => $code_id, 'post_status' => $new_status ) );
+        wp_update_post(array('ID' => $code_id, 'post_status' => $new_status));
 
-        do_action( 'wpinv_post_update_discount_status', $code_id, $new_status, $discount->post_status );
+        do_action('wpinv_post_update_discount_status', $code_id, $new_status, $discount->post_status);
 
         return true;
     }
@@ -289,173 +289,173 @@ 
     return false;
 }
 
-function wpinv_discount_exists( $code_id ) {
-    if ( wpinv_get_discount(  $code_id ) ) {
+function wpinv_discount_exists($code_id) {
+    if (wpinv_get_discount($code_id)) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_is_discount_active( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_active($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        if ( wpinv_is_discount_expired( $code_id ) ) {
-            if( defined( 'DOING_AJAX' ) ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is expired.', 'invoicing' ) );
+    if ($discount) {
+        if (wpinv_is_discount_expired($code_id)) {
+            if (defined('DOING_AJAX')) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is expired.', 'invoicing'));
             }
-        } elseif ( $discount->post_status == 'publish' ) {
+        } elseif ($discount->post_status == 'publish') {
             $return = true;
         } else {
-            if( defined( 'DOING_AJAX' ) ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active.', 'invoicing' ) );
+            if (defined('DOING_AJAX')) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active.', 'invoicing'));
             }
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_active', $return, $code_id );
+    return apply_filters('wpinv_is_discount_active', $return, $code_id);
 }
 
-function wpinv_get_discount_code( $code_id = null ) {
-    $code = get_post_meta( $code_id, '_wpi_discount_code', true );
+function wpinv_get_discount_code($code_id = null) {
+    $code = get_post_meta($code_id, '_wpi_discount_code', true);
 
-    return apply_filters( 'wpinv_get_discount_code', $code, $code_id );
+    return apply_filters('wpinv_get_discount_code', $code, $code_id);
 }
 
-function wpinv_get_discount_start_date( $code_id = null ) {
-    $start_date = get_post_meta( $code_id, '_wpi_discount_start', true );
+function wpinv_get_discount_start_date($code_id = null) {
+    $start_date = get_post_meta($code_id, '_wpi_discount_start', true);
 
-    return apply_filters( 'wpinv_get_discount_start_date', $start_date, $code_id );
+    return apply_filters('wpinv_get_discount_start_date', $start_date, $code_id);
 }
 
-function wpinv_get_discount_expiration( $code_id = null ) {
-    $expiration = get_post_meta( $code_id, '_wpi_discount_expiration', true );
+function wpinv_get_discount_expiration($code_id = null) {
+    $expiration = get_post_meta($code_id, '_wpi_discount_expiration', true);
 
-    return apply_filters( 'wpinv_get_discount_expiration', $expiration, $code_id );
+    return apply_filters('wpinv_get_discount_expiration', $expiration, $code_id);
 }
 
-function wpinv_get_discount_max_uses( $code_id = null ) {
-    $max_uses = get_post_meta( $code_id, '_wpi_discount_max_uses', true );
+function wpinv_get_discount_max_uses($code_id = null) {
+    $max_uses = get_post_meta($code_id, '_wpi_discount_max_uses', true);
 
-    return (int) apply_filters( 'wpinv_get_discount_max_uses', $max_uses, $code_id );
+    return (int)apply_filters('wpinv_get_discount_max_uses', $max_uses, $code_id);
 }
 
-function wpinv_get_discount_uses( $code_id = null ) {
-    $uses = get_post_meta( $code_id, '_wpi_discount_uses', true );
+function wpinv_get_discount_uses($code_id = null) {
+    $uses = get_post_meta($code_id, '_wpi_discount_uses', true);
 
-    return (int) apply_filters( 'wpinv_get_discount_uses', $uses, $code_id );
+    return (int)apply_filters('wpinv_get_discount_uses', $uses, $code_id);
 }
 
-function wpinv_get_discount_min_total( $code_id = null ) {
-    $min_total = get_post_meta( $code_id, '_wpi_discount_min_total', true );
+function wpinv_get_discount_min_total($code_id = null) {
+    $min_total = get_post_meta($code_id, '_wpi_discount_min_total', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_min_total', $min_total, $code_id );
+    return (float)apply_filters('wpinv_get_discount_min_total', $min_total, $code_id);
 }
 
-function wpinv_get_discount_max_total( $code_id = null ) {
-    $max_total = get_post_meta( $code_id, '_wpi_discount_max_total', true );
+function wpinv_get_discount_max_total($code_id = null) {
+    $max_total = get_post_meta($code_id, '_wpi_discount_max_total', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_max_total', $max_total, $code_id );
+    return (float)apply_filters('wpinv_get_discount_max_total', $max_total, $code_id);
 }
 
-function wpinv_get_discount_amount( $code_id = null ) {
-    $amount = get_post_meta( $code_id, '_wpi_discount_amount', true );
+function wpinv_get_discount_amount($code_id = null) {
+    $amount = get_post_meta($code_id, '_wpi_discount_amount', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_amount', $amount, $code_id );
+    return (float)apply_filters('wpinv_get_discount_amount', $amount, $code_id);
 }
 
-function wpinv_get_discount_type( $code_id = null, $name = false ) {
-    $type = strtolower( get_post_meta( $code_id, '_wpi_discount_type', true ) );
+function wpinv_get_discount_type($code_id = null, $name = false) {
+    $type = strtolower(get_post_meta($code_id, '_wpi_discount_type', true));
     
-    if ( $name ) {
-        $name = wpinv_get_discount_type_name( $type );
+    if ($name) {
+        $name = wpinv_get_discount_type_name($type);
         
-        return apply_filters( 'wpinv_get_discount_type_name', $name, $code_id );
+        return apply_filters('wpinv_get_discount_type_name', $name, $code_id);
     }
 
-    return apply_filters( 'wpinv_get_discount_type', $type, $code_id );
+    return apply_filters('wpinv_get_discount_type', $type, $code_id);
 }
 
-function wpinv_discount_status( $status ) {
-    switch( $status ){
+function wpinv_discount_status($status) {
+    switch ($status) {
         case 'expired' :
-            $name = __( 'Expired', 'invoicing' );
+            $name = __('Expired', 'invoicing');
             break;
         case 'publish' :
         case 'active' :
-            $name = __( 'Active', 'invoicing' );
+            $name = __('Active', 'invoicing');
             break;
         default :
-            $name = __( 'Inactive', 'invoicing' );
+            $name = __('Inactive', 'invoicing');
             break;
     }
     return $name;
 }
 
-function wpinv_get_discount_excluded_items( $code_id = null ) {
-    $excluded_items = get_post_meta( $code_id, '_wpi_discount_excluded_items', true );
+function wpinv_get_discount_excluded_items($code_id = null) {
+    $excluded_items = get_post_meta($code_id, '_wpi_discount_excluded_items', true);
 
-    if ( empty( $excluded_items ) || ! is_array( $excluded_items ) ) {
+    if (empty($excluded_items) || !is_array($excluded_items)) {
         $excluded_items = array();
     }
 
-    return (array) apply_filters( 'wpinv_get_discount_excluded_items', $excluded_items, $code_id );
+    return (array)apply_filters('wpinv_get_discount_excluded_items', $excluded_items, $code_id);
 }
 
-function wpinv_get_discount_item_reqs( $code_id = null ) {
-    $item_reqs = get_post_meta( $code_id, '_wpi_discount_items', true );
+function wpinv_get_discount_item_reqs($code_id = null) {
+    $item_reqs = get_post_meta($code_id, '_wpi_discount_items', true);
 
-    if ( empty( $item_reqs ) || ! is_array( $item_reqs ) ) {
+    if (empty($item_reqs) || !is_array($item_reqs)) {
         $item_reqs = array();
     }
 
-    return (array) apply_filters( 'wpinv_get_discount_item_reqs', $item_reqs, $code_id );
+    return (array)apply_filters('wpinv_get_discount_item_reqs', $item_reqs, $code_id);
 }
 
-function wpinv_get_discount_item_condition( $code_id = 0 ) {
-    return get_post_meta( $code_id, '_wpi_discount_item_condition', true );
+function wpinv_get_discount_item_condition($code_id = 0) {
+    return get_post_meta($code_id, '_wpi_discount_item_condition', true);
 }
 
-function wpinv_is_discount_not_global( $code_id = 0 ) {
-    return (bool) get_post_meta( $code_id, '_wpi_discount_is_not_global', true );
+function wpinv_is_discount_not_global($code_id = 0) {
+    return (bool)get_post_meta($code_id, '_wpi_discount_is_not_global', true);
 }
 
-function wpinv_is_discount_expired( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_expired($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $expiration = wpinv_get_discount_expiration( $code_id );
-        if ( $expiration ) {
-            $expiration = strtotime( $expiration );
-            if ( $expiration < current_time( 'timestamp' ) ) {
+    if ($discount) {
+        $expiration = wpinv_get_discount_expiration($code_id);
+        if ($expiration) {
+            $expiration = strtotime($expiration);
+            if ($expiration < current_time('timestamp')) {
                 // Discount is expired
-                wpinv_update_discount_status( $code_id, 'pending' );
+                wpinv_update_discount_status($code_id, 'pending');
                 $return = true;
             }
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_expired', $return, $code_id );
+    return apply_filters('wpinv_is_discount_expired', $return, $code_id);
 }
 
-function wpinv_is_discount_started( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_started($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $start_date = wpinv_get_discount_start_date( $code_id );
+    if ($discount) {
+        $start_date = wpinv_get_discount_start_date($code_id);
 
-        if ( $start_date ) {
-            $start_date = strtotime( $start_date );
+        if ($start_date) {
+            $start_date = strtotime($start_date);
 
-            if ( $start_date < current_time( 'timestamp' ) ) {
+            if ($start_date < current_time('timestamp')) {
                 // Discount has past the start date
                 $return = true;
             } else {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active yet.', 'invoicing' ) );
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active yet.', 'invoicing'));
             }
         } else {
             // No start date for this discount, so has to be true
@@ -463,159 +463,159 @@ 
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_started', $return, $code_id );
+    return apply_filters('wpinv_is_discount_started', $return, $code_id);
 }
 
-function wpinv_check_discount_dates( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_check_discount_dates($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $start_date = wpinv_get_discount_start_date( $code_id );
+    if ($discount) {
+        $start_date = wpinv_get_discount_start_date($code_id);
 
-        if ( $start_date ) {
-            $start_date = strtotime( $start_date );
+        if ($start_date) {
+            $start_date = strtotime($start_date);
 
-            if ( $start_date < current_time( 'timestamp' ) ) {
+            if ($start_date < current_time('timestamp')) {
                 // Discount has past the start date
                 $return = true;
             } else {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active yet.', 'invoicing' ) );
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active yet.', 'invoicing'));
             }
         } else {
             // No start date for this discount, so has to be true
             $return = true;
         }
         
-        if ( $return ) {
-            $expiration = wpinv_get_discount_expiration( $code_id );
+        if ($return) {
+            $expiration = wpinv_get_discount_expiration($code_id);
             
-            if ( $expiration ) {
-                $expiration = strtotime( $expiration );
-                if ( $expiration < current_time( 'timestamp' ) ) {
+            if ($expiration) {
+                $expiration = strtotime($expiration);
+                if ($expiration < current_time('timestamp')) {
                     // Discount is expired
-                    wpinv_update_discount_status( $code_id, 'pending' );
+                    wpinv_update_discount_status($code_id, 'pending');
                     $return = true;
                 }
             }
         }
     }
     
-    return apply_filters( 'wpinv_check_discount_dates', $return, $code_id );
+    return apply_filters('wpinv_check_discount_dates', $return, $code_id);
 }
 
-function wpinv_is_discount_maxed_out( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_maxed_out($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $uses = wpinv_get_discount_uses( $code_id );
+    if ($discount) {
+        $uses = wpinv_get_discount_uses($code_id);
         // Large number that will never be reached
-        $max_uses = wpinv_get_discount_max_uses( $code_id );
+        $max_uses = wpinv_get_discount_max_uses($code_id);
         // Should never be greater than, but just in case
-        if ( $uses >= $max_uses && ! empty( $max_uses ) ) {
+        if ($uses >= $max_uses && !empty($max_uses)) {
             // Discount is maxed out
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount has reached its maximum usage.', 'invoicing' ) );
+            wpinv_set_error('wpinv-discount-error', __('This discount has reached its maximum usage.', 'invoicing'));
             $return = true;
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_maxed_out', $return, $code_id );
+    return apply_filters('wpinv_is_discount_maxed_out', $return, $code_id);
 }
 
-function wpinv_discount_is_min_met( $code_id = null ) {
-    $discount = wpinv_get_discount( $code_id );
+function wpinv_discount_is_min_met($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $min         = (float)wpinv_get_discount_min_total( $code_id );
-        $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $code_id );
+    if ($discount) {
+        $min         = (float)wpinv_get_discount_min_total($code_id);
+        $cart_amount = (float)wpinv_get_cart_discountable_subtotal($code_id);
 
-        if ( !$min > 0 || $cart_amount >= $min ) {
+        if (!$min > 0 || $cart_amount >= $min) {
             // Minimum has been met
             $return = true;
         } else {
-            wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Minimum invoice of %s not met.', 'invoicing' ), wpinv_price( wpinv_format_amount( $min ) ) ) );
+            wpinv_set_error('wpinv-discount-error', sprintf(__('Minimum invoice of %s not met.', 'invoicing'), wpinv_price(wpinv_format_amount($min))));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_min_met', $return, $code_id );
+    return apply_filters('wpinv_is_discount_min_met', $return, $code_id);
 }
 
-function wpinv_discount_is_max_met( $code_id = null ) {
-    $discount = wpinv_get_discount( $code_id );
+function wpinv_discount_is_max_met($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $max         = (float)wpinv_get_discount_max_total( $code_id );
-        $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $code_id );
+    if ($discount) {
+        $max         = (float)wpinv_get_discount_max_total($code_id);
+        $cart_amount = (float)wpinv_get_cart_discountable_subtotal($code_id);
 
-        if ( !$max > 0 || $cart_amount <= $max ) {
+        if (!$max > 0 || $cart_amount <= $max) {
             // Minimum has been met
             $return = true;
         } else {
-            wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Maximum invoice of %s not met.', 'invoicing' ), wpinv_price( wpinv_format_amount( $max ) ) ) );
+            wpinv_set_error('wpinv-discount-error', sprintf(__('Maximum invoice of %s not met.', 'invoicing'), wpinv_price(wpinv_format_amount($max))));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_max_met', $return, $code_id );
+    return apply_filters('wpinv_is_discount_max_met', $return, $code_id);
 }
 
-function wpinv_discount_is_single_use( $code_id = 0 ) {
-    $single_use = get_post_meta( $code_id, '_wpi_discount_is_single_use', true );
-    return (bool) apply_filters( 'wpinv_is_discount_single_use', $single_use, $code_id );
+function wpinv_discount_is_single_use($code_id = 0) {
+    $single_use = get_post_meta($code_id, '_wpi_discount_is_single_use', true);
+    return (bool)apply_filters('wpinv_is_discount_single_use', $single_use, $code_id);
 }
 
-function wpinv_discount_is_recurring( $code_id = 0, $code = false ) {
-    if ( $code ) {
-        $discount = wpinv_get_discount_by_code( $code_id );
+function wpinv_discount_is_recurring($code_id = 0, $code = false) {
+    if ($code) {
+        $discount = wpinv_get_discount_by_code($code_id);
         
-        if ( !empty( $discount ) ) {
+        if (!empty($discount)) {
             $code_id = $discount->ID;
         }
     }
     
-    $recurring = get_post_meta( $code_id, '_wpi_discount_is_recurring', true );
+    $recurring = get_post_meta($code_id, '_wpi_discount_is_recurring', true);
     
-    return (bool) apply_filters( 'wpinv_is_discount_recurring', $recurring, $code_id, $code );
+    return (bool)apply_filters('wpinv_is_discount_recurring', $recurring, $code_id, $code);
 }
 
-function wpinv_discount_item_reqs_met( $code_id = null ) {
-    $item_reqs    = wpinv_get_discount_item_reqs( $code_id );
-    $condition    = wpinv_get_discount_item_condition( $code_id );
-    $excluded_ps  = wpinv_get_discount_excluded_items( $code_id );
+function wpinv_discount_item_reqs_met($code_id = null) {
+    $item_reqs    = wpinv_get_discount_item_reqs($code_id);
+    $condition    = wpinv_get_discount_item_condition($code_id);
+    $excluded_ps  = wpinv_get_discount_excluded_items($code_id);
     $cart_items   = wpinv_get_cart_contents();
-    $cart_ids     = $cart_items ? wp_list_pluck( $cart_items, 'id' ) : null;
+    $cart_ids     = $cart_items ? wp_list_pluck($cart_items, 'id') : null;
     $ret          = false;
 
-    if ( empty( $item_reqs ) && empty( $excluded_ps ) ) {
+    if (empty($item_reqs) && empty($excluded_ps)) {
         $ret = true;
     }
 
     // Normalize our data for item requirements, exclusions and cart data
     // First absint the items, then sort, and reset the array keys
-    $item_reqs = array_map( 'absint', $item_reqs );
-    asort( $item_reqs );
-    $item_reqs = array_values( $item_reqs );
+    $item_reqs = array_map('absint', $item_reqs);
+    asort($item_reqs);
+    $item_reqs = array_values($item_reqs);
 
-    $excluded_ps  = array_map( 'absint', $excluded_ps );
-    asort( $excluded_ps );
-    $excluded_ps  = array_values( $excluded_ps );
+    $excluded_ps  = array_map('absint', $excluded_ps);
+    asort($excluded_ps);
+    $excluded_ps  = array_values($excluded_ps);
 
-    $cart_ids     = array_map( 'absint', $cart_ids );
-    asort( $cart_ids );
-    $cart_ids     = array_values( $cart_ids );
+    $cart_ids     = array_map('absint', $cart_ids);
+    asort($cart_ids);
+    $cart_ids     = array_values($cart_ids);
 
     // Ensure we have requirements before proceeding
-    if ( !$ret && ! empty( $item_reqs ) ) {
-        switch( $condition ) {
+    if (!$ret && !empty($item_reqs)) {
+        switch ($condition) {
             case 'all' :
                 // Default back to true
                 $ret = true;
 
-                foreach ( $item_reqs as $item_id ) {
-                    if ( !wpinv_item_in_cart( $item_id ) ) {
-                        wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                foreach ($item_reqs as $item_id) {
+                    if (!wpinv_item_in_cart($item_id)) {
+                        wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                         $ret = false;
                         break;
                     }
@@ -624,15 +624,15 @@ 
                 break;
 
             default : // Any
-                foreach ( $item_reqs as $item_id ) {
-                    if ( wpinv_item_in_cart( $item_id ) ) {
+                foreach ($item_reqs as $item_id) {
+                    if (wpinv_item_in_cart($item_id)) {
                         $ret = true;
                         break;
                     }
                 }
 
-                if( ! $ret ) {
-                    wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                if (!$ret) {
+                    wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                 }
 
                 break;
@@ -641,68 +641,68 @@ 
         $ret = true;
     }
 
-    if( ! empty( $excluded_ps ) ) {
+    if (!empty($excluded_ps)) {
         // Check that there are items other than excluded ones in the cart
-        if( $cart_ids == $excluded_ps ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not valid for the cart contents.', 'invoicing' ) );
+        if ($cart_ids == $excluded_ps) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is not valid for the cart contents.', 'invoicing'));
             $ret = false;
         }
     }
 
-    return (bool) apply_filters( 'wpinv_is_discount_item_req_met', $ret, $code_id, $condition );
+    return (bool)apply_filters('wpinv_is_discount_item_req_met', $ret, $code_id, $condition);
 }
 
-function wpinv_is_discount_used( $code = null, $user = '', $code_id = 0 ) {
+function wpinv_is_discount_used($code = null, $user = '', $code_id = 0) {
     global $wpi_checkout_id;
     
     $return = false;
 
-    if ( empty( $code_id ) ) {
-        $code_id = wpinv_get_discount_id_by_code( $code );
+    if (empty($code_id)) {
+        $code_id = wpinv_get_discount_id_by_code($code);
         
-        if( empty( $code_id ) ) {
+        if (empty($code_id)) {
             return false; // No discount was found
         }
     }
 
-    if ( wpinv_discount_is_single_use( $code_id ) ) {
+    if (wpinv_discount_is_single_use($code_id)) {
         $payments = array();
 
         $user_id = 0;
-        if ( is_int( $user ) ) {
+        if (is_int($user)) {
             $user_id = $user;
-        } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
+        } else if (is_email($user) && $user_data = get_user_by('email', $user)) {
             $user_id = $user_data->ID;
-        } else if ( $user_data = get_user_by( 'login', $user ) ) {
+        } else if ($user_data = get_user_by('login', $user)) {
             $user_id = $user_data->ID;
         }
 
-        if ( !$user_id ) {
-            $query    = array( 'user' => $user_id, 'limit' => false );
-            $payments = wpinv_get_invoices( $query ); // Get all payments with matching email
+        if (!$user_id) {
+            $query    = array('user' => $user_id, 'limit' => false);
+            $payments = wpinv_get_invoices($query); // Get all payments with matching email
         }
 
-        if ( $payments ) {
-            foreach ( $payments as $payment ) {
-                if ( $payment->has_status( array( 'cancelled', 'failed' ) ) ) {
+        if ($payments) {
+            foreach ($payments as $payment) {
+                if ($payment->has_status(array('cancelled', 'failed'))) {
                     continue;
                 }
 
                 // Don't count discount used for current invoice chekcout.
-                if ( !empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
+                if (!empty($wpi_checkout_id) && $wpi_checkout_id == $payment->ID) {
                     continue;
                 }
 
-                $discounts = $payment->get_discounts( true );
-                if ( empty( $discounts ) ) {
+                $discounts = $payment->get_discounts(true);
+                if (empty($discounts)) {
                     continue;
                 }
 
-                $discounts = $discounts && !is_array( $discounts ) ? explode( ',', $discounts ) : $discounts;
+                $discounts = $discounts && !is_array($discounts) ? explode(',', $discounts) : $discounts;
 
-                if ( !empty( $discounts ) && is_array( $discounts ) ) {
-                    if ( in_array( strtolower( $code ), array_map( 'strtolower', $discounts ) ) ) {
-                        wpinv_set_error( 'wpinv-discount-error', __( 'This discount has already been redeemed.', 'invoicing' ) );
+                if (!empty($discounts) && is_array($discounts)) {
+                    if (in_array(strtolower($code), array_map('strtolower', $discounts))) {
+                        wpinv_set_error('wpinv-discount-error', __('This discount has already been redeemed.', 'invoicing'));
                         $return = true;
                         break;
                     }
@@ -711,61 +711,61 @@ 
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_used', $return, $code, $user );
+    return apply_filters('wpinv_is_discount_used', $return, $code, $user);
 }
 
-function wpinv_is_discount_valid( $code = '', $user = '', $set_error = true ) {
+function wpinv_is_discount_valid($code = '', $user = '', $set_error = true) {
     $return      = false;
-    $discount_id = wpinv_get_discount_id_by_code( $code );
-    $user        = trim( $user );
+    $discount_id = wpinv_get_discount_id_by_code($code);
+    $user        = trim($user);
 
-    if ( wpinv_get_cart_contents() ) {
-        if ( $discount_id ) {
+    if (wpinv_get_cart_contents()) {
+        if ($discount_id) {
             if (
-                wpinv_is_discount_active( $discount_id ) &&
-                wpinv_check_discount_dates( $discount_id ) &&
-                !wpinv_is_discount_maxed_out( $discount_id ) &&
-                !wpinv_is_discount_used( $code, $user, $discount_id ) &&
-                wpinv_discount_is_min_met( $discount_id ) &&
-                wpinv_discount_is_max_met( $discount_id ) &&
-                wpinv_discount_item_reqs_met( $discount_id )
+                wpinv_is_discount_active($discount_id) &&
+                wpinv_check_discount_dates($discount_id) &&
+                !wpinv_is_discount_maxed_out($discount_id) &&
+                !wpinv_is_discount_used($code, $user, $discount_id) &&
+                wpinv_discount_is_min_met($discount_id) &&
+                wpinv_discount_is_max_met($discount_id) &&
+                wpinv_discount_item_reqs_met($discount_id)
             ) {
                 $return = true;
             }
-        } elseif( $set_error ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is invalid.', 'invoicing' ) );
+        } elseif ($set_error) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is invalid.', 'invoicing'));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_valid', $return, $discount_id, $code, $user );
+    return apply_filters('wpinv_is_discount_valid', $return, $discount_id, $code, $user);
 }
 
-function wpinv_get_discount_id_by_code( $code ) {
-    $discount = wpinv_get_discount_by_code( $code );
-    if( $discount ) {
+function wpinv_get_discount_id_by_code($code) {
+    $discount = wpinv_get_discount_by_code($code);
+    if ($discount) {
         return $discount->ID;
     }
     return false;
 }
 
-function wpinv_get_discounted_amount( $code, $base_price ) {
+function wpinv_get_discounted_amount($code, $base_price) {
     $amount      = $base_price;
-    $discount_id = wpinv_get_discount_id_by_code( $code );
+    $discount_id = wpinv_get_discount_id_by_code($code);
 
-    if( $discount_id ) {
-        $type        = wpinv_get_discount_type( $discount_id );
-        $rate        = wpinv_get_discount_amount( $discount_id );
+    if ($discount_id) {
+        $type        = wpinv_get_discount_type($discount_id);
+        $rate        = wpinv_get_discount_amount($discount_id);
 
-        if ( $type == 'flat' ) {
+        if ($type == 'flat') {
             // Set amount
             $amount = $base_price - $rate;
-            if ( $amount < 0 ) {
+            if ($amount < 0) {
                 $amount = 0;
             }
 
         } else {
             // Percentage discount
-            $amount = $base_price - ( $base_price * ( $rate / 100 ) );
+            $amount = $base_price - ($base_price * ($rate / 100));
         }
 
     } else {
@@ -774,108 +774,108 @@ 
 
     }
 
-    return apply_filters( 'wpinv_discounted_amount', $amount );
+    return apply_filters('wpinv_discounted_amount', $amount);
 }
 
-function wpinv_increase_discount_usage( $code ) {
+function wpinv_increase_discount_usage($code) {
 
-    $id   = wpinv_get_discount_id_by_code( $code );
-    $uses = wpinv_get_discount_uses( $id );
+    $id   = wpinv_get_discount_id_by_code($code);
+    $uses = wpinv_get_discount_uses($id);
 
-    if ( $uses ) {
+    if ($uses) {
         $uses++;
     } else {
         $uses = 1;
     }
 
-    update_post_meta( $id, '_wpi_discount_uses', $uses );
+    update_post_meta($id, '_wpi_discount_uses', $uses);
 
-    do_action( 'wpinv_discount_increase_use_count', $uses, $id, $code );
+    do_action('wpinv_discount_increase_use_count', $uses, $id, $code);
 
     return $uses;
 
 }
 
-function wpinv_decrease_discount_usage( $code ) {
+function wpinv_decrease_discount_usage($code) {
 
-    $id   = wpinv_get_discount_id_by_code( $code );
-    $uses = wpinv_get_discount_uses( $id );
+    $id   = wpinv_get_discount_id_by_code($code);
+    $uses = wpinv_get_discount_uses($id);
 
-    if ( $uses ) {
+    if ($uses) {
         $uses--;
     }
 
-    if ( $uses < 0 ) {
+    if ($uses < 0) {
         $uses = 0;
     }
 
-    update_post_meta( $id, '_wpi_discount_uses', $uses );
+    update_post_meta($id, '_wpi_discount_uses', $uses);
 
-    do_action( 'wpinv_discount_decrease_use_count', $uses, $id, $code );
+    do_action('wpinv_discount_decrease_use_count', $uses, $id, $code);
 
     return $uses;
 
 }
 
-function wpinv_format_discount_rate( $type, $amount ) {
-    if ( $type == 'flat' ) {
-        return wpinv_price( wpinv_format_amount( $amount ) );
+function wpinv_format_discount_rate($type, $amount) {
+    if ($type == 'flat') {
+        return wpinv_price(wpinv_format_amount($amount));
     } else {
         return $amount . '%';
     }
 }
 
-function wpinv_set_cart_discount( $code = '' ) {    
-    if ( wpinv_multiple_discounts_allowed() ) {
+function wpinv_set_cart_discount($code = '') {    
+    if (wpinv_multiple_discounts_allowed()) {
         // Get all active cart discounts
         $discounts = wpinv_get_cart_discounts();
     } else {
         $discounts = false; // Only one discount allowed per purchase, so override any existing
     }
 
-    if ( $discounts ) {
-        $key = array_search( strtolower( $code ), array_map( 'strtolower', $discounts ) );
-        if( false !== $key ) {
-            unset( $discounts[ $key ] ); // Can't set the same discount more than once
+    if ($discounts) {
+        $key = array_search(strtolower($code), array_map('strtolower', $discounts));
+        if (false !== $key) {
+            unset($discounts[$key]); // Can't set the same discount more than once
         }
         $discounts[] = $code;
     } else {
         $discounts = array();
         $discounts[] = $code;
     }
-    $discounts = array_values( $discounts );
+    $discounts = array_values($discounts);
     
     $data = wpinv_get_checkout_session();
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         $data = array();
     } else {
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'], '_wpinv_payment_meta', false ) ) {
-            $payment_meta['user_info']['discount']  = implode( ',', $discounts );
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'], '_wpinv_payment_meta', false)) {
+            $payment_meta['user_info']['discount'] = implode(',', $discounts);
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
     }
     $data['cart_discounts'] = $discounts;
     
-    wpinv_set_checkout_session( $data );
+    wpinv_set_checkout_session($data);
     
     return $discounts;
 }
 
-function wpinv_unset_cart_discount( $code = '' ) {    
+function wpinv_unset_cart_discount($code = '') {    
     $discounts = wpinv_get_cart_discounts();
 
-    if ( $code && !empty( $discounts ) && in_array( $code, $discounts ) ) {
-        $key = array_search( $code, $discounts );
-        unset( $discounts[ $key ] );
+    if ($code && !empty($discounts) && in_array($code, $discounts)) {
+        $key = array_search($code, $discounts);
+        unset($discounts[$key]);
             
         $data = wpinv_get_checkout_session();
         $data['cart_discounts'] = $discounts;
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'], '_wpinv_payment_meta', false ) ) {
-            $payment_meta['user_info']['discount']  = !empty( $discounts ) ? implode( ',', $discounts ) : '';
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'], '_wpinv_payment_meta', false)) {
+            $payment_meta['user_info']['discount'] = !empty($discounts) ? implode(',', $discounts) : '';
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
     }
 
     return $discounts;
@@ -884,27 +884,27 @@ 
 function wpinv_unset_all_cart_discounts() {
     $data = wpinv_get_checkout_session();
     
-    if ( !empty( $data ) && isset( $data['cart_discounts'] ) ) {
-        unset( $data['cart_discounts'] );
+    if (!empty($data) && isset($data['cart_discounts'])) {
+        unset($data['cart_discounts']);
         
-         wpinv_set_checkout_session( $data );
+         wpinv_set_checkout_session($data);
          return true;
     }
     
     return false;
 }
 
-function wpinv_get_cart_discounts( $items = array() ) {
+function wpinv_get_cart_discounts($items = array()) {
     $session = wpinv_get_checkout_session();
     
-    $discounts = !empty( $session['cart_discounts'] ) ? $session['cart_discounts'] : false;
+    $discounts = !empty($session['cart_discounts']) ? $session['cart_discounts'] : false;
     return $discounts;
 }
 
-function wpinv_cart_has_discounts( $items = array() ) {
+function wpinv_cart_has_discounts($items = array()) {
     $ret = false;
 
-    if ( wpinv_get_cart_discounts( $items ) ) {
+    if (wpinv_get_cart_discounts($items)) {
         $ret = true;
     }
     
@@ -915,131 +915,131 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_cart_has_discounts', $ret );
+    return apply_filters('wpinv_cart_has_discounts', $ret);
 }
 
-function wpinv_get_cart_discounted_amount( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounted_amount($items = array(), $discounts = false) {
     $amount = 0.00;
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items  = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( $items ) {
-        $discounts = wp_list_pluck( $items, 'discount' );
+    if ($items) {
+        $discounts = wp_list_pluck($items, 'discount');
 
-        if ( is_array( $discounts ) ) {
-            $discounts = array_map( 'floatval', $discounts );
-            $amount    = array_sum( $discounts );
+        if (is_array($discounts)) {
+            $discounts = array_map('floatval', $discounts);
+            $amount    = array_sum($discounts);
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_discounted_amount', $amount );
+    return apply_filters('wpinv_get_cart_discounted_amount', $amount);
 }
 
-function wpinv_get_cart_items_discount_amount( $items = array(), $discount = false ) {
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+function wpinv_get_cart_items_discount_amount($items = array(), $discount = false) {
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
     
-    if ( empty( $discount ) || empty( $items ) ) {
+    if (empty($discount) || empty($items)) {
         return 0;
     }
 
     $amount = 0;
     
-    foreach ( $items as $item ) {
-        $amount += wpinv_get_cart_item_discount_amount( $item, $discount );
+    foreach ($items as $item) {
+        $amount += wpinv_get_cart_item_discount_amount($item, $discount);
     }
     
-    $amount = wpinv_format_amount( $amount );
+    $amount = wpinv_format_amount($amount);
 
     return $amount;
 }
 
-function wpinv_get_cart_item_discount_amount( $item = array(), $discount = false ) {
+function wpinv_get_cart_item_discount_amount($item = array(), $discount = false) {
     global $wpinv_is_last_cart_item, $wpinv_flat_discount_total;
     
     $amount = 0;
 
-    if ( empty( $item ) || empty( $item['id'] ) ) {
+    if (empty($item) || empty($item['id'])) {
         return $amount;
     }
 
-    if ( empty( $item['quantity'] ) ) {
+    if (empty($item['quantity'])) {
         return $amount;
     }
 
-    if ( empty( $item['options'] ) ) {
+    if (empty($item['options'])) {
         $item['options'] = array();
     }
 
-    $price            = wpinv_get_cart_item_price( $item['id'], $item['options'] );
+    $price            = wpinv_get_cart_item_price($item['id'], $item['options']);
     $discounted_price = $price;
 
     $discounts = false === $discount ? wpinv_get_cart_discounts() : $discount;
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return $amount;
     }
 
-    if ( $discounts ) {
-        if ( is_array( $discounts ) ) {
-            $discounts = array_values( $discounts );
+    if ($discounts) {
+        if (is_array($discounts)) {
+            $discounts = array_values($discounts);
         } else {
-            $discounts = explode( ',', $discounts );
+            $discounts = explode(',', $discounts);
         }
     }
 
-    if( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $code_id = wpinv_get_discount_id_by_code( $discount );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $code_id = wpinv_get_discount_id_by_code($discount);
 
             // Check discount exists
-            if( ! $code_id ) {
+            if (!$code_id) {
                 continue;
             }
 
-            $reqs           = wpinv_get_discount_item_reqs( $code_id );
-            $excluded_items = wpinv_get_discount_excluded_items( $code_id );
+            $reqs           = wpinv_get_discount_item_reqs($code_id);
+            $excluded_items = wpinv_get_discount_excluded_items($code_id);
 
             // Make sure requirements are set and that this discount shouldn't apply to the whole cart
-            if ( !empty( $reqs ) && wpinv_is_discount_not_global( $code_id ) ) {
-                foreach ( $reqs as $item_id ) {
-                    if ( $item_id == $item['id'] && ! in_array( $item['id'], $excluded_items ) ) {
-                        $discounted_price -= $price - wpinv_get_discounted_amount( $discount, $price );
+            if (!empty($reqs) && wpinv_is_discount_not_global($code_id)) {
+                foreach ($reqs as $item_id) {
+                    if ($item_id == $item['id'] && !in_array($item['id'], $excluded_items)) {
+                        $discounted_price -= $price - wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             } else {
                 // This is a global cart discount
-                if ( !in_array( $item['id'], $excluded_items ) ) {
-                    if ( 'flat' === wpinv_get_discount_type( $code_id ) ) {
+                if (!in_array($item['id'], $excluded_items)) {
+                    if ('flat' === wpinv_get_discount_type($code_id)) {
                         $items_subtotal    = 0.00;
                         $cart_items        = wpinv_get_cart_contents();
                         
-                        foreach ( $cart_items as $cart_item ) {
-                            if ( ! in_array( $cart_item['id'], $excluded_items ) ) {
-                                $options = !empty( $cart_item['options'] ) ? $cart_item['options'] : array();
-                                $item_price      = wpinv_get_cart_item_price( $cart_item['id'], $options );
+                        foreach ($cart_items as $cart_item) {
+                            if (!in_array($cart_item['id'], $excluded_items)) {
+                                $options = !empty($cart_item['options']) ? $cart_item['options'] : array();
+                                $item_price      = wpinv_get_cart_item_price($cart_item['id'], $options);
                                 $items_subtotal += $item_price * $cart_item['quantity'];
                             }
                         }
 
-                        $subtotal_percent  = ( ( $price * $item['quantity'] ) / $items_subtotal );
-                        $code_amount       = wpinv_get_discount_amount( $code_id );
+                        $subtotal_percent  = (($price * $item['quantity']) / $items_subtotal);
+                        $code_amount       = wpinv_get_discount_amount($code_id);
                         $discounted_amount = $code_amount * $subtotal_percent;
                         $discounted_price -= $discounted_amount;
 
-                        $wpinv_flat_discount_total += round( $discounted_amount, wpinv_currency_decimal_filter() );
+                        $wpinv_flat_discount_total += round($discounted_amount, wpinv_currency_decimal_filter());
 
-                        if ( $wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount ) {
+                        if ($wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount) {
                             $adjustment = $code_amount - $wpinv_flat_discount_total;
                             $discounted_price -= $adjustment;
                         }
                     } else {
-                        $discounted_price -= $price - wpinv_get_discounted_amount( $discount, $price );
+                        $discounted_price -= $price - wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             }
         }
 
-        $amount = ( $price - apply_filters( 'wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price ) );
+        $amount = ($price - apply_filters('wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price));
 
-        if ( 'flat' !== wpinv_get_discount_type( $code_id ) ) {
+        if ('flat' !== wpinv_get_discount_type($code_id)) {
             $amount = $amount * $item['quantity'];
         }
     }
@@ -1047,59 +1047,59 @@ 
     return $amount;
 }
 
-function wpinv_cart_discounts_html( $items = array() ) {
-    echo wpinv_get_cart_discounts_html( $items );
+function wpinv_cart_discounts_html($items = array()) {
+    echo wpinv_get_cart_discounts_html($items);
 }
 
-function wpinv_get_cart_discounts_html( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounts_html($items = array(), $discounts = false) {
     global $wpi_cart_columns;
     
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
     
-    if ( !$discounts ) {
-        $discounts = wpinv_get_cart_discounts( $items );
+    if (!$discounts) {
+        $discounts = wpinv_get_cart_discounts($items);
     }
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
     
-    $discounts = is_array( $discounts ) ? $discounts : array( $discounts );
+    $discounts = is_array($discounts) ? $discounts : array($discounts);
     
     $html = '';
 
-    foreach ( $discounts as $discount ) {
-        $discount_id    = wpinv_get_discount_id_by_code( $discount );
-        $discount_value = wpinv_get_discount_amount( $discount_id );
-        $rate           = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), $discount_value );
-        $amount         = wpinv_get_cart_items_discount_amount( $items, $discount );
-        $remove_btn     = '<a title="' . esc_attr__( 'Remove discount', 'invoicing' ) . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
+    foreach ($discounts as $discount) {
+        $discount_id    = wpinv_get_discount_id_by_code($discount);
+        $discount_value = wpinv_get_discount_amount($discount_id);
+        $rate           = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), $discount_value);
+        $amount         = wpinv_get_cart_items_discount_amount($items, $discount);
+        $remove_btn     = '<a title="' . esc_attr__('Remove discount', 'invoicing') . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
         
         $html .= '<tr class="wpinv_cart_footer_row wpinv_cart_discount_row">';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_first', $items );
+        do_action('wpinv_checkout_table_discount_first', $items);
         $html .= ob_get_clean();
-        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label( $discount, $rate, false ) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price( $amount ) . '</span></td>';
+        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label($discount, $rate, false) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price($amount) . '</span></td>';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_last', $items );
+        do_action('wpinv_checkout_table_discount_last', $items);
         $html .= ob_get_clean();
         $html .= '</tr>';
     }
 
-    return apply_filters( 'wpinv_get_cart_discounts_html', $html, $discounts, $rate );
+    return apply_filters('wpinv_get_cart_discounts_html', $html, $discounts, $rate);
 }
 
-function wpinv_display_cart_discount( $formatted = false, $echo = false ) {
+function wpinv_display_cart_discount($formatted = false, $echo = false) {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return false;
     }
 
-    $discount_id  = wpinv_get_discount_id_by_code( $discounts[0] );
-    $amount       = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), wpinv_get_discount_amount( $discount_id ) );
+    $discount_id  = wpinv_get_discount_id_by_code($discounts[0]);
+    $amount       = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), wpinv_get_discount_amount($discount_id));
 
-    if ( $echo ) {
+    if ($echo) {
         echo $amount;
     }
 
@@ -1107,133 +1107,133 @@ 
 }
 
 function wpinv_remove_cart_discount() {
-    if ( !isset( $_GET['discount_id'] ) || ! isset( $_GET['discount_code'] ) ) {
+    if (!isset($_GET['discount_id']) || !isset($_GET['discount_code'])) {
         return;
     }
 
-    do_action( 'wpinv_pre_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_pre_remove_cart_discount', absint($_GET['discount_id']));
 
-    wpinv_unset_cart_discount( urldecode( $_GET['discount_code'] ) );
+    wpinv_unset_cart_discount(urldecode($_GET['discount_code']));
 
-    do_action( 'wpinv_post_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_post_remove_cart_discount', absint($_GET['discount_id']));
 
-    wp_redirect( wpinv_get_checkout_uri() ); wpinv_die();
+    wp_redirect(wpinv_get_checkout_uri()); wpinv_die();
 }
-add_action( 'wpinv_remove_cart_discount', 'wpinv_remove_cart_discount' );
+add_action('wpinv_remove_cart_discount', 'wpinv_remove_cart_discount');
 
-function wpinv_maybe_remove_cart_discount( $cart_key = 0 ) {
+function wpinv_maybe_remove_cart_discount($cart_key = 0) {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
 
-    foreach ( $discounts as $discount ) {
-        if ( !wpinv_is_discount_valid( $discount ) ) {
-            wpinv_unset_cart_discount( $discount );
+    foreach ($discounts as $discount) {
+        if (!wpinv_is_discount_valid($discount)) {
+            wpinv_unset_cart_discount($discount);
         }
     }
 }
-add_action( 'wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount' );
+add_action('wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount');
 
 function wpinv_multiple_discounts_allowed() {
-    $ret = wpinv_get_option( 'allow_multiple_discounts', false );
-    return (bool) apply_filters( 'wpinv_multiple_discounts_allowed', $ret );
+    $ret = wpinv_get_option('allow_multiple_discounts', false);
+    return (bool)apply_filters('wpinv_multiple_discounts_allowed', $ret);
 }
 
 function wpinv_listen_for_cart_discount() {
     global $wpi_session;
     
-    if ( empty( $_REQUEST['discount'] ) || is_array( $_REQUEST['discount'] ) ) {
+    if (empty($_REQUEST['discount']) || is_array($_REQUEST['discount'])) {
         return;
     }
 
-    $code = preg_replace('/[^a-zA-Z0-9-_]+/', '', $_REQUEST['discount'] );
+    $code = preg_replace('/[^a-zA-Z0-9-_]+/', '', $_REQUEST['discount']);
 
-    $wpi_session->set( 'preset_discount', $code );
+    $wpi_session->set('preset_discount', $code);
 }
 //add_action( 'init', 'wpinv_listen_for_cart_discount', 0 );
 
 function wpinv_apply_preset_discount() {
     global $wpi_session;
     
-    $code = $wpi_session->get( 'preset_discount' );
+    $code = $wpi_session->get('preset_discount');
 
-    if ( !$code ) {
+    if (!$code) {
         return;
     }
 
-    if ( !wpinv_is_discount_valid( $code, '', false ) ) {
+    if (!wpinv_is_discount_valid($code, '', false)) {
         return;
     }
     
-    $code = apply_filters( 'wpinv_apply_preset_discount', $code );
+    $code = apply_filters('wpinv_apply_preset_discount', $code);
 
-    wpinv_set_cart_discount( $code );
+    wpinv_set_cart_discount($code);
 
-    $wpi_session->set( 'preset_discount', null );
+    $wpi_session->set('preset_discount', null);
 }
 //add_action( 'init', 'wpinv_apply_preset_discount', 999 );
 
-function wpinv_get_discount_label( $code, $echo = true ) {
-    $label = wp_sprintf( __( 'Discount%1$s', 'invoicing' ), ( $code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)': '' ) );
-    $label = apply_filters( 'wpinv_get_discount_label', $label, $code );
+function wpinv_get_discount_label($code, $echo = true) {
+    $label = wp_sprintf(__('Discount%1$s', 'invoicing'), ($code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)' : ''));
+    $label = apply_filters('wpinv_get_discount_label', $label, $code);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_cart_discount_label( $code, $rate, $echo = true ) {
-    $label = wp_sprintf( __( '%1$s Discount: %2$s', 'invoicing' ), $rate, $code );
-    $label = apply_filters( 'wpinv_cart_discount_label', $label, $code, $rate );
+function wpinv_cart_discount_label($code, $rate, $echo = true) {
+    $label = wp_sprintf(__('%1$s Discount: %2$s', 'invoicing'), $rate, $code);
+    $label = apply_filters('wpinv_cart_discount_label', $label, $code, $rate);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_check_delete_discount( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_discount' && wpinv_get_discount_uses( $post->ID ) > 0 ) {
+function wpinv_check_delete_discount($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_discount' && wpinv_get_discount_uses($post->ID) > 0) {
         return true;
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_discount', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_discount', 10, 3);
 
 function wpinv_checkout_form_validate_discounts() {
     $discounts = wpinv_get_cart_discounts();
     
-    if ( !empty( $discounts ) ) {
+    if (!empty($discounts)) {
         $invalid = false;
         
-        foreach ( $discounts as $key => $code ) {
-            if ( !wpinv_is_discount_valid( $code, get_current_user_id() ) ) {
+        foreach ($discounts as $key => $code) {
+            if (!wpinv_is_discount_valid($code, get_current_user_id())) {
                 $invalid = true;
                 
-                wpinv_unset_cart_discount( $code );
+                wpinv_unset_cart_discount($code);
             }
         }
         
-        if ( $invalid ) {
+        if ($invalid) {
             $errors = wpinv_get_errors();
-            $error  = !empty( $errors['wpinv-discount-error'] ) ? $errors['wpinv-discount-error'] . ' ' : '';
-            $error  .= __( 'The discount has been removed from cart.', 'invoicing' );
-            wpinv_set_error( 'wpinv-discount-error', $error );
+            $error  = !empty($errors['wpinv-discount-error']) ? $errors['wpinv-discount-error'] . ' ' : '';
+            $error .= __('The discount has been removed from cart.', 'invoicing');
+            wpinv_set_error('wpinv-discount-error', $error);
             
-            wpinv_recalculate_tax( true );
+            wpinv_recalculate_tax(true);
         }
     }
 }
-add_action( 'wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10 );
+add_action('wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10);
 
 function wpinv_discount_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_discount_amount', $output );
+    return apply_filters('wpinv_discount_amount', $output);
 }
\ No newline at end of file