AyeCode / invoicing

includes/wpinv-error-functions.php

Indentation +2 added lines, -2 removed lines

@@ -13,9 +13,9 @@
         ) );
         echo '<div class="' . implode( ' ', $classes ) . '">';
             // Loop error codes and display errors
-           foreach ( $errors as $error_id => $error ) {
+            foreach ( $errors as $error_id => $error ) {
                 echo '<p class="wpinv_error" id="wpinv_error_' . $error_id . '"><strong>' . __( 'Error', 'invoicing' ) . '</strong>: ' . $error . '</p>';
-           }
+            }
         echo '</div>';
         wpinv_clear_errors();
     }

Spacing +24 added lines, -24 removed lines

@@ -1,61 +1,61 @@ 
 <?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__));
 }
 
 function wpinv_print_errors() {
     $errors = wpinv_get_errors();
 
-    if ( $errors ) {
-        $classes = apply_filters( 'wpinv_error_class', array(
+    if ($errors) {
+        $classes = apply_filters('wpinv_error_class', array(
             'wpinv_errors', 'wpinv-alert', 'wpinv-alert-error'
-        ) );
-        echo '<div class="' . implode( ' ', $classes ) . '">';
+        ));
+        echo '<div class="' . implode(' ', $classes) . '">';
             // Loop error codes and display errors
-           foreach ( $errors as $error_id => $error ) {
-                echo '<p class="wpinv_error" id="wpinv_error_' . $error_id . '"><strong>' . __( 'Error', 'invoicing' ) . '</strong>: ' . $error . '</p>';
+           foreach ($errors as $error_id => $error) {
+                echo '<p class="wpinv_error" id="wpinv_error_' . $error_id . '"><strong>' . __('Error', 'invoicing') . '</strong>: ' . $error . '</p>';
            }
         echo '</div>';
         wpinv_clear_errors();
     }
 }
-add_action( 'wpinv_purchase_form_before_submit', 'wpinv_print_errors' );
-add_action( 'wpinv_ajax_checkout_errors', 'wpinv_print_errors' );
+add_action('wpinv_purchase_form_before_submit', 'wpinv_print_errors');
+add_action('wpinv_ajax_checkout_errors', 'wpinv_print_errors');
 
 function wpinv_get_errors() {
     global $wpi_session;
     
-    return $wpi_session->get( 'wpinv_errors' );
+    return $wpi_session->get('wpinv_errors');
 }
 
-function wpinv_set_error( $error_id, $error_message ) {
+function wpinv_set_error($error_id, $error_message) {
     global $wpi_session;
     
     $errors = wpinv_get_errors();
 
-    if ( ! $errors ) {
+    if (!$errors) {
         $errors = array();
     }
 
-    $errors[ $error_id ] = $error_message;
-    $wpi_session->set( 'wpinv_errors', $errors );
+    $errors[$error_id] = $error_message;
+    $wpi_session->set('wpinv_errors', $errors);
 }
 
 function wpinv_clear_errors() {
     global $wpi_session;
     
-    $wpi_session->set( 'wpinv_errors', null );
+    $wpi_session->set('wpinv_errors', null);
 }
 
-function wpinv_unset_error( $error_id ) {
+function wpinv_unset_error($error_id) {
     global $wpi_session;
     
     $errors = wpinv_get_errors();
 
-    if ( $errors ) {
-        unset( $errors[ $error_id ] );
-        $wpi_session->set( 'wpinv_errors', $errors );
+    if ($errors) {
+        unset($errors[$error_id]);
+        $wpi_session->set('wpinv_errors', $errors);
     }
 }
 
@@ -63,8 +63,8 @@ 
     die();
 }
 
-function wpinv_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', 'wpinv_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', 'wpinv_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function wpinv_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', 'wpinv_die_handler', 10, 3);
+    add_filter('wp_die_handler', 'wpinv_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }

includes/wpinv-gateway-functions.php

Indentation +28 added lines, -28 removed lines

@@ -286,26 +286,26 @@ 
 }
 
 function wpinv_get_chosen_gateway( $invoice_id = 0 ) {
-	$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+    $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
 
     $chosen = false;
     if ( $invoice_id > 0 && $invoice = wpinv_get_invoice( $invoice_id ) ) {
         $chosen = $invoice->get_gateway();
     }
 
-	$chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
+    $chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
 
-	if ( false !== $chosen ) {
-		$chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen );
-	}
+    if ( false !== $chosen ) {
+        $chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen );
+    }
 
-	if ( ! empty ( $chosen ) ) {
-		$enabled_gateway = urldecode( $chosen );
-	} else if (  !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
-		$enabled_gateway = 'manual';
-	} else {
-		$enabled_gateway = wpinv_get_default_gateway();
-	}
+    if ( ! empty ( $chosen ) ) {
+        $enabled_gateway = urldecode( $chosen );
+    } else if (  !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
+        $enabled_gateway = 'manual';
+    } else {
+        $enabled_gateway = wpinv_get_default_gateway();
+    }
     
     if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) {
         if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){
@@ -316,7 +316,7 @@ 
 
     }
 
-	return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
+    return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
 }
 
 function wpinv_record_gateway_error( $title = '', $message = '', $parent = 0 ) {
@@ -324,21 +324,21 @@ 
 }
 
 function wpinv_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) {
-	$ret  = 0;
-	$args = array(
-		'meta_key'    => '_wpinv_gateway',
-		'meta_value'  => $gateway_id,
-		'nopaging'    => true,
-		'post_type'   => 'wpi_invoice',
-		'post_status' => $status,
-		'fields'      => 'ids'
-	);
-
-	$payments = new WP_Query( $args );
-
-	if( $payments )
-		$ret = $payments->post_count;
-	return $ret;
+    $ret  = 0;
+    $args = array(
+        'meta_key'    => '_wpinv_gateway',
+        'meta_value'  => $gateway_id,
+        'nopaging'    => true,
+        'post_type'   => 'wpi_invoice',
+        'post_status' => $status,
+        'fields'      => 'ids'
+    );
+
+    $payments = new WP_Query( $args );
+
+    if( $payments )
+        $ret = $payments->post_count;
+    return $ret;
 }
 
 function wpinv_settings_update_gateways( $input ) {

Braces +4 added lines, -3 removed lines

@@ -310,7 +310,7 @@ 
     if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) {
         if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){
             $enabled_gateway = wpinv_get_default_gateway();
-        }else{
+        } else{
             $enabled_gateway = $gateways[0];
         }
 
@@ -336,8 +336,9 @@ 
 
 	$payments = new WP_Query( $args );
 
-	if( $payments )
-		$ret = $payments->post_count;
+	if( $payments ) {
+			$ret = $payments->post_count;
+	}
 	return $ret;
 }
 

Spacing +255 added lines, -255 removed lines

@@ -7,206 +7,206 @@ 
  */
  
 // 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_payment_gateways() {
     // Default, built-in gateways
     $gateways = array(
         'paypal' => array(
-            'admin_label'    => __( 'PayPal Standard', 'invoicing' ),
-            'checkout_label' => __( 'PayPal Standard', 'invoicing' ),
+            'admin_label'    => __('PayPal Standard', 'invoicing'),
+            'checkout_label' => __('PayPal Standard', 'invoicing'),
             'ordering'       => 1,
         ),
         'authorizenet' => array(
-            'admin_label'    => __( 'Authorize.Net (AIM)', 'invoicing' ),
-            'checkout_label' => __( 'Authorize.Net - Credit Card / Debit Card', 'invoicing' ),
+            'admin_label'    => __('Authorize.Net (AIM)', 'invoicing'),
+            'checkout_label' => __('Authorize.Net - Credit Card / Debit Card', 'invoicing'),
             'ordering'       => 4,
         ),
         'worldpay' => array(
-            'admin_label'    => __( 'Worldpay', 'invoicing' ),
-            'checkout_label' => __( 'Worldpay - Credit Card / Debit Card', 'invoicing' ),
+            'admin_label'    => __('Worldpay', 'invoicing'),
+            'checkout_label' => __('Worldpay - Credit Card / Debit Card', 'invoicing'),
             'ordering'       => 5,
         ),
         'bank_transfer' => array(
-            'admin_label'    => __( 'Pre Bank Transfer', 'invoicing' ),
-            'checkout_label' => __( 'Pre Bank Transfer', 'invoicing' ),
+            'admin_label'    => __('Pre Bank Transfer', 'invoicing'),
+            'checkout_label' => __('Pre Bank Transfer', 'invoicing'),
             'ordering'       => 11,
         ),
         'manual' => array(
-            'admin_label'    => __( 'Test Payment', 'invoicing' ),
-            'checkout_label' => __( 'Test Payment', 'invoicing' ),
+            'admin_label'    => __('Test Payment', 'invoicing'),
+            'checkout_label' => __('Test Payment', 'invoicing'),
             'ordering'       => 12,
         ),
     );
 
-    return apply_filters( 'wpinv_payment_gateways', $gateways );
+    return apply_filters('wpinv_payment_gateways', $gateways);
 }
 
-function wpinv_payment_gateway_titles( $all_gateways ) {
+function wpinv_payment_gateway_titles($all_gateways) {
     global $wpinv_options;
     
     $gateways = array();
-    foreach ( $all_gateways as $key => $gateway ) {
-        if ( !empty( $wpinv_options[$key . '_title'] ) ) {
-            $all_gateways[$key]['checkout_label'] = __( $wpinv_options[$key . '_title'], 'invoicing' );
+    foreach ($all_gateways as $key => $gateway) {
+        if (!empty($wpinv_options[$key . '_title'])) {
+            $all_gateways[$key]['checkout_label'] = __($wpinv_options[$key . '_title'], 'invoicing');
         }
         
-        $gateways[$key] = isset( $wpinv_options[$key . '_ordering'] ) ? $wpinv_options[$key . '_ordering'] : ( isset( $gateway['ordering'] ) ? $gateway['ordering'] : '' );
+        $gateways[$key] = isset($wpinv_options[$key . '_ordering']) ? $wpinv_options[$key . '_ordering'] : (isset($gateway['ordering']) ? $gateway['ordering'] : '');
     }
 
-    asort( $gateways );
+    asort($gateways);
     
-    foreach ( $gateways as $gateway => $key ) {
+    foreach ($gateways as $gateway => $key) {
         $gateways[$gateway] = $all_gateways[$gateway];
     }
     
     return $gateways;
 }
-add_filter( 'wpinv_payment_gateways', 'wpinv_payment_gateway_titles', 1000, 1 );
+add_filter('wpinv_payment_gateways', 'wpinv_payment_gateway_titles', 1000, 1);
 
-function wpinv_get_enabled_payment_gateways( $sort = false ) {
+function wpinv_get_enabled_payment_gateways($sort = false) {
     $gateways = wpinv_get_payment_gateways();
-    $enabled  = wpinv_get_option( 'gateways', false );
+    $enabled  = wpinv_get_option('gateways', false);
 
     $gateway_list = array();
 
-    foreach ( $gateways as $key => $gateway ) {
-        if ( isset( $enabled[ $key ] ) && $enabled[ $key ] == 1 ) {
-            $gateway_list[ $key ] = $gateway;
+    foreach ($gateways as $key => $gateway) {
+        if (isset($enabled[$key]) && $enabled[$key] == 1) {
+            $gateway_list[$key] = $gateway;
         }
     }
 
-    if ( true === $sort ) {
-        uasort( $gateway_list, 'wpinv_sort_gateway_order' );
+    if (true === $sort) {
+        uasort($gateway_list, 'wpinv_sort_gateway_order');
         
         // Reorder our gateways so the default is first
         $default_gateway_id = wpinv_get_default_gateway();
 
-        if ( wpinv_is_gateway_active( $default_gateway_id ) ) {
-            $default_gateway    = array( $default_gateway_id => $gateway_list[ $default_gateway_id ] );
-            unset( $gateway_list[ $default_gateway_id ] );
+        if (wpinv_is_gateway_active($default_gateway_id)) {
+            $default_gateway = array($default_gateway_id => $gateway_list[$default_gateway_id]);
+            unset($gateway_list[$default_gateway_id]);
 
-            $gateway_list = array_merge( $default_gateway, $gateway_list );
+            $gateway_list = array_merge($default_gateway, $gateway_list);
         }
     }
 
-    return apply_filters( 'wpinv_enabled_payment_gateways', $gateway_list );
+    return apply_filters('wpinv_enabled_payment_gateways', $gateway_list);
 }
 
-function wpinv_sort_gateway_order( $a, $b ) {
+function wpinv_sort_gateway_order($a, $b) {
     return $a['ordering'] - $b['ordering'];
 }
 
-function wpinv_is_gateway_active( $gateway ) {
+function wpinv_is_gateway_active($gateway) {
     $gateways = wpinv_get_enabled_payment_gateways();
 
-    $ret = is_array($gateways) && $gateway ?  array_key_exists( $gateway, $gateways ) : false;
+    $ret = is_array($gateways) && $gateway ?  array_key_exists($gateway, $gateways) : false;
 
-    return apply_filters( 'wpinv_is_gateway_active', $ret, $gateway, $gateways );
+    return apply_filters('wpinv_is_gateway_active', $ret, $gateway, $gateways);
 }
 
 function wpinv_get_default_gateway() {
-    $default = wpinv_get_option( 'default_gateway', 'paypal' );
+    $default = wpinv_get_option('default_gateway', 'paypal');
 
-    if ( !wpinv_is_gateway_active( $default ) ) {
+    if (!wpinv_is_gateway_active($default)) {
         $gateways = wpinv_get_enabled_payment_gateways();
-        $gateways = array_keys( $gateways );
-        $default  = reset( $gateways );
+        $gateways = array_keys($gateways);
+        $default  = reset($gateways);
     }
 
-    return apply_filters( 'wpinv_default_gateway', $default );
+    return apply_filters('wpinv_default_gateway', $default);
 }
 
-function wpinv_get_gateway_admin_label( $gateway ) {
+function wpinv_get_gateway_admin_label($gateway) {
     $gateways = wpinv_get_payment_gateways();
-    $label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['admin_label'] : $gateway;
-    $payment  = isset( $_GET['id'] ) ? absint( $_GET['id'] ) : false;
+    $label    = isset($gateways[$gateway]) ? $gateways[$gateway]['admin_label'] : $gateway;
+    $payment  = isset($_GET['id']) ? absint($_GET['id']) : false;
 
-    if( $gateway == 'manual' && $payment ) {
-        if( !( (float)wpinv_payment_total( $payment ) > 0 ) ) {
-            $label = __( 'Free Purchase', 'invoicing' );
+    if ($gateway == 'manual' && $payment) {
+        if (!((float)wpinv_payment_total($payment) > 0)) {
+            $label = __('Free Purchase', 'invoicing');
         }
     }
 
-    return apply_filters( 'wpinv_gateway_admin_label', $label, $gateway );
+    return apply_filters('wpinv_gateway_admin_label', $label, $gateway);
 }
 
-function wpinv_get_gateway_description( $gateway ) {
+function wpinv_get_gateway_description($gateway) {
     global $wpinv_options;
 
-    $description = isset( $wpinv_options[$gateway . '_desc'] ) ? $wpinv_options[$gateway . '_desc'] : '';
+    $description = isset($wpinv_options[$gateway . '_desc']) ? $wpinv_options[$gateway . '_desc'] : '';
 
-    return apply_filters( 'wpinv_gateway_description', $description, $gateway );
+    return apply_filters('wpinv_gateway_description', $description, $gateway);
 }
 
-function wpinv_get_gateway_button_label( $gateway ) {
-    return apply_filters( 'wpinv_gateway_' . $gateway . '_button_label', '' );
+function wpinv_get_gateway_button_label($gateway) {
+    return apply_filters('wpinv_gateway_' . $gateway . '_button_label', '');
 }
 
-function wpinv_get_gateway_checkout_label( $gateway ) {
+function wpinv_get_gateway_checkout_label($gateway) {
     $gateways = wpinv_get_payment_gateways();
-    $label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['checkout_label'] : $gateway;
+    $label    = isset($gateways[$gateway]) ? $gateways[$gateway]['checkout_label'] : $gateway;
 
-    if( $gateway == 'manual' ) {
-        $label = __( 'Manual Payment', 'invoicing' );
+    if ($gateway == 'manual') {
+        $label = __('Manual Payment', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_gateway_checkout_label', $label, $gateway );
+    return apply_filters('wpinv_gateway_checkout_label', $label, $gateway);
 }
 
-function wpinv_settings_sections_gateways( $settings ) {
+function wpinv_settings_sections_gateways($settings) {
     $gateways = wpinv_get_payment_gateways();
     
     if (!empty($gateways)) {
-        foreach  ($gateways as $key => $gateway) {
+        foreach ($gateways as $key => $gateway) {
             $settings[$key] = $gateway['admin_label'];
         }
     }
     
     return $settings;    
 }
-add_filter( 'wpinv_settings_sections_gateways', 'wpinv_settings_sections_gateways', 10, 1 );
+add_filter('wpinv_settings_sections_gateways', 'wpinv_settings_sections_gateways', 10, 1);
 
-function wpinv_settings_gateways( $settings ) {
+function wpinv_settings_gateways($settings) {
     $gateways = wpinv_get_payment_gateways();
     
     if (!empty($gateways)) {
-        foreach  ($gateways as $key => $gateway) {
+        foreach ($gateways as $key => $gateway) {
             $setting = array();
             $setting[$key . '_header'] = array(
                     'id'   => 'gateway_header',
-                    'name' => '<h3>' . wp_sprintf( __( '%s Settings', 'invoicing' ), $gateway['admin_label'] ) . '</h3>',
+                    'name' => '<h3>' . wp_sprintf(__('%s Settings', 'invoicing'), $gateway['admin_label']) . '</h3>',
                     'custom' => $key,
                     'type' => 'gateway_header',
                 );
             $setting[$key . '_active'] = array(
                     'id'   => $key . '_active',
-                    'name' => __( 'Active', 'invoicing' ),
-                    'desc' => wp_sprintf( __( 'Enable %s', 'invoicing' ), $gateway['admin_label'] ),
+                    'name' => __('Active', 'invoicing'),
+                    'desc' => wp_sprintf(__('Enable %s', 'invoicing'), $gateway['admin_label']),
                     'type' => 'checkbox',
                 );
                 
             $setting[$key . '_title'] = array(
                     'id'   => $key . '_title',
-                    'name' => __( 'Title', 'invoicing' ),
-                    'desc' => __( 'This controls the title which the user sees during checkout.', 'invoicing' ),
+                    'name' => __('Title', 'invoicing'),
+                    'desc' => __('This controls the title which the user sees during checkout.', 'invoicing'),
                     'type' => 'text',
                     'std' => isset($gateway['checkout_label']) ? $gateway['checkout_label'] : ''
                 );
             
             $setting[$key . '_desc'] = array(
                     'id'   => $key . '_desc',
-                    'name' => __( 'Description', 'invoicing' ),
-                    'desc' => __( 'This controls the description which the user sees during checkout.', 'invoicing' ),
+                    'name' => __('Description', 'invoicing'),
+                    'desc' => __('This controls the description which the user sees during checkout.', 'invoicing'),
                     'type' => 'text',
                     'size' => 'large'
                 );
                 
             $setting[$key . '_ordering'] = array(
                     'id'   => $key . '_ordering',
-                    'name' => __( 'Display Order', 'invoicing' ),
+                    'name' => __('Display Order', 'invoicing'),
                     'type' => 'number',
                     'size' => 'small',
                     'std'  => isset($gateway['ordering']) ? $gateway['ordering'] : '10',
@@ -215,8 +215,8 @@ 
                     'step' => '1'
                 );
                 
-            $setting = apply_filters( 'wpinv_gateway_settings', $setting, $key );
-            $setting = apply_filters( 'wpinv_gateway_settings_' . $key, $setting );
+            $setting = apply_filters('wpinv_gateway_settings', $setting, $key);
+            $setting = apply_filters('wpinv_gateway_settings_' . $key, $setting);
             
             $settings[$key] = $setting;
         }
@@ -224,106 +224,106 @@ 
     
     return $settings;    
 }
-add_filter( 'wpinv_settings_gateways', 'wpinv_settings_gateways', 10, 1 );
+add_filter('wpinv_settings_gateways', 'wpinv_settings_gateways', 10, 1);
 
-function wpinv_gateway_header_callback( $args ) {
-    echo '<input type="hidden" id="wpinv_settings[save_gateway]" name="wpinv_settings[save_gateway]" value="' . esc_attr( $args['custom'] ) . '" />';
+function wpinv_gateway_header_callback($args) {
+    echo '<input type="hidden" id="wpinv_settings[save_gateway]" name="wpinv_settings[save_gateway]" value="' . esc_attr($args['custom']) . '" />';
 }
 
-function wpinv_get_gateway_supports( $gateway ) {
+function wpinv_get_gateway_supports($gateway) {
     $gateways = wpinv_get_enabled_payment_gateways();
-    $supports = isset( $gateways[ $gateway ]['supports'] ) ? $gateways[ $gateway ]['supports'] : array();
-    return apply_filters( 'wpinv_gateway_supports', $supports, $gateway );
+    $supports = isset($gateways[$gateway]['supports']) ? $gateways[$gateway]['supports'] : array();
+    return apply_filters('wpinv_gateway_supports', $supports, $gateway);
 }
 
-function wpinv_gateway_supports_buy_now( $gateway ) {
-    $supports = wpinv_get_gateway_supports( $gateway );
-    $ret = in_array( 'buy_now', $supports );
-    return apply_filters( 'wpinv_gateway_supports_buy_now', $ret, $gateway );
+function wpinv_gateway_supports_buy_now($gateway) {
+    $supports = wpinv_get_gateway_supports($gateway);
+    $ret = in_array('buy_now', $supports);
+    return apply_filters('wpinv_gateway_supports_buy_now', $ret, $gateway);
 }
 
 function wpinv_shop_supports_buy_now() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $ret      = false;
 
-    if ( !wpinv_use_taxes()  && $gateways ) {
-        foreach ( $gateways as $gateway_id => $gateway ) {
-            if ( wpinv_gateway_supports_buy_now( $gateway_id ) ) {
+    if (!wpinv_use_taxes() && $gateways) {
+        foreach ($gateways as $gateway_id => $gateway) {
+            if (wpinv_gateway_supports_buy_now($gateway_id)) {
                 $ret = true;
                 break;
             }
         }
     }
 
-    return apply_filters( 'wpinv_shop_supports_buy_now', $ret );
+    return apply_filters('wpinv_shop_supports_buy_now', $ret);
 }
 
-function wpinv_send_to_gateway( $gateway, $payment_data ) {
-    $payment_data['gateway_nonce'] = wp_create_nonce( 'wpi-gateway' );
+function wpinv_send_to_gateway($gateway, $payment_data) {
+    $payment_data['gateway_nonce'] = wp_create_nonce('wpi-gateway');
 
     // $gateway must match the ID used when registering the gateway
-    do_action( 'wpinv_gateway_' . $gateway, $payment_data );
+    do_action('wpinv_gateway_' . $gateway, $payment_data);
 }
 
 function wpinv_show_gateways() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $show_gateways = false;
 
-    $chosen_gateway = isset( $_GET['payment-mode'] ) ? preg_replace('/[^a-zA-Z0-9-_]+/', '', $_GET['payment-mode'] ) : false;
+    $chosen_gateway = isset($_GET['payment-mode']) ? preg_replace('/[^a-zA-Z0-9-_]+/', '', $_GET['payment-mode']) : false;
 
-    if ( count( $gateways ) > 1 && empty( $chosen_gateway ) ) {
+    if (count($gateways) > 1 && empty($chosen_gateway)) {
         $show_gateways = true;
-        if ( wpinv_get_cart_total() <= 0 ) {
+        if (wpinv_get_cart_total() <= 0) {
             $show_gateways = false;
         }
     }
     
-    if ( !$show_gateways && wpinv_cart_has_recurring_item() ) {
+    if (!$show_gateways && wpinv_cart_has_recurring_item()) {
         $show_gateways = true;
     }
 
-    return apply_filters( 'wpinv_show_gateways', $show_gateways );
+    return apply_filters('wpinv_show_gateways', $show_gateways);
 }
 
-function wpinv_get_chosen_gateway( $invoice_id = 0 ) {
-	$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+function wpinv_get_chosen_gateway($invoice_id = 0) {
+	$gateways = array_keys(wpinv_get_enabled_payment_gateways());
 
     $chosen = false;
-    if ( $invoice_id > 0 && $invoice = wpinv_get_invoice( $invoice_id ) ) {
+    if ($invoice_id > 0 && $invoice = wpinv_get_invoice($invoice_id)) {
         $chosen = $invoice->get_gateway();
     }
 
-	$chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
+	$chosen = isset($_REQUEST['payment-mode']) ? sanitize_text_field($_REQUEST['payment-mode']) : $chosen;
 
-	if ( false !== $chosen ) {
-		$chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen );
+	if (false !== $chosen) {
+		$chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen);
 	}
 
-	if ( ! empty ( $chosen ) ) {
-		$enabled_gateway = urldecode( $chosen );
-	} else if (  !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
+	if (!empty ($chosen)) {
+		$enabled_gateway = urldecode($chosen);
+	} else if (!empty($invoice) && (float)$invoice->get_subtotal() <= 0) {
 		$enabled_gateway = 'manual';
 	} else {
 		$enabled_gateway = wpinv_get_default_gateway();
 	}
     
-    if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) {
-        if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){
+    if (!wpinv_is_gateway_active($enabled_gateway) && !empty($gateways)) {
+        if (wpinv_is_gateway_active(wpinv_get_default_gateway())) {
             $enabled_gateway = wpinv_get_default_gateway();
-        }else{
+        } else {
             $enabled_gateway = $gateways[0];
         }
 
     }
 
-	return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
+	return apply_filters('wpinv_chosen_gateway', $enabled_gateway);
 }
 
-function wpinv_record_gateway_error( $title = '', $message = '', $parent = 0 ) {
-    return wpinv_error_log( $message, $title );
+function wpinv_record_gateway_error($title = '', $message = '', $parent = 0) {
+    return wpinv_error_log($message, $title);
 }
 
-function wpinv_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) {
+function wpinv_count_sales_by_gateway($gateway_id = 'paypal', $status = 'publish') {
 	$ret  = 0;
 	$args = array(
 		'meta_key'    => '_wpinv_gateway',
@@ -334,48 +334,48 @@ 
 		'fields'      => 'ids'
 	);
 
-	$payments = new WP_Query( $args );
+	$payments = new WP_Query($args);
 
-	if( $payments )
+	if ($payments)
 		$ret = $payments->post_count;
 	return $ret;
 }
 
-function wpinv_settings_update_gateways( $input ) {
+function wpinv_settings_update_gateways($input) {
     global $wpinv_options;
     
-    if ( !empty( $input['save_gateway'] ) ) {
-        $gateways = wpinv_get_option( 'gateways', false );
+    if (!empty($input['save_gateway'])) {
+        $gateways = wpinv_get_option('gateways', false);
         $gateways = !empty($gateways) ? $gateways : array();
         $gateway = $input['save_gateway'];
         
-        if ( !empty( $input[$gateway . '_active'] ) ) {
+        if (!empty($input[$gateway . '_active'])) {
             $gateways[$gateway] = 1;
         } else {
-            if ( isset( $gateways[$gateway] ) ) {
-                unset( $gateways[$gateway] );
+            if (isset($gateways[$gateway])) {
+                unset($gateways[$gateway]);
             }
         }
         
         $input['gateways'] = $gateways;
     }
     
-    if ( !empty( $input['default_gateway'] ) ) {
+    if (!empty($input['default_gateway'])) {
         $gateways = wpinv_get_payment_gateways();
         
-        foreach ( $gateways as $key => $gateway ) {
-            $active   = 0;
-            if ( !empty( $input['gateways'] ) && !empty( $input['gateways'][$key] ) ) {
+        foreach ($gateways as $key => $gateway) {
+            $active = 0;
+            if (!empty($input['gateways']) && !empty($input['gateways'][$key])) {
                 $active = 1;
             }
             
             $input[$key . '_active'] = $active;
             
-            if ( empty( $wpinv_options[$key . '_title'] ) ) {
+            if (empty($wpinv_options[$key . '_title'])) {
                 $input[$key . '_title'] = $gateway['checkout_label'];
             }
             
-            if ( !isset( $wpinv_options[$key . '_ordering'] ) && isset( $gateway['ordering'] ) ) {
+            if (!isset($wpinv_options[$key . '_ordering']) && isset($gateway['ordering'])) {
                 $input[$key . '_ordering'] = $gateway['ordering'];
             }
         }
@@ -383,26 +383,26 @@ 
     
     return $input;
 }
-add_filter( 'wpinv_settings_tab_gateways_sanitize', 'wpinv_settings_update_gateways', 10, 1 );
+add_filter('wpinv_settings_tab_gateways_sanitize', 'wpinv_settings_update_gateways', 10, 1);
 
 // PayPal Standard settings
-function wpinv_gateway_settings_paypal( $setting ) {    
-    $setting['paypal_desc']['std'] = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' );
+function wpinv_gateway_settings_paypal($setting) {    
+    $setting['paypal_desc']['std'] = __('Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing');
     
     $setting['paypal_sandbox'] = array(
             'type' => 'checkbox',
             'id'   => 'paypal_sandbox',
-            'name' => __( 'PayPal Sandbox', 'invoicing' ),
-            'desc' => __( 'PayPal sandbox can be used to test payments.', 'invoicing' ),
+            'name' => __('PayPal Sandbox', 'invoicing'),
+            'desc' => __('PayPal sandbox can be used to test payments.', 'invoicing'),
             'std'  => 1
         );
         
     $setting['paypal_email'] = array(
             'type' => 'text',
             'id'   => 'paypal_email',
-            'name' => __( 'PayPal Email', 'invoicing' ),
-            'desc' => __( 'Please enter your PayPal account\'s email address. Ex: myaccount@paypal.com', 'invoicing' ),
-            'std' => __( 'myaccount@paypal.com', 'invoicing' ),
+            'name' => __('PayPal Email', 'invoicing'),
+            'desc' => __('Please enter your PayPal account\'s email address. Ex: myaccount@paypal.com', 'invoicing'),
+            'std' => __('myaccount@paypal.com', 'invoicing'),
         );
     /*
     $setting['paypal_ipn_url'] = array(
@@ -416,123 +416,123 @@ 
         
     return $setting;
 }
-add_filter( 'wpinv_gateway_settings_paypal', 'wpinv_gateway_settings_paypal', 10, 1 );
+add_filter('wpinv_gateway_settings_paypal', 'wpinv_gateway_settings_paypal', 10, 1);
 
 // Pre Bank Transfer settings
-function wpinv_gateway_settings_bank_transfer( $setting ) {
-    $setting['bank_transfer_desc']['std'] = __( 'Make your payment directly into our bank account. Please use your Invoice ID as the payment reference. Your invoice won\'t be processed until the funds have cleared in our account.', 'invoicing' );
+function wpinv_gateway_settings_bank_transfer($setting) {
+    $setting['bank_transfer_desc']['std'] = __('Make your payment directly into our bank account. Please use your Invoice ID as the payment reference. Your invoice won\'t be processed until the funds have cleared in our account.', 'invoicing');
     
     $setting['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id' => 'bank_transfer_ac_name',
-            'name' => __( 'Account Name', 'invoicing' ),
-            'desc' => __( 'Enter the bank account name to which you want to transfer payment.', 'invoicing' ),
-            'std'  =>  __( 'Mr. John Martin', 'invoicing' ),
+            'name' => __('Account Name', 'invoicing'),
+            'desc' => __('Enter the bank account name to which you want to transfer payment.', 'invoicing'),
+            'std'  =>  __('Mr. John Martin', 'invoicing'),
         );
     
     $setting['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id' => 'bank_transfer_ac_no',
-            'name' => __( 'Account Number', 'invoicing' ),
-            'desc' => __( 'Enter your bank account number.', 'invoicing' ),
-            'std'  =>  __( 'TEST1234567890', 'invoicing' ),
+            'name' => __('Account Number', 'invoicing'),
+            'desc' => __('Enter your bank account number.', 'invoicing'),
+            'std'  =>  __('TEST1234567890', 'invoicing'),
         );
     
     $setting['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
-            'name' => __( 'Bank Name', 'invoicing' ),
-            'desc' => __( 'Enter the bank name to which you want to transfer payment.', 'invoicing' ),
-            'std' => __( 'ICICI Bank', 'invoicing' ),
+            'name' => __('Bank Name', 'invoicing'),
+            'desc' => __('Enter the bank name to which you want to transfer payment.', 'invoicing'),
+            'std' => __('ICICI Bank', 'invoicing'),
         );
     
     $setting['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
-            'name' => __( 'IFSC Code', 'invoicing' ),
-            'desc' => __( 'Enter your bank IFSC code.', 'invoicing' ),
-            'std'  =>  __( 'ICIC0001234', 'invoicing' ),
+            'name' => __('IFSC Code', 'invoicing'),
+            'desc' => __('Enter your bank IFSC code.', 'invoicing'),
+            'std'  =>  __('ICIC0001234', 'invoicing'),
         );
         
     $setting['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
-            'name' => __( 'IBAN', 'invoicing' ),
-            'desc' => __( 'Enter your International Bank Account Number(IBAN).', 'invoicing' ),
-            'std'  =>  __( 'GB29NWBK60161331926819', 'invoicing' ),
+            'name' => __('IBAN', 'invoicing'),
+            'desc' => __('Enter your International Bank Account Number(IBAN).', 'invoicing'),
+            'std'  =>  __('GB29NWBK60161331926819', 'invoicing'),
         );
         
     $setting['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
-            'name' => __( 'BIC/Swift Code', 'invoicing' ),
-            'std'  =>  __( 'ICICGB2L129', 'invoicing' ),
+            'name' => __('BIC/Swift Code', 'invoicing'),
+            'std'  =>  __('ICICGB2L129', 'invoicing'),
         );
 
     $setting['bank_transfer_sort_code'] = array(
         'type' => 'text',
         'id'   => 'bank_transfer_sort_code',
-        'name' => __( 'Sort Code', 'invoicing' ),
-        'std'  =>  __( '12-34-56', 'invoicing' ),
+        'name' => __('Sort Code', 'invoicing'),
+        'std'  =>  __('12-34-56', 'invoicing'),
     );
         
     $setting['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
-            'name' => __( 'Instructions', 'invoicing' ),
-            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'name' => __('Instructions', 'invoicing'),
+            'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
             'type' => 'textarea',
-            'std' => __( 'Make your payment directly into our bank account. Please use your Invoice ID as the payment reference. Your invoice won\'t be processed until the funds have cleared in our account.', 'invoicing' ),
+            'std' => __('Make your payment directly into our bank account. Please use your Invoice ID as the payment reference. Your invoice won\'t be processed until the funds have cleared in our account.', 'invoicing'),
             'cols' => 37,
             'rows' => 5
         );
         
     return $setting;
 }
-add_filter( 'wpinv_gateway_settings_bank_transfer', 'wpinv_gateway_settings_bank_transfer', 10, 1 );
+add_filter('wpinv_gateway_settings_bank_transfer', 'wpinv_gateway_settings_bank_transfer', 10, 1);
 
 // Authorize.Net settings
-function wpinv_gateway_settings_authorizenet( $setting ) {
-    $setting['authorizenet_active']['desc'] = $setting['authorizenet_active']['desc'] . ' ' . __( '( currencies supported: AUD, CAD, CHF, DKK, EUR, GBP, JPY, NOK, NZD, PLN, SEK, USD, ZAR )', 'invoicing' );
-    $setting['authorizenet_desc']['std'] = __( 'Pay using a Authorize.Net to process credit card / debit card transactions.', 'invoicing' );
+function wpinv_gateway_settings_authorizenet($setting) {
+    $setting['authorizenet_active']['desc'] = $setting['authorizenet_active']['desc'] . ' ' . __('( currencies supported: AUD, CAD, CHF, DKK, EUR, GBP, JPY, NOK, NZD, PLN, SEK, USD, ZAR )', 'invoicing');
+    $setting['authorizenet_desc']['std'] = __('Pay using a Authorize.Net to process credit card / debit card transactions.', 'invoicing');
     
     $setting['authorizenet_sandbox'] = array(
             'type' => 'checkbox',
             'id'   => 'authorizenet_sandbox',
-            'name' => __( 'Authorize.Net Test Mode', 'invoicing' ),
-            'desc' => __( 'Enable Authorize.Net test mode to test payments.', 'invoicing' ),
+            'name' => __('Authorize.Net Test Mode', 'invoicing'),
+            'desc' => __('Enable Authorize.Net test mode to test payments.', 'invoicing'),
             'std'  => 1
         );
         
     $setting['authorizenet_login_id'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_login_id',
-            'name' => __( 'API Login ID', 'invoicing' ),
-            'desc' => __( 'API Login ID can be obtained from Authorize.Net Account > Settings > Security Settings > General Security Settings > API Credentials & Keys. Example : 2j4rBekUnD', 'invoicing' ),
+            'name' => __('API Login ID', 'invoicing'),
+            'desc' => __('API Login ID can be obtained from Authorize.Net Account > Settings > Security Settings > General Security Settings > API Credentials & Keys. Example : 2j4rBekUnD', 'invoicing'),
             'std' => '2j4rBekUnD',
         );
     
     $setting['authorizenet_transaction_key'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_transaction_key',
-            'name' => __( 'Transaction Key', 'invoicing' ),
-            'desc' => __( 'Transaction Key can be obtained from Authorize.Net Account > Settings > Security Settings > General Security Settings > API Credentials & Keys. Example : 4vyBUOJgR74679xa', 'invoicing' ),
+            'name' => __('Transaction Key', 'invoicing'),
+            'desc' => __('Transaction Key can be obtained from Authorize.Net Account > Settings > Security Settings > General Security Settings > API Credentials & Keys. Example : 4vyBUOJgR74679xa', 'invoicing'),
             'std' => '4vyBUOJgR74679xa',
         );
         
     $setting['authorizenet_md5_hash'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_md5_hash',
-            'name' => __( 'MD5-Hash', 'invoicing' ),
-            'desc' => __( 'The MD5 Hash security feature allows you to authenticate transaction responses from the Authorize.Net. If you are accepting recurring payments then md5 hash will helps to validate response from Authorize.net. It can be obtained from Authorize.Net Account > Settings > Security Settings > General Settings > MD5 Hash.', 'invoicing' ),
+            'name' => __('MD5-Hash', 'invoicing'),
+            'desc' => __('The MD5 Hash security feature allows you to authenticate transaction responses from the Authorize.Net. If you are accepting recurring payments then md5 hash will helps to validate response from Authorize.net. It can be obtained from Authorize.Net Account > Settings > Security Settings > General Settings > MD5 Hash.', 'invoicing'),
             'std' => '',
         );
         
     $setting['authorizenet_ipn_url'] = array(
             'type' => 'ipn_url',
             'id'   => 'authorizenet_ipn_url',
-            'name' => __( 'Silent Post URL', 'invoicing' ),
-            'std' => wpinv_get_ipn_url( 'authorizenet' ),
-            'desc' => __( 'If you are accepting recurring payments then you must set this url at Authorize.Net Account > Settings > Transaction Format Settings > Transaction Response Settings > Silent Post URL.', 'invoicing' ),
+            'name' => __('Silent Post URL', 'invoicing'),
+            'std' => wpinv_get_ipn_url('authorizenet'),
+            'desc' => __('If you are accepting recurring payments then you must set this url at Authorize.Net Account > Settings > Transaction Format Settings > Transaction Response Settings > Silent Post URL.', 'invoicing'),
             'size' => 'large',
             'custom' => 'authorizenet',
             'readonly' => true
@@ -540,25 +540,25 @@ 
         
     return $setting;
 }
-add_filter( 'wpinv_gateway_settings_authorizenet', 'wpinv_gateway_settings_authorizenet', 10, 1 );
+add_filter('wpinv_gateway_settings_authorizenet', 'wpinv_gateway_settings_authorizenet', 10, 1);
 
 // Worldpay settings
-function wpinv_gateway_settings_worldpay( $setting ) {
-    $setting['worldpay_desc']['std'] = __( 'Pay using a Worldpay account to process credit card / debit card transactions.', 'invoicing' );
+function wpinv_gateway_settings_worldpay($setting) {
+    $setting['worldpay_desc']['std'] = __('Pay using a Worldpay account to process credit card / debit card transactions.', 'invoicing');
     
     $setting['worldpay_sandbox'] = array(
             'type' => 'checkbox',
             'id'   => 'worldpay_sandbox',
-            'name' => __( 'Worldpay Test Mode', 'invoicing' ),
-            'desc' => __( 'This provides a special Test Environment to enable you to test your installation and integration to your website before going live.', 'invoicing' ),
+            'name' => __('Worldpay Test Mode', 'invoicing'),
+            'desc' => __('This provides a special Test Environment to enable you to test your installation and integration to your website before going live.', 'invoicing'),
             'std'  => 1
         );
         
     $setting['worldpay_instId'] = array(
             'type' => 'text',
             'id'   => 'worldpay_instId',
-            'name' => __( 'Installation Id', 'invoicing' ),
-            'desc' => __( 'Your installation id. Ex: 211616', 'invoicing' ),
+            'name' => __('Installation Id', 'invoicing'),
+            'desc' => __('Your installation id. Ex: 211616', 'invoicing'),
             'std' => '211616',
         );
     /*
@@ -574,9 +574,9 @@ 
     $setting['worldpay_ipn_url'] = array(
             'type' => 'ipn_url',
             'id'   => 'worldpay_ipn_url',
-            'name' => __( 'Worldpay Callback Url', 'invoicing' ),
-            'std' => wpinv_get_ipn_url( 'worldpay' ),
-            'desc' => wp_sprintf( __( 'Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and type "%s" or "%s" for a dynamic payment response.', 'invoicing' ), '<font style="color:#000;font-style:normal">' . wpinv_get_ipn_url( 'worldpay' ) . '</font>', '<font style="color:#000;font-style:normal">&lt;wpdisplay item=MC_callback&gt;</font>' ),
+            'name' => __('Worldpay Callback Url', 'invoicing'),
+            'std' => wpinv_get_ipn_url('worldpay'),
+            'desc' => wp_sprintf(__('Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and type "%s" or "%s" for a dynamic payment response.', 'invoicing'), '<font style="color:#000;font-style:normal">' . wpinv_get_ipn_url('worldpay') . '</font>', '<font style="color:#000;font-style:normal">&lt;wpdisplay item=MC_callback&gt;</font>'),
             'size' => 'large',
             'custom' => 'worldpay',
             'readonly' => true
@@ -584,95 +584,95 @@ 
         
     return $setting;
 }
-add_filter( 'wpinv_gateway_settings_worldpay', 'wpinv_gateway_settings_worldpay', 10, 1 );
+add_filter('wpinv_gateway_settings_worldpay', 'wpinv_gateway_settings_worldpay', 10, 1);
 
-function wpinv_ipn_url_callback( $args ) {    
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+function wpinv_ipn_url_callback($args) {    
+    $sanitize_id = wpinv_sanitize_key($args['id']);
     
     $attrs = $args['readonly'] ? ' readonly' : '';
 
-    $html = '<input style="background-color:#fefefe" type="text" ' . $attrs . ' value="' . esc_attr( $args['std'] ) . '" name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . ']" class="large-text">';
-    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']">'  . $args['desc'] . '</label>';
+    $html = '<input style="background-color:#fefefe" type="text" ' . $attrs . ' value="' . esc_attr($args['std']) . '" name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . ']" class="large-text">';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']">' . $args['desc'] . '</label>';
 
     echo $html;
 }
 
-function wpinv_is_test_mode( $gateway = '' ) {
-    if ( empty( $gateway ) ) {
+function wpinv_is_test_mode($gateway = '') {
+    if (empty($gateway)) {
         return false;
     }
     
-    $is_test_mode = wpinv_get_option( $gateway . '_sandbox', false );
+    $is_test_mode = wpinv_get_option($gateway . '_sandbox', false);
     
-    return apply_filters( 'wpinv_is_test_mode', $is_test_mode, $gateway );
+    return apply_filters('wpinv_is_test_mode', $is_test_mode, $gateway);
 }
 
-function wpinv_get_ipn_url( $gateway = '', $args = array() ) {
-    $data = array( 'wpi-listener' => 'IPN' );
+function wpinv_get_ipn_url($gateway = '', $args = array()) {
+    $data = array('wpi-listener' => 'IPN');
     
-    if ( !empty( $gateway ) ) {
-        $data['wpi-gateway'] = wpinv_sanitize_key( $gateway );
+    if (!empty($gateway)) {
+        $data['wpi-gateway'] = wpinv_sanitize_key($gateway);
     }
     
-    $args = !empty( $args ) && is_array( $args ) ? array_merge( $data, $args ) : $data;
+    $args = !empty($args) && is_array($args) ? array_merge($data, $args) : $data;
     
-    $ipn_url = add_query_arg( $args,  home_url( 'index.php' ) );
+    $ipn_url = add_query_arg($args, home_url('index.php'));
     
-    return apply_filters( 'wpinv_ipn_url', $ipn_url );
+    return apply_filters('wpinv_ipn_url', $ipn_url);
 }
 
 function wpinv_listen_for_payment_ipn() {
     // Regular PayPal IPN
-    if ( isset( $_GET['wpi-listener'] ) && $_GET['wpi-listener'] == 'IPN' ) {
-        do_action( 'wpinv_verify_payment_ipn' );
+    if (isset($_GET['wpi-listener']) && $_GET['wpi-listener'] == 'IPN') {
+        do_action('wpinv_verify_payment_ipn');
         
-        if ( !empty( $_GET['wpi-gateway'] ) ) {
-            wpinv_error_log( sanitize_text_field( $_GET['wpi-gateway'] ), 'wpinv_listen_for_payment_ipn()', __FILE__, __LINE__ );
-            do_action( 'wpinv_verify_' . sanitize_text_field( $_GET['wpi-gateway'] ) . '_ipn' );
+        if (!empty($_GET['wpi-gateway'])) {
+            wpinv_error_log(sanitize_text_field($_GET['wpi-gateway']), 'wpinv_listen_for_payment_ipn()', __FILE__, __LINE__);
+            do_action('wpinv_verify_' . sanitize_text_field($_GET['wpi-gateway']) . '_ipn');
         }
     }
 }
-add_action( 'init', 'wpinv_listen_for_payment_ipn' );
+add_action('init', 'wpinv_listen_for_payment_ipn');
 
 function wpinv_get_bank_instructions() {
-    $bank_instructions = wpinv_get_option( 'bank_transfer_info' );
+    $bank_instructions = wpinv_get_option('bank_transfer_info');
     
-    return apply_filters( 'wpinv_bank_instructions', $bank_instructions );
+    return apply_filters('wpinv_bank_instructions', $bank_instructions);
 }
 
-function wpinv_get_bank_info( $filtered = false ) {
+function wpinv_get_bank_info($filtered = false) {
     $bank_fields = array(
-        'bank_transfer_ac_name'     => __( 'Account Name', 'invoicing' ),
-        'bank_transfer_ac_no'       => __( 'Account Number', 'invoicing' ),
-        'bank_transfer_bank_name'   => __( 'Bank Name', 'invoicing' ),
-        'bank_transfer_ifsc'        => __( 'IFSC code', 'invoicing' ),
-        'bank_transfer_iban'        => __( 'IBAN', 'invoicing' ),
-        'bank_transfer_bic'         => __( 'BIC/Swift code', 'invoicing' ),
-        'bank_transfer_sort_code'   => __( 'Sort Code', 'invoicing' )
+        'bank_transfer_ac_name'     => __('Account Name', 'invoicing'),
+        'bank_transfer_ac_no'       => __('Account Number', 'invoicing'),
+        'bank_transfer_bank_name'   => __('Bank Name', 'invoicing'),
+        'bank_transfer_ifsc'        => __('IFSC code', 'invoicing'),
+        'bank_transfer_iban'        => __('IBAN', 'invoicing'),
+        'bank_transfer_bic'         => __('BIC/Swift code', 'invoicing'),
+        'bank_transfer_sort_code'   => __('Sort Code', 'invoicing')
     );
     
     $bank_info = array();
-    foreach ( $bank_fields as $field => $label ) {
-        if ( $filtered && !( $value = wpinv_get_option( $field ) ) ) {
+    foreach ($bank_fields as $field => $label) {
+        if ($filtered && !($value = wpinv_get_option($field))) {
             continue;
         }
         
-        $bank_info[$field] = array( 'label' => $label, 'value' => $value );
+        $bank_info[$field] = array('label' => $label, 'value' => $value);
     }
     
-    return apply_filters( 'wpinv_bank_info', $bank_info, $filtered );
+    return apply_filters('wpinv_bank_info', $bank_info, $filtered);
 }
 
-function wpinv_process_before_send_to_gateway( $invoice, $invoice_data = array() ) {
-    if ( !empty( $invoice ) && $invoice->is_recurring() && $subscription_item = $invoice->get_recurring( true ) ) {        
+function wpinv_process_before_send_to_gateway($invoice, $invoice_data = array()) {
+    if (!empty($invoice) && $invoice->is_recurring() && $subscription_item = $invoice->get_recurring(true)) {        
         $args                          = array();
         $args['item_id']               = $subscription_item->ID;
-        $args['initial_amount']        = wpinv_round_amount( $invoice->get_total() );
-        $args['recurring_amount']      = wpinv_round_amount( $invoice->get_recurring_details( 'total' ) );
+        $args['initial_amount']        = wpinv_round_amount($invoice->get_total());
+        $args['recurring_amount']      = wpinv_round_amount($invoice->get_recurring_details('total'));
         $args['currency']              = $invoice->get_currency();
         $args['period']                = $subscription_item->get_recurring_period();
         $args['interval']              = $subscription_item->get_recurring_interval();
-        if ( $subscription_item->has_free_trial() ) {
+        if ($subscription_item->has_free_trial()) {
             $args['trial_period']      = $subscription_item->get_trial_period();
             $args['trial_interval']    = $subscription_item->get_trial_interval();
         } else {
@@ -681,25 +681,25 @@ 
         }
         $args['bill_times']            = (int)$subscription_item->get_recurring_limit();
         
-        $invoice->update_subscription( $args );
+        $invoice->update_subscription($args);
     }
 }
-add_action( 'wpinv_checkout_before_send_to_gateway', 'wpinv_process_before_send_to_gateway', 10, 2 );
+add_action('wpinv_checkout_before_send_to_gateway', 'wpinv_process_before_send_to_gateway', 10, 2);
 
-function wpinv_get_post_data( $method = 'request' ) {
+function wpinv_get_post_data($method = 'request') {
     $data       = array();
     $request    = $_REQUEST;
     
-    if ( $method == 'post' ) {
-        if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+    if ($method == 'post') {
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
             return $data;
         }
         
         $request = $_POST;
     }
     
-    if ( $method == 'get' ) {
-        if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'GET' ) {
+    if ($method == 'get') {
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'GET') {
             return $data;
         }
         
@@ -710,11 +710,11 @@ 
     $post_data = '';
     
     // Fallback just in case post_max_size is lower than needed
-    if ( ini_get( 'allow_url_fopen' ) ) {
-        $post_data = file_get_contents( 'php://input' );
+    if (ini_get('allow_url_fopen')) {
+        $post_data = file_get_contents('php://input');
     } else {
         // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-        ini_set( 'post_max_size', '12M' );
+        ini_set('post_max_size', '12M');
     }
     // Start the encoded data collection with notification command
     $encoded_data = 'cmd=_notify-validate';
@@ -723,58 +723,58 @@ 
     $arg_separator = wpinv_get_php_arg_separator_output();
 
     // Verify there is a post_data
-    if ( $post_data || strlen( $post_data ) > 0 ) {
+    if ($post_data || strlen($post_data) > 0) {
         // Append the data
         $encoded_data .= $arg_separator . $post_data;
     } else {
         // Check if POST is empty
-        if ( empty( $request ) ) {
+        if (empty($request)) {
             // Nothing to do
             return;
         } else {
             // Loop through each POST
-            foreach ( $request as $key => $value ) {
+            foreach ($request as $key => $value) {
                 // Encode the value and append the data
-                $encoded_data .= $arg_separator . "$key=" . urlencode( $value );
+                $encoded_data .= $arg_separator . "$key=" . urlencode($value);
             }
         }
     }
 
     // Convert collected post data to an array
-    parse_str( $encoded_data, $data );
+    parse_str($encoded_data, $data);
 
-    foreach ( $data as $key => $value ) {
-        if ( false !== strpos( $key, 'amp;' ) ) {
-            $new_key = str_replace( '&amp;', '&', $key );
-            $new_key = str_replace( 'amp;', '&' , $new_key );
+    foreach ($data as $key => $value) {
+        if (false !== strpos($key, 'amp;')) {
+            $new_key = str_replace('&amp;', '&', $key);
+            $new_key = str_replace('amp;', '&', $new_key);
 
-            unset( $data[ $key ] );
-            $data[ $new_key ] = sanitize_text_field( $value );
+            unset($data[$key]);
+            $data[$new_key] = sanitize_text_field($value);
         }
     }
     
     return $data;
 }
 
-function wpinv_gateway_support_subscription( $gateway ) {
+function wpinv_gateway_support_subscription($gateway) {
     $return = false;
     
-    if ( wpinv_is_gateway_active( $gateway ) ) {
-        $return = apply_filters( 'wpinv_' . $gateway . '_support_subscription', false );
+    if (wpinv_is_gateway_active($gateway)) {
+        $return = apply_filters('wpinv_' . $gateway . '_support_subscription', false);
     }
     
     return $return;
 }
 
-function wpinv_payment_gateways_on_cart( $gateways = array() ) {
-    if ( !empty( $gateways ) && wpinv_cart_has_recurring_item() ) {
-        foreach ( $gateways as $gateway => $info ) {
-            if ( !wpinv_gateway_support_subscription( $gateway ) ) {
-                unset( $gateways[$gateway] );
+function wpinv_payment_gateways_on_cart($gateways = array()) {
+    if (!empty($gateways) && wpinv_cart_has_recurring_item()) {
+        foreach ($gateways as $gateway => $info) {
+            if (!wpinv_gateway_support_subscription($gateway)) {
+                unset($gateways[$gateway]);
             }
         }
     }
     
     return $gateways;
 }
-add_filter( 'wpinv_payment_gateways_on_cart', 'wpinv_payment_gateways_on_cart', 10, 1 );
\ No newline at end of file
+add_filter('wpinv_payment_gateways_on_cart', 'wpinv_payment_gateways_on_cart', 10, 1);
\ No newline at end of file

includes/wpinv-post-types.php

Indentation +8 added lines, -8 removed lines

@@ -140,8 +140,8 @@ 
 
 function wpinv_get_default_labels() {
     $defaults = array(
-       'singular' => __( 'Invoice', 'invoicing' ),
-       'plural'   => __( 'Invoices', 'invoicing' )
+        'singular' => __( 'Invoice', 'invoicing' ),
+        'plural'   => __( 'Invoices', 'invoicing' )
     );
     
     return apply_filters( 'wpinv_default_invoices_name', $defaults );
@@ -160,20 +160,20 @@ 
 }
 
 function wpinv_change_default_title( $title ) {
-     if ( !is_admin() ) {
+        if ( !is_admin() ) {
         $label = wpinv_get_label_singular();
         $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
         return $title;
-     }
+        }
 
-     $screen = get_current_screen();
+        $screen = get_current_screen();
 
-     if ( 'wpi_invoice' == $screen->post_type ) {
+        if ( 'wpi_invoice' == $screen->post_type ) {
         $label = wpinv_get_label_singular();
         $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
-     }
+        }
 
-     return $title;
+        return $title;
 }
 add_filter( 'enter_title_here', 'wpinv_change_default_title' );
 

Spacing +103 added lines, -103 removed lines

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

includes/class-wpinv-reports.php

Indentation +5 added lines, -5 removed lines

@@ -166,13 +166,13 @@
             $is_writeable   = $is_dir && is_writeable( $this->export_dir );
             
             if ( $is_dir && $is_writeable ) {
-               return true;
+                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 );
-               }
+                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;
+                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 );

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'] ) : 'publish';
+    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']) : 'publish';
     }
     
-    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_round_amount( $invoice->get_total() ),
-                    'status_nicename' => $invoice->get_status( true ),
+                    'date'          => $invoice->get_invoice_date(false),
+                    'amount'        => wpinv_round_amount($invoice->get_total()),
+                    'status_nicename' => $invoice->get_status(true),
                     'status'        => $invoice->get_status(),
-                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount( $invoice->get_tax() ) : '',
-                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount( $invoice->get_discount() ) : '',
+                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount($invoice->get_tax()) : '',
+                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount($invoice->get_discount()) : '',
                     '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-helper-functions.php

Indentation +1 added lines, -1 removed lines

@@ -437,7 +437,7 @@
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+    return ini_get( 'arg_separator.output' );
 }
 
 function wpinv_rgb_from_hex( $color ) {

Doc Comments +28 added lines, -1 removed lines

@@ -31,6 +31,9 @@ 
     return apply_filters( 'wpinv_get_ip', $ip );
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_user_agent() {
     if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
         $user_agent = sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] );
@@ -41,6 +44,9 @@ 
     return apply_filters( 'wpinv_get_user_agent', $user_agent );
 }
 
+/**
+ * @param integer $decimals
+ */
 function wpinv_sanitize_amount( $amount, $decimals = NULL ) {
     $is_negative   = false;
     $thousands_sep = wpinv_thousands_separator();
@@ -79,6 +85,9 @@ 
 }
 add_filter( 'wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
 
+/**
+ * @param integer $decimals
+ */
 function wpinv_round_amount( $amount, $decimals = NULL ) {
     if ( $decimals === NULL ) {
         $decimals = wpinv_decimals();
@@ -117,6 +126,9 @@ 
     return $status;
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_currency() {
     $currency = wpinv_get_option( 'currency', 'USD' );
     
@@ -187,6 +199,9 @@ 
     return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
 }
 
+/**
+ * @return string
+ */
 function wpinv_currency_position() {
     $position = wpinv_get_option( 'currency_position', 'left' );
     
@@ -315,6 +330,9 @@ 
     return $price;
 }
 
+/**
+ * @return string
+ */
 function wpinv_format_amount( $amount, $decimals = NULL, $calculate = false ) {
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
@@ -365,6 +383,9 @@ 
     return apply_filters( 'wpinv_sanitize_key', $key, $raw_key );
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_file_extension( $str ) {
     $parts = explode( '.', $str );
     return end( $parts );
@@ -569,6 +590,9 @@ 
     return strlen( $str );
 }
 
+/**
+ * @param string $str
+ */
 function wpinv_utf8_strtolower( $str, $encoding = 'UTF-8' ) {
     if ( function_exists( 'mb_strtolower' ) ) {
         return mb_strtolower( $str, $encoding );
@@ -577,6 +601,9 @@ 
     return strtolower( $str );
 }
 
+/**
+ * @param string $str
+ */
 function wpinv_utf8_strtoupper( $str, $encoding = 'UTF-8' ) {
     if ( function_exists( 'mb_strtoupper' ) ) {
         return mb_strtoupper( $str, $encoding );
@@ -654,7 +681,7 @@ 
  *
  * @param string $str The string being decoded.
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
- * @return string The width of string.
+ * @return integer The width of string.
  */
 function wpinv_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
     if ( function_exists( 'mb_strwidth' ) ) {

Spacing +235 added lines, -235 removed lines

@@ -7,89 +7,89 @@ 
  */
  
 // 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_item_quantities_enabled() {
-    $ret = wpinv_get_option( 'item_quantities', true );
+    $ret = wpinv_get_option('item_quantities', true);
     
-    return (bool) apply_filters( 'wpinv_item_quantities_enabled', $ret );
+    return (bool)apply_filters('wpinv_item_quantities_enabled', $ret);
 }
 
 function wpinv_get_ip() {
     $ip = '127.0.0.1';
 
-    if ( !empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_CLIENT_IP'] );
-    } elseif ( !empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_X_FORWARDED_FOR'] );
-    } elseif( !empty( $_SERVER['REMOTE_ADDR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_CLIENT_IP']);
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_X_FORWARDED_FOR']);
+    } elseif (!empty($_SERVER['REMOTE_ADDR'])) {
+        $ip = sanitize_text_field($_SERVER['REMOTE_ADDR']);
     }
     
-    return apply_filters( 'wpinv_get_ip', $ip );
+    return apply_filters('wpinv_get_ip', $ip);
 }
 
 function wpinv_get_user_agent() {
-    if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
-        $user_agent = sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] );
+    if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+        $user_agent = sanitize_text_field($_SERVER['HTTP_USER_AGENT']);
     } else {
         $user_agent = '';
     }
     
-    return apply_filters( 'wpinv_get_user_agent', $user_agent );
+    return apply_filters('wpinv_get_user_agent', $user_agent);
 }
 
-function wpinv_sanitize_amount( $amount, $decimals = NULL ) {
+function wpinv_sanitize_amount($amount, $decimals = NULL) {
     $is_negative   = false;
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
     // Sanitize the amount
-    if ( $decimal_sep == ',' && false !== ( $found = strpos( $amount, $decimal_sep ) ) ) {
-        if ( ( $thousands_sep == '.' || $thousands_sep == ' ' ) && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-            $amount = str_replace( $thousands_sep, '', $amount );
-        } elseif( empty( $thousands_sep ) && false !== ( $found = strpos( $amount, '.' ) ) ) {
-            $amount = str_replace( '.', '', $amount );
+    if ($decimal_sep == ',' && false !== ($found = strpos($amount, $decimal_sep))) {
+        if (($thousands_sep == '.' || $thousands_sep == ' ') && false !== ($found = strpos($amount, $thousands_sep))) {
+            $amount = str_replace($thousands_sep, '', $amount);
+        } elseif (empty($thousands_sep) && false !== ($found = strpos($amount, '.'))) {
+            $amount = str_replace('.', '', $amount);
         }
 
-        $amount = str_replace( $decimal_sep, '.', $amount );
-    } elseif( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( $thousands_sep, '', $amount );
+        $amount = str_replace($decimal_sep, '.', $amount);
+    } elseif ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace($thousands_sep, '', $amount);
     }
 
-    if( $amount < 0 ) {
+    if ($amount < 0) {
         $is_negative = true;
     }
 
-    $amount   = preg_replace( '/[^0-9\.]/', '', $amount );
+    $amount   = preg_replace('/[^0-9\.]/', '', $amount);
 
-    $decimals = apply_filters( 'wpinv_sanitize_amount_decimals', absint( $decimals ), $amount );
-    $amount   = number_format( (double) $amount, absint( $decimals ), '.', '' );
+    $decimals = apply_filters('wpinv_sanitize_amount_decimals', absint($decimals), $amount);
+    $amount   = number_format((double)$amount, absint($decimals), '.', '');
 
-    if( $is_negative ) {
+    if ($is_negative) {
         $amount *= -1;
     }
 
-    return apply_filters( 'wpinv_sanitize_amount', $amount, $decimals );
+    return apply_filters('wpinv_sanitize_amount', $amount, $decimals);
 }
-add_filter( 'wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_round_amount( $amount, $decimals = NULL ) {
-    if ( $decimals === NULL ) {
+function wpinv_round_amount($amount, $decimals = NULL) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
     
-    $amount = round( (double)$amount, wpinv_currency_decimal_filter( absint( $decimals ) ) );
+    $amount = round((double)$amount, wpinv_currency_decimal_filter(absint($decimals)));
 
-    return apply_filters( 'wpinv_round_amount', $amount, $decimals );
+    return apply_filters('wpinv_round_amount', $amount, $decimals);
 }
 
-function wpinv_get_invoice_statuses( $trashed = false ) {
+function wpinv_get_invoice_statuses($trashed = false) {
     global $post;
     $invoice_statuses = array();
     $invoice_statuses = array(
@@ -103,32 +103,32 @@ 
         'wpi-renewal' => __('Renewal Payment', 'invoicing')
     );
     
-    if ( $trashed ) {
-        $invoice_statuses['trash'] = __( 'Trash', 'invoicing' );
+    if ($trashed) {
+        $invoice_statuses['trash'] = __('Trash', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_statuses', $invoice_statuses );
+    return apply_filters('wpinv_statuses', $invoice_statuses);
 }
 
-function wpinv_status_nicename( $status ) {
+function wpinv_status_nicename($status) {
     $statuses = wpinv_get_invoice_statuses();
-    $status   = isset( $statuses[$status] ) ? $statuses[$status] : __( $status, 'invoicing' );
+    $status   = isset($statuses[$status]) ? $statuses[$status] : __($status, 'invoicing');
 
     return $status;
 }
 
 function wpinv_get_currency() {
-    $currency = wpinv_get_option( 'currency', 'USD' );
+    $currency = wpinv_get_option('currency', 'USD');
     
-    return apply_filters( 'wpinv_currency', $currency );
+    return apply_filters('wpinv_currency', $currency);
 }
 
-function wpinv_currency_symbol( $currency = '' ) {
-    if ( empty( $currency ) ) {
+function wpinv_currency_symbol($currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
     
-    $symbols = apply_filters( 'wpinv_currency_symbols', array(
+    $symbols = apply_filters('wpinv_currency_symbols', array(
         'AED' => 'د.إ',
         'ARS' => '&#36;',
         'AUD' => '&#36;',
@@ -180,78 +180,78 @@ 
         'USD' => '&#36;',
         'VND' => '&#8363;',
         'ZAR' => '&#82;',
-    ) );
+    ));
 
-    $currency_symbol = isset( $symbols[$currency] ) ? $symbols[$currency] : '&#36;';
+    $currency_symbol = isset($symbols[$currency]) ? $symbols[$currency] : '&#36;';
 
-    return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
+    return apply_filters('wpinv_currency_symbol', $currency_symbol, $currency);
 }
 
 function wpinv_currency_position() {
-    $position = wpinv_get_option( 'currency_position', 'left' );
+    $position = wpinv_get_option('currency_position', 'left');
     
-    return apply_filters( 'wpinv_currency_position', $position );
+    return apply_filters('wpinv_currency_position', $position);
 }
 
 function wpinv_thousands_separator() {
-    $thousand_sep = wpinv_get_option( 'thousands_separator', ',' );
+    $thousand_sep = wpinv_get_option('thousands_separator', ',');
     
-    return apply_filters( 'wpinv_thousands_separator', $thousand_sep );
+    return apply_filters('wpinv_thousands_separator', $thousand_sep);
 }
 
 function wpinv_decimal_separator() {
-    $decimal_sep = wpinv_get_option( 'decimal_separator', '.' );
+    $decimal_sep = wpinv_get_option('decimal_separator', '.');
     
-    return apply_filters( 'wpinv_decimal_separator', $decimal_sep );
+    return apply_filters('wpinv_decimal_separator', $decimal_sep);
 }
 
 function wpinv_decimals() {
-    $decimals = apply_filters( 'wpinv_decimals', wpinv_get_option( 'decimals', 2 ) );
+    $decimals = apply_filters('wpinv_decimals', wpinv_get_option('decimals', 2));
     
-    return absint( $decimals );
+    return absint($decimals);
 }
 
 function wpinv_get_currencies() {
     $currencies = array(
-        'USD'  => __( 'US Dollars (&#36;)', 'invoicing' ),
-        'EUR'  => __( 'Euros (&euro;)', 'invoicing' ),
-        'GBP'  => __( 'Pounds Sterling (&pound;)', 'invoicing' ),
-        'AUD'  => __( 'Australian Dollars (&#36;)', 'invoicing' ),
-        'BRL'  => __( 'Brazilian Real (R&#36;)', 'invoicing' ),
-        'CAD'  => __( 'Canadian Dollars (&#36;)', 'invoicing' ),
-        'CLP'  => __( 'Chilean Peso (&#36;)', 'invoicing' ),
-        'CNY'  => __( 'Chinese Yuan (&yen;)', 'invoicing' ),
-        'CZK'  => __( 'Czech Koruna (&#75;&#269;)', 'invoicing' ),
-        'DKK'  => __( 'Danish Krone (DKK)', 'invoicing' ),
-        'HKD'  => __( 'Hong Kong Dollar (&#36;)', 'invoicing' ),
-        'HUF'  => __( 'Hungarian Forint (&#70;&#116;)', 'invoicing' ),
-        'INR'  => __( 'Indian Rupee (&#8377;)', 'invoicing' ),
-        'ILS'  => __( 'Israeli Shekel (&#8362;)', 'invoicing' ),
-        'JPY'  => __( 'Japanese Yen (&yen;)', 'invoicing' ),
-        'MYR'  => __( 'Malaysian Ringgit (&#82;&#77;)', 'invoicing' ),
-        'MXN'  => __( 'Mexican Peso (&#36;)', 'invoicing' ),
-        'NZD'  => __( 'New Zealand Dollar (&#36;)', 'invoicing' ),
-        'NOK'  => __( 'Norwegian Krone (&#107;&#114;)', 'invoicing' ),
-        'PHP'  => __( 'Philippine Peso (&#8369;)', 'invoicing' ),
-        'PLN'  => __( 'Polish Zloty (&#122;&#322;)', 'invoicing' ),
-        'SGD'  => __( 'Singapore Dollar (&#36;)', 'invoicing' ),
-        'SEK'  => __( 'Swedish Krona (&#107;&#114;)', 'invoicing' ),
-        'CHF'  => __( 'Swiss Franc (&#67;&#72;&#70;)', 'invoicing' ),
-        'TWD'  => __( 'Taiwan New Dollar (&#78;&#84;&#36;)', 'invoicing' ),
-        'THB'  => __( 'Thai Baht (&#3647;)', 'invoicing' ),
-        'TRY'  => __( 'Turkish Lira (&#8378;)', 'invoicing' ),
-        'RIAL' => __( 'Iranian Rial (&#65020;)', 'invoicing' ),
-        'RUB'  => __( 'Russian Ruble (&#8381;)', 'invoicing' ),
-        'ZAR'  => __( 'South African Rand (&#82;)', 'invoicing' )
+        'USD'  => __('US Dollars (&#36;)', 'invoicing'),
+        'EUR'  => __('Euros (&euro;)', 'invoicing'),
+        'GBP'  => __('Pounds Sterling (&pound;)', 'invoicing'),
+        'AUD'  => __('Australian Dollars (&#36;)', 'invoicing'),
+        'BRL'  => __('Brazilian Real (R&#36;)', 'invoicing'),
+        'CAD'  => __('Canadian Dollars (&#36;)', 'invoicing'),
+        'CLP'  => __('Chilean Peso (&#36;)', 'invoicing'),
+        'CNY'  => __('Chinese Yuan (&yen;)', 'invoicing'),
+        'CZK'  => __('Czech Koruna (&#75;&#269;)', 'invoicing'),
+        'DKK'  => __('Danish Krone (DKK)', 'invoicing'),
+        'HKD'  => __('Hong Kong Dollar (&#36;)', 'invoicing'),
+        'HUF'  => __('Hungarian Forint (&#70;&#116;)', 'invoicing'),
+        'INR'  => __('Indian Rupee (&#8377;)', 'invoicing'),
+        'ILS'  => __('Israeli Shekel (&#8362;)', 'invoicing'),
+        'JPY'  => __('Japanese Yen (&yen;)', 'invoicing'),
+        'MYR'  => __('Malaysian Ringgit (&#82;&#77;)', 'invoicing'),
+        'MXN'  => __('Mexican Peso (&#36;)', 'invoicing'),
+        'NZD'  => __('New Zealand Dollar (&#36;)', 'invoicing'),
+        'NOK'  => __('Norwegian Krone (&#107;&#114;)', 'invoicing'),
+        'PHP'  => __('Philippine Peso (&#8369;)', 'invoicing'),
+        'PLN'  => __('Polish Zloty (&#122;&#322;)', 'invoicing'),
+        'SGD'  => __('Singapore Dollar (&#36;)', 'invoicing'),
+        'SEK'  => __('Swedish Krona (&#107;&#114;)', 'invoicing'),
+        'CHF'  => __('Swiss Franc (&#67;&#72;&#70;)', 'invoicing'),
+        'TWD'  => __('Taiwan New Dollar (&#78;&#84;&#36;)', 'invoicing'),
+        'THB'  => __('Thai Baht (&#3647;)', 'invoicing'),
+        'TRY'  => __('Turkish Lira (&#8378;)', 'invoicing'),
+        'RIAL' => __('Iranian Rial (&#65020;)', 'invoicing'),
+        'RUB'  => __('Russian Ruble (&#8381;)', 'invoicing'),
+        'ZAR'  => __('South African Rand (&#82;)', 'invoicing')
     );
     
-    asort( $currencies );
+    asort($currencies);
 
-    return apply_filters( 'wpinv_currencies', $currencies );
+    return apply_filters('wpinv_currencies', $currencies);
 }
 
-function wpinv_price( $amount = '', $currency = '' ) {
-    if( empty( $currency ) ) {
+function wpinv_price($amount = '', $currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
@@ -259,14 +259,14 @@ 
 
     $negative = $amount < 0;
 
-    if ( $negative ) {
-        $amount = substr( $amount, 1 );
+    if ($negative) {
+        $amount = substr($amount, 1);
     }
 
-    $symbol = wpinv_currency_symbol( $currency );
+    $symbol = wpinv_currency_symbol($currency);
 
-    if ( $position == 'left' || $position == 'left_space' ) {
-        switch ( $currency ) {
+    if ($position == 'left' || $position == 'left_space') {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -278,15 +278,15 @@ 
             case "NZD" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
             default :
                 //$price = $currency . ' ' . $amount;
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
         }
     } else {
-        switch ( $currency ) {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -297,83 +297,83 @@ 
             case "MXN" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
             default :
                 //$price = $amount . ' ' . $currency;
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
         }
     }
     
-    if ( $negative ) {
+    if ($negative) {
         $price = '-' . $price;
     }
     
-    $price = apply_filters( 'wpinv_' . strtolower( $currency ) . '_currency_filter_' . $position, $price, $currency, $amount );
+    $price = apply_filters('wpinv_' . strtolower($currency) . '_currency_filter_' . $position, $price, $currency, $amount);
 
     return $price;
 }
 
-function wpinv_format_amount( $amount, $decimals = NULL, $calculate = false ) {
+function wpinv_format_amount($amount, $decimals = NULL, $calculate = false) {
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
 
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
-    if ( $decimal_sep == ',' && false !== ( $sep_found = strpos( $amount, $decimal_sep ) ) ) {
-        $whole = substr( $amount, 0, $sep_found );
-        $part = substr( $amount, $sep_found + 1, ( strlen( $amount ) - 1 ) );
+    if ($decimal_sep == ',' && false !== ($sep_found = strpos($amount, $decimal_sep))) {
+        $whole = substr($amount, 0, $sep_found);
+        $part = substr($amount, $sep_found + 1, (strlen($amount) - 1));
         $amount = $whole . '.' . $part;
     }
 
-    if ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ',', '', $amount );
+    if ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(',', '', $amount);
     }
 
-    if ( $thousands_sep == ' ' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ' ', '', $amount );
+    if ($thousands_sep == ' ' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(' ', '', $amount);
     }
 
-    if ( empty( $amount ) ) {
+    if (empty($amount)) {
         $amount = 0;
     }
     
-    $decimals  = apply_filters( 'wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate );
-    $formatted = number_format( (float)$amount, $decimals, $decimal_sep, $thousands_sep );
+    $decimals  = apply_filters('wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate);
+    $formatted = number_format((float)$amount, $decimals, $decimal_sep, $thousands_sep);
     
-    if ( $calculate ) {
-        if ( $thousands_sep === "," ) {
-            $formatted = str_replace( ",", "", $formatted );
+    if ($calculate) {
+        if ($thousands_sep === ",") {
+            $formatted = str_replace(",", "", $formatted);
         }
         
-        if ( $decimal_sep === "," ) {
-            $formatted = str_replace( ",", ".", $formatted );
+        if ($decimal_sep === ",") {
+            $formatted = str_replace(",", ".", $formatted);
         }
     }
 
-    return apply_filters( 'wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate );
+    return apply_filters('wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate);
 }
-add_filter( 'wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_sanitize_key( $key ) {
+function wpinv_sanitize_key($key) {
     $raw_key = $key;
-    $key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
+    $key = preg_replace('/[^a-zA-Z0-9_\-\.\:\/]/', '', $key);
 
-    return apply_filters( 'wpinv_sanitize_key', $key, $raw_key );
+    return apply_filters('wpinv_sanitize_key', $key, $raw_key);
 }
 
-function wpinv_get_file_extension( $str ) {
-    $parts = explode( '.', $str );
-    return end( $parts );
+function wpinv_get_file_extension($str) {
+    $parts = explode('.', $str);
+    return end($parts);
 }
 
-function wpinv_string_is_image_url( $str ) {
-    $ext = wpinv_get_file_extension( $str );
+function wpinv_string_is_image_url($str) {
+    $ext = wpinv_get_file_extension($str);
 
-    switch ( strtolower( $ext ) ) {
+    switch (strtolower($ext)) {
         case 'jpeg';
         case 'jpg';
             $return = true;
@@ -389,32 +389,32 @@ 
             break;
     }
 
-    return (bool)apply_filters( 'wpinv_string_is_image', $return, $str );
+    return (bool)apply_filters('wpinv_string_is_image', $return, $str);
 }
 
-function wpinv_error_log( $log, $title = '', $file = '', $line = '', $exit = false ) {
-    $should_log = apply_filters( 'wpinv_log_errors', WP_DEBUG );
+function wpinv_error_log($log, $title = '', $file = '', $line = '', $exit = false) {
+    $should_log = apply_filters('wpinv_log_errors', WP_DEBUG);
     
-    if ( true === $should_log ) {
+    if (true === $should_log) {
         $label = '';
-        if ( $file && $file !== '' ) {
-            $label .= basename( $file ) . ( $line ? '(' . $line . ')' : '' );
+        if ($file && $file !== '') {
+            $label .= basename($file) . ($line ? '(' . $line . ')' : '');
         }
         
-        if ( $title && $title !== '' ) {
+        if ($title && $title !== '') {
             $label = $label !== '' ? $label . ' ' : '';
             $label .= $title . ' ';
         }
         
-        $label = $label !== '' ? trim( $label ) . ' : ' : '';
+        $label = $label !== '' ? trim($label) . ' : ' : '';
         
-        if ( is_array( $log ) || is_object( $log ) ) {
-            error_log( $label . print_r( $log, true ) );
+        if (is_array($log) || is_object($log)) {
+            error_log($label . print_r($log, true));
         } else {
-            error_log( $label . $log );
+            error_log($label . $log);
         }
         
-        if ( $exit ) {
+        if ($exit) {
             exit;
         }
     }
@@ -422,65 +422,65 @@ 
 
 function wpinv_is_ajax_disabled() {
     $retval = false;
-    return apply_filters( 'wpinv_is_ajax_disabled', $retval );
+    return apply_filters('wpinv_is_ajax_disabled', $retval);
 }
 
-function wpinv_get_current_page_url( $nocache = false ) {
+function wpinv_get_current_page_url($nocache = false) {
     global $wp;
 
-    if ( get_option( 'permalink_structure' ) ) {
-        $base = trailingslashit( home_url( $wp->request ) );
+    if (get_option('permalink_structure')) {
+        $base = trailingslashit(home_url($wp->request));
     } else {
-        $base = add_query_arg( $wp->query_string, '', trailingslashit( home_url( $wp->request ) ) );
-        $base = remove_query_arg( array( 'post_type', 'name' ), $base );
+        $base = add_query_arg($wp->query_string, '', trailingslashit(home_url($wp->request)));
+        $base = remove_query_arg(array('post_type', 'name'), $base);
     }
 
     $scheme = is_ssl() ? 'https' : 'http';
-    $uri    = set_url_scheme( $base, $scheme );
+    $uri    = set_url_scheme($base, $scheme);
 
-    if ( is_front_page() ) {
-        $uri = home_url( '/' );
-    } elseif ( wpinv_is_checkout( array(), false ) ) {
+    if (is_front_page()) {
+        $uri = home_url('/');
+    } elseif (wpinv_is_checkout(array(), false)) {
         $uri = wpinv_get_checkout_uri();
     }
 
-    $uri = apply_filters( 'wpinv_get_current_page_url', $uri );
+    $uri = apply_filters('wpinv_get_current_page_url', $uri);
 
-    if ( $nocache ) {
-        $uri = wpinv_add_cache_busting( $uri );
+    if ($nocache) {
+        $uri = wpinv_add_cache_busting($uri);
     }
 
     return $uri;
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
-function wpinv_rgb_from_hex( $color ) {
-    $color = str_replace( '#', '', $color );
+function wpinv_rgb_from_hex($color) {
+    $color = str_replace('#', '', $color);
     // Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-    $color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
+    $color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
 
     $rgb      = array();
-    $rgb['R'] = hexdec( $color{0}.$color{1} );
-    $rgb['G'] = hexdec( $color{2}.$color{3} );
-    $rgb['B'] = hexdec( $color{4}.$color{5} );
+    $rgb['R'] = hexdec($color{0} . $color{1} );
+    $rgb['G'] = hexdec($color{2} . $color{3} );
+    $rgb['B'] = hexdec($color{4} . $color{5} );
 
     return $rgb;
 }
 
-function wpinv_hex_darker( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_darker($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = $v / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v - $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -489,18 +489,18 @@ 
     return $color;
 }
 
-function wpinv_hex_lighter( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_lighter($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = 255 - $v;
         $amount      = $amount / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v + $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -509,22 +509,22 @@ 
     return $color;
 }
 
-function wpinv_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
-    $hex = str_replace( '#', '', $color );
+function wpinv_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
+    $hex = str_replace('#', '', $color);
 
-    $c_r = hexdec( substr( $hex, 0, 2 ) );
-    $c_g = hexdec( substr( $hex, 2, 2 ) );
-    $c_b = hexdec( substr( $hex, 4, 2 ) );
+    $c_r = hexdec(substr($hex, 0, 2));
+    $c_g = hexdec(substr($hex, 2, 2));
+    $c_b = hexdec(substr($hex, 4, 2));
 
-    $brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+    $brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
     return $brightness > 155 ? $dark : $light;
 }
 
-function wpinv_format_hex( $hex ) {
-    $hex = trim( str_replace( '#', '', $hex ) );
+function wpinv_format_hex($hex) {
+    $hex = trim(str_replace('#', '', $hex));
 
-    if ( strlen( $hex ) == 3 ) {
+    if (strlen($hex) == 3) {
         $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
     }
 
@@ -544,12 +544,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function wpinv_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
     
-    return wpinv_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return wpinv_utf8_substr($str, $start, $width, $encoding) . $trimmaker;
 }
 
 /**
@@ -561,28 +561,28 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function wpinv_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function wpinv_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
         
-    return strlen( $str );
+    return strlen($str);
 }
 
-function wpinv_utf8_strtolower( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtolower' ) ) {
-        return mb_strtolower( $str, $encoding );
+function wpinv_utf8_strtolower($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtolower')) {
+        return mb_strtolower($str, $encoding);
     }
     
-    return strtolower( $str );
+    return strtolower($str);
 }
 
-function wpinv_utf8_strtoupper( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtoupper' ) ) {
-        return mb_strtoupper( $str, $encoding );
+function wpinv_utf8_strtoupper($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtoupper($str, $encoding);
     }
     
-    return strtoupper( $str );
+    return strtoupper($str);
 }
 
 /**
@@ -596,12 +596,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function wpinv_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
         
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -615,12 +615,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function wpinv_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
         
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -635,16 +635,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+function wpinv_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, wpinv_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
         
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -656,48 +656,48 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function wpinv_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strwidth' ) ) {
-        return mb_strwidth( $str, $encoding );
+function wpinv_utf8_strwidth($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strwidth')) {
+        return mb_strwidth($str, $encoding);
     }
     
-    return wpinv_utf8_strlen( $str, $encoding );
+    return wpinv_utf8_strlen($str, $encoding);
 }
 
-function wpinv_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = wpinv_utf8_strtoupper( wpinv_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function wpinv_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = wpinv_utf8_strtoupper(wpinv_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = wpinv_utf8_strtolower( wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = wpinv_utf8_strtolower(wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding);
         }
 
         return $first_letter . $str_end;
     }
     
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
-function wpinv_utf8_ucwords( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_convert_case' ) ) {
-        return mb_convert_case( $str, MB_CASE_TITLE, $encoding );
+function wpinv_utf8_ucwords($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_convert_case')) {
+        return mb_convert_case($str, MB_CASE_TITLE, $encoding);
     }
     
-    return ucwords( $str );
+    return ucwords($str);
 }
 
-function wpinv_period_in_days( $period, $unit ) {
-    $period = absint( $period );
+function wpinv_period_in_days($period, $unit) {
+    $period = absint($period);
     
-    if ( $period > 0 ) {
-        if ( in_array( strtolower( $unit ), array( 'w', 'week', 'weeks' ) ) ) {
+    if ($period > 0) {
+        if (in_array(strtolower($unit), array('w', 'week', 'weeks'))) {
             $period = $period * 7;
-        } else if ( in_array( strtolower( $unit ), array( 'm', 'month', 'months' ) ) ) {
+        } else if (in_array(strtolower($unit), array('m', 'month', 'months'))) {
             $period = $period * 30;
-        } else if ( in_array( strtolower( $unit ), array( 'y', 'year', 'years' ) ) ) {
+        } else if (in_array(strtolower($unit), array('y', 'year', 'years'))) {
             $period = $period * 365;
         }
     }

includes/class-wpinv-invoice.php

Braces +3 added lines, -2 removed lines

@@ -971,8 +971,9 @@
             return false;
         }
 
-        if ( empty( $this->ID ) )
-            return false;
+        if ( empty( $this->ID ) ) {
+                    return false;
+        }
         
         if ( ( ( is_user_logged_in() && current_user_can( 'manage_options' ) ) || $added_by_user ) && !$system ) {
             $user                 = get_user_by( 'id', get_current_user_id() );

Doc Comments +36 added lines

@@ -83,6 +83,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $key
+     */
     public function set( $key, $value ) {
         $ignore = array( 'items', 'cart_details', 'fees', '_ID' );
 
@@ -916,6 +919,9 @@ 
         return $removed;
     }
 
+    /**
+     * @param string $key
+     */
     public function remove_fee_by( $key, $value, $global = false ) {
         $allowed_fee_keys = apply_filters( 'wpinv_fee_keys', array(
             'index', 'label', 'amount', 'type',
@@ -1375,6 +1381,9 @@ 
         return apply_filters( 'wpinv_get_invoice_final_total', $final_total, $this, $currency );
     }
     
+    /**
+     * @return boolean
+     */
     public function get_discounts( $array = false ) {
         $discounts = $this->discounts;
         if ( $array && $discounts ) {
@@ -1383,6 +1392,9 @@ 
         return apply_filters( 'wpinv_payment_discounts', $discounts, $this->ID, $this, $array );
     }
     
+    /**
+     * @return string
+     */
     public function get_discount( $currency = false, $dash = false ) {
         if ( !empty( $this->discounts ) ) {
             global $ajax_cart_details;
@@ -1479,10 +1491,16 @@ 
         return apply_filters( 'wpinv_user_full_name', $this->full_name, $this->ID, $this );
     }
     
+    /**
+     * @return string
+     */
     public function get_user_info() {
         return apply_filters( 'wpinv_user_info', $this->user_info, $this->ID, $this );
     }
     
+    /**
+     * @return string
+     */
     public function get_email() {
         return apply_filters( 'wpinv_user_email', $this->email, $this->ID, $this );
     }
@@ -1525,10 +1543,16 @@ 
         return apply_filters( 'wpinv_currency_code', $this->currency, $this->ID, $this );
     }
     
+    /**
+     * @return string
+     */
     public function get_created_date() {
         return apply_filters( 'wpinv_created_date', $this->date, $this->ID, $this );
     }
     
+    /**
+     * @return string
+     */
     public function get_due_date( $display = false ) {
         $due_date = apply_filters( 'wpinv_due_date', $this->due_date, $this->ID, $this );
         
@@ -2081,6 +2105,9 @@ 
         return apply_filters( 'wpinv_invoice_get_subscription_name', $name, $this );
     }
         
+    /**
+     * @return string
+     */
     public function get_expiration() {
         $expiration = $this->get_meta( '_wpinv_subscr_expiration', true );
         return $expiration;
@@ -2096,6 +2123,9 @@ 
         return $cancelled_date;
     }
     
+    /**
+     * @return string
+     */
     public function get_trial_end_date( $formatted = true ) {
         if ( !$this->is_free_trial() || !$this->is_paid() ) {
             return NULL;
@@ -2117,6 +2147,9 @@ 
         return $trial_end_date;
     }
     
+    /**
+     * @return string
+     */
     public function get_subscription_created( $default = true ) {
         $created = $this->get_meta( '_wpinv_subscr_created', true );
         
@@ -2126,6 +2159,9 @@ 
         return $created;
     }
     
+    /**
+     * @return string
+     */
     public function get_subscription_start( $formatted = true ) {
         if ( !$this->is_paid() ) {
             return '-';

Spacing +794 added lines, -794 removed lines

@@ -7,12 +7,12 @@ 
  */
  
 // 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__));
 }
 
 final class WPInv_Invoice {
-    public $ID  = 0;
+    public $ID = 0;
     public $title;
     public $post_type;
     
@@ -65,17 +65,17 @@ 
     public $full_name = '';
     public $parent_invoice = 0;
     
-    public function __construct( $invoice_id = false ) {
-        if( empty( $invoice_id ) ) {
+    public function __construct($invoice_id = false) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $this->setup_invoice( $invoice_id );
+        $this->setup_invoice($invoice_id);
     }
 
-    public function get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            $value = call_user_func( array( $this, 'get_' . $key ) );
+    public function get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            $value = call_user_func(array($this, 'get_' . $key));
         } else {
             $value = $this->$key;
         }
@@ -83,51 +83,51 @@ 
         return $value;
     }
 
-    public function set( $key, $value ) {
-        $ignore = array( 'items', 'cart_details', 'fees', '_ID' );
+    public function set($key, $value) {
+        $ignore = array('items', 'cart_details', 'fees', '_ID');
 
-        if ( $key === 'status' ) {
+        if ($key === 'status') {
             $this->old_status = $this->status;
         }
 
-        if ( ! in_array( $key, $ignore ) ) {
-            $this->pending[ $key ] = $value;
+        if (!in_array($key, $ignore)) {
+            $this->pending[$key] = $value;
         }
 
-        if( '_ID' !== $key ) {
+        if ('_ID' !== $key) {
             $this->$key = $value;
         }
     }
 
-    public function _isset( $name ) {
-        if ( property_exists( $this, $name) ) {
-            return false === empty( $this->$name );
+    public function _isset($name) {
+        if (property_exists($this, $name)) {
+            return false === empty($this->$name);
         } else {
             return null;
         }
     }
 
-    private function setup_invoice( $invoice_id ) {
+    private function setup_invoice($invoice_id) {
         $this->pending = array();
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $invoice = get_post( $invoice_id );
+        $invoice = get_post($invoice_id);
 
-        if( !$invoice || is_wp_error( $invoice ) ) {
+        if (!$invoice || is_wp_error($invoice)) {
             return false;
         }
 
-        if( !('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type) ) {
+        if (!('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type)) {
             return false;
         }
 
-        do_action( 'wpinv_pre_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_pre_setup_invoice', $this, $invoice_id);
         
         // Primary Identifier
-        $this->ID              = absint( $invoice_id );
+        $this->ID              = absint($invoice_id);
         $this->post_type       = $invoice->post_type;
         
         // We have a payment, get the generic payment_meta item to reduce calls to it
@@ -139,7 +139,7 @@ 
         $this->post_status     = $this->status;
         $this->mode            = $this->setup_mode();
         $this->parent_invoice  = $invoice->post_parent;
-        $this->post_name       = $this->setup_post_name( $invoice );
+        $this->post_name       = $this->setup_post_name($invoice);
         $this->status_nicename = $this->setup_status_nicename($invoice->post_status);
 
         // Items
@@ -161,8 +161,8 @@ 
         
         // User based
         $this->ip              = $this->setup_ip();
-        $this->user_id         = !empty( $invoice->post_author ) ? $invoice->post_author : get_current_user_id();///$this->setup_user_id();
-        $this->email           = get_the_author_meta( 'email', $this->user_id );
+        $this->user_id         = !empty($invoice->post_author) ? $invoice->post_author : get_current_user_id(); ///$this->setup_user_id();
+        $this->email           = get_the_author_meta('email', $this->user_id);
         
         $this->user_info       = $this->setup_user_info();
                 
@@ -171,7 +171,7 @@ 
         $this->company         = $this->user_info['company'];
         $this->vat_number      = $this->user_info['vat_number'];
         $this->vat_rate        = $this->user_info['vat_rate'];
-        $this->adddress_confirmed  = $this->user_info['adddress_confirmed'];
+        $this->adddress_confirmed = $this->user_info['adddress_confirmed'];
         $this->address         = $this->user_info['address'];
         $this->city            = $this->user_info['city'];
         $this->country         = $this->user_info['country'];
@@ -186,35 +186,35 @@ 
         // Other Identifiers
         $this->key             = $this->setup_invoice_key();
         $this->number          = $this->setup_invoice_number();
-        $this->title           = !empty( $invoice->post_title ) ? $invoice->post_title : $this->number;
+        $this->title           = !empty($invoice->post_title) ? $invoice->post_title : $this->number;
         
-        $this->full_name       = trim( $this->first_name . ' '. $this->last_name );
+        $this->full_name       = trim($this->first_name . ' ' . $this->last_name);
         
         // Allow extensions to add items to this object via hook
-        do_action( 'wpinv_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_setup_invoice', $this, $invoice_id);
 
         return true;
     }
     
     private function setup_status_nicename($status) {
-        $all_invoice_statuses  = wpinv_get_invoice_statuses();
-        $status   = isset( $all_invoice_statuses[$status] ) ? $all_invoice_statuses[$status] : __( $status, 'invoicing' );
+        $all_invoice_statuses = wpinv_get_invoice_statuses();
+        $status = isset($all_invoice_statuses[$status]) ? $all_invoice_statuses[$status] : __($status, 'invoicing');
 
-        return apply_filters( 'setup_status_nicename', $status );
+        return apply_filters('setup_status_nicename', $status);
     }
     
-    private function setup_post_name( $post = NULL ) {
+    private function setup_post_name($post = NULL) {
         global $wpdb;
         
         $post_name = '';
         
-        if ( !empty( $post ) ) {
-            if( !empty( $post->post_name ) ) {
+        if (!empty($post)) {
+            if (!empty($post->post_name)) {
                 $post_name = $post->post_name;
-            } else if ( !empty( $post->ID ) ) {
+            } else if (!empty($post->ID)) {
                 $post_name = 'inv-' . $post->ID;
 
-                $wpdb->update( $wpdb->posts, array( 'post_name' => 'inv-' . $post->ID ), array( 'ID' => $post->ID ) );
+                $wpdb->update($wpdb->posts, array('post_name' => 'inv-' . $post->ID), array('ID' => $post->ID));
             }
         }
 
@@ -222,12 +222,12 @@ 
     }
     
     private function setup_due_date() {
-        $due_date = $this->get_meta( '_wpinv_due_date' );
+        $due_date = $this->get_meta('_wpinv_due_date');
         
-        if ( empty( $due_date ) ) {
-            $overdue_time = strtotime( $this->date ) + ( DAY_IN_SECONDS * absint( wpinv_get_option( 'overdue_days' ) ) );
-            $due_date = date_i18n( 'Y-m-d', $overdue_time );
-        } else if ( $due_date == 'none' ) {
+        if (empty($due_date)) {
+            $overdue_time = strtotime($this->date) + (DAY_IN_SECONDS * absint(wpinv_get_option('overdue_days')));
+            $due_date = date_i18n('Y-m-d', $overdue_time);
+        } else if ($due_date == 'none') {
             $due_date = '';
         }
         
@@ -235,63 +235,63 @@ 
     }
     
     private function setup_completed_date() {
-        $invoice = get_post( $this->ID );
+        $invoice = get_post($this->ID);
 
-        if ( 'wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status ) {
+        if ('wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status) {
             return false; // This invoice was never paid
         }
 
-        $date = ( $date = $this->get_meta( '_wpinv_completed_date', true ) ) ? $date : $invoice->modified_date;
+        $date = ($date = $this->get_meta('_wpinv_completed_date', true)) ? $date : $invoice->modified_date;
 
         return $date;
     }
     
     private function setup_cart_details() {
-        $cart_details = isset( $this->payment_meta['cart_details'] ) ? maybe_unserialize( $this->payment_meta['cart_details'] ) : array();
+        $cart_details = isset($this->payment_meta['cart_details']) ? maybe_unserialize($this->payment_meta['cart_details']) : array();
         return $cart_details;
     }
     
     public function array_convert() {
-        return get_object_vars( $this );
+        return get_object_vars($this);
     }
     
     private function setup_items() {
-        $items = isset( $this->payment_meta['items'] ) ? maybe_unserialize( $this->payment_meta['items'] ) : array();
+        $items = isset($this->payment_meta['items']) ? maybe_unserialize($this->payment_meta['items']) : array();
         return $items;
     }
     
     private function setup_fees() {
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
         return $payment_fees;
     }
         
     private function setup_currency() {
-        $currency = isset( $this->payment_meta['currency'] ) ? $this->payment_meta['currency'] : apply_filters( 'wpinv_currency_default', wpinv_get_currency(), $this );
+        $currency = isset($this->payment_meta['currency']) ? $this->payment_meta['currency'] : apply_filters('wpinv_currency_default', wpinv_get_currency(), $this);
         return $currency;
     }
     
     private function setup_discount() {
         //$discount = $this->get_meta( '_wpinv_discount', true );
-        $discount = (float)$this->subtotal - ( (float)$this->total - (float)$this->tax - (float)$this->fees_total );
-        if ( $discount < 0 ) {
+        $discount = (float)$this->subtotal - ((float)$this->total - (float)$this->tax - (float)$this->fees_total);
+        if ($discount < 0) {
             $discount = 0;
         }
-        $discount = wpinv_round_amount( $discount );
+        $discount = wpinv_round_amount($discount);
         
         return $discount;
     }
     
     private function setup_discount_code() {
-        $discount_code = !empty( $this->discounts ) ? $this->discounts : $this->get_meta( '_wpinv_discount_code', true );
+        $discount_code = !empty($this->discounts) ? $this->discounts : $this->get_meta('_wpinv_discount_code', true);
         return $discount_code;
     }
     
     private function setup_tax() {
-        $tax = $this->get_meta( '_wpinv_tax', true );
+        $tax = $this->get_meta('_wpinv_tax', true);
 
         // We don't have tax as it's own meta and no meta was passed
-        if ( '' === $tax ) {            
-            $tax = isset( $this->payment_meta['tax'] ) ? $this->payment_meta['tax'] : 0;
+        if ('' === $tax) {            
+            $tax = isset($this->payment_meta['tax']) ? $this->payment_meta['tax'] : 0;
         }
 
         return $tax;
@@ -301,9 +301,9 @@ 
         $subtotal     = 0;
         $cart_details = $this->cart_details;
 
-        if ( is_array( $cart_details ) ) {
-            foreach ( $cart_details as $item ) {
-                if ( isset( $item['subtotal'] ) ) {
+        if (is_array($cart_details)) {
+            foreach ($cart_details as $item) {
+                if (isset($item['subtotal'])) {
                     $subtotal += $item['subtotal'];
                 }
             }
@@ -317,23 +317,23 @@ 
     }
     
     private function setup_discounts() {
-        $discounts = ! empty( $this->payment_meta['user_info']['discount'] ) ? $this->payment_meta['user_info']['discount'] : array();
+        $discounts = !empty($this->payment_meta['user_info']['discount']) ? $this->payment_meta['user_info']['discount'] : array();
         return $discounts;
     }
     
     private function setup_total() {
-        $amount = $this->get_meta( '_wpinv_total', true );
+        $amount = $this->get_meta('_wpinv_total', true);
 
-        if ( empty( $amount ) && '0.00' != $amount ) {
-            $meta   = $this->get_meta( '_wpinv_payment_meta', true );
-            $meta   = maybe_unserialize( $meta );
+        if (empty($amount) && '0.00' != $amount) {
+            $meta   = $this->get_meta('_wpinv_payment_meta', true);
+            $meta   = maybe_unserialize($meta);
 
-            if ( isset( $meta['amount'] ) ) {
+            if (isset($meta['amount'])) {
                 $amount = $meta['amount'];
             }
         }
 
-        if($amount < 0){
+        if ($amount < 0) {
             $amount = 0;
         }
 
@@ -341,13 +341,13 @@ 
     }
     
     private function setup_mode() {
-        return $this->get_meta( '_wpinv_mode' );
+        return $this->get_meta('_wpinv_mode');
     }
 
     private function setup_gateway() {
-        $gateway = $this->get_meta( '_wpinv_gateway' );
+        $gateway = $this->get_meta('_wpinv_gateway');
         
-        if ( empty( $gateway ) && 'publish' === $this->status ) {
+        if (empty($gateway) && 'publish' === $this->status) {
             $gateway = 'manual';
         }
         
@@ -355,23 +355,23 @@ 
     }
     
     private function setup_gateway_title() {
-        $gateway_title = wpinv_get_gateway_checkout_label( $this->gateway );
+        $gateway_title = wpinv_get_gateway_checkout_label($this->gateway);
         return $gateway_title;
     }
 
     private function setup_transaction_id() {
-        $transaction_id = $this->get_meta( '_wpinv_transaction_id' );
+        $transaction_id = $this->get_meta('_wpinv_transaction_id');
 
-        if ( empty( $transaction_id ) || (int) $transaction_id === (int) $this->ID ) {
+        if (empty($transaction_id) || (int)$transaction_id === (int)$this->ID) {
             $gateway        = $this->gateway;
-            $transaction_id = apply_filters( 'wpinv_get_invoice_transaction_id-' . $gateway, $this->ID );
+            $transaction_id = apply_filters('wpinv_get_invoice_transaction_id-' . $gateway, $this->ID);
         }
 
         return $transaction_id;
     }
 
     private function setup_ip() {
-        $ip = $this->get_meta( '_wpinv_user_ip' );
+        $ip = $this->get_meta('_wpinv_user_ip');
         return $ip;
     }
 
@@ -381,62 +381,62 @@ 
     ///}
         
     private function setup_first_name() {
-        $first_name = $this->get_meta( '_wpinv_first_name' );
+        $first_name = $this->get_meta('_wpinv_first_name');
         return $first_name;
     }
     
     private function setup_last_name() {
-        $last_name = $this->get_meta( '_wpinv_last_name' );
+        $last_name = $this->get_meta('_wpinv_last_name');
         return $last_name;
     }
     
     private function setup_company() {
-        $company = $this->get_meta( '_wpinv_company' );
+        $company = $this->get_meta('_wpinv_company');
         return $company;
     }
     
     private function setup_vat_number() {
-        $vat_number = $this->get_meta( '_wpinv_vat_number' );
+        $vat_number = $this->get_meta('_wpinv_vat_number');
         return $vat_number;
     }
     
     private function setup_vat_rate() {
-        $vat_rate = $this->get_meta( '_wpinv_vat_rate' );
+        $vat_rate = $this->get_meta('_wpinv_vat_rate');
         return $vat_rate;
     }
     
     private function setup_adddress_confirmed() {
-        $adddress_confirmed = $this->get_meta( '_wpinv_adddress_confirmed' );
+        $adddress_confirmed = $this->get_meta('_wpinv_adddress_confirmed');
         return $adddress_confirmed;
     }
     
     private function setup_phone() {
-        $phone = $this->get_meta( '_wpinv_phone' );
+        $phone = $this->get_meta('_wpinv_phone');
         return $phone;
     }
     
     private function setup_address() {
-        $address = $this->get_meta( '_wpinv_address', true );
+        $address = $this->get_meta('_wpinv_address', true);
         return $address;
     }
     
     private function setup_city() {
-        $city = $this->get_meta( '_wpinv_city', true );
+        $city = $this->get_meta('_wpinv_city', true);
         return $city;
     }
     
     private function setup_country() {
-        $country = $this->get_meta( '_wpinv_country', true );
+        $country = $this->get_meta('_wpinv_country', true);
         return $country;
     }
     
     private function setup_state() {
-        $state = $this->get_meta( '_wpinv_state', true );
+        $state = $this->get_meta('_wpinv_state', true);
         return $state;
     }
     
     private function setup_zip() {
-        $zip = $this->get_meta( '_wpinv_zip', true );
+        $zip = $this->get_meta('_wpinv_zip', true);
         return $zip;
     }
 
@@ -445,7 +445,7 @@ 
             'user_id'        => $this->user_id,
             'first_name'     => $this->first_name,
             'last_name'      => $this->last_name,
-            'email'          => get_the_author_meta( 'email', $this->user_id ),
+            'email'          => get_the_author_meta('email', $this->user_id),
             'phone'          => $this->phone,
             'address'        => $this->address,
             'city'           => $this->city,
@@ -460,12 +460,12 @@ 
         );
         
         $user_info = array();
-        if ( isset( $this->payment_meta['user_info'] ) ) {
-            $user_info = maybe_unserialize( $this->payment_meta['user_info'] );
+        if (isset($this->payment_meta['user_info'])) {
+            $user_info = maybe_unserialize($this->payment_meta['user_info']);
             
-            if ( !empty( $user_info ) && isset( $user_info['user_id'] ) && $post = get_post( $this->ID ) ) {
+            if (!empty($user_info) && isset($user_info['user_id']) && $post = get_post($this->ID)) {
                 $this->user_id = $post->post_author;
-                $this->email = get_the_author_meta( 'email', $this->user_id );
+                $this->email = get_the_author_meta('email', $this->user_id);
                 
                 $user_info['user_id'] = $this->user_id;
                 $user_info['email'] = $this->email;
@@ -474,13 +474,13 @@ 
             }
         }
         
-        $user_info    = wp_parse_args( $user_info, $defaults );
+        $user_info = wp_parse_args($user_info, $defaults);
         
         // Get the user, but only if it's been created
-        $user = get_userdata( $this->user_id );
+        $user = get_userdata($this->user_id);
         
-        if ( !empty( $user ) && $user->ID > 0 ) {
-            if ( empty( $user_info ) ) {
+        if (!empty($user) && $user->ID > 0) {
+            if (empty($user_info)) {
                 $user_info = array(
                     'user_id'    => $user->ID,
                     'first_name' => $user->first_name,
@@ -489,23 +489,23 @@ 
                     'discount'   => '',
                 );
             } else {
-                foreach ( $user_info as $key => $value ) {
-                    if ( ! empty( $value ) ) {
+                foreach ($user_info as $key => $value) {
+                    if (!empty($value)) {
                         continue;
                     }
 
-                    switch( $key ) {
+                    switch ($key) {
                         case 'user_id':
-                            $user_info[ $key ] = $user->ID;
+                            $user_info[$key] = $user->ID;
                             break;
                         case 'first_name':
-                            $user_info[ $key ] = $user->first_name;
+                            $user_info[$key] = $user->first_name;
                             break;
                         case 'last_name':
-                            $user_info[ $key ] = $user->last_name;
+                            $user_info[$key] = $user->last_name;
                             break;
                         case 'email':
-                            $user_info[ $key ] = $user->user_email;
+                            $user_info[$key] = $user->user_email;
                             break;
                     }
                 }
@@ -516,25 +516,25 @@ 
     }
 
     private function setup_invoice_key() {
-        $key = $this->get_meta( '_wpinv_key', true );
+        $key = $this->get_meta('_wpinv_key', true);
         
         return $key;
     }
 
     private function setup_invoice_number() {
-        $number = $this->get_meta( '_wpinv_number', true );
+        $number = $this->get_meta('_wpinv_number', true);
 
-        if ( !$number ) {
+        if (!$number) {
             $number = $this->ID;
 
-            if ( $this->status == 'auto-draft' ) {
-                if ( wpinv_get_option( 'sequential_invoice_number' ) ) {
+            if ($this->status == 'auto-draft') {
+                if (wpinv_get_option('sequential_invoice_number')) {
                     $next_number = wpinv_get_next_invoice_number();
                     $number      = $next_number;
                 }
             }
             
-            $number = wpinv_format_invoice_number( $number );
+            $number = wpinv_format_invoice_number($number);
         }
 
         return $number;
@@ -544,16 +544,16 @@ 
         global $wpdb;
 
         $invoice_number = $this->ID;
-        if ( $number = $this->get_meta( '_wpinv_number', true ) ) {
+        if ($number = $this->get_meta('_wpinv_number', true)) {
             $invoice_number = $number;
         }
 
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
 
-        if ( empty( $this->ip ) ) {
+        if (empty($this->ip)) {
             $this->ip = wpinv_get_ip();
             $this->pending['ip'] = $this->ip;
         }
@@ -590,61 +590,61 @@ 
                         'post_status'   => $this->status,
                         'post_author'   => $this->user_id,
                         'post_type'     => $this->post_type,
-                        'post_date'     => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time( 'mysql' ),
-                        'post_date_gmt' => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date( $this->date ) : current_time( 'mysql', 1 ),
+                        'post_date'     => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time('mysql'),
+                        'post_date_gmt' => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date($this->date) : current_time('mysql', 1),
                         'post_parent'   => $this->parent_invoice,
                     );
-        $args = apply_filters( 'wpinv_insert_invoice_args', $post_data, $this );
+        $args = apply_filters('wpinv_insert_invoice_args', $post_data, $this);
 
         // Create a blank invoice
-        if ( !empty( $this->ID ) ) {
-            $args['ID']         = $this->ID;
+        if (!empty($this->ID)) {
+            $args['ID'] = $this->ID;
 
-            $invoice_id = wp_update_post( $args, true );
+            $invoice_id = wp_update_post($args, true);
         } else {
-            $invoice_id = wp_insert_post( $args, true );
+            $invoice_id = wp_insert_post($args, true);
         }
 
-        if ( is_wp_error( $invoice_id ) ) {
+        if (is_wp_error($invoice_id)) {
             return false;
         }
 
-        if ( !empty( $invoice_id ) ) {
+        if (!empty($invoice_id)) {
             $this->ID  = $invoice_id;
             $this->_ID = $invoice_id;
 
-            $this->payment_meta = apply_filters( 'wpinv_payment_meta', $this->payment_meta, $payment_data );
-            if ( ! empty( $this->payment_meta['fees'] ) ) {
-                $this->fees = array_merge( $this->fees, $this->payment_meta['fees'] );
-                foreach( $this->fees as $fee ) {
-                    $this->increase_fees( $fee['amount'] );
+            $this->payment_meta = apply_filters('wpinv_payment_meta', $this->payment_meta, $payment_data);
+            if (!empty($this->payment_meta['fees'])) {
+                $this->fees = array_merge($this->fees, $this->payment_meta['fees']);
+                foreach ($this->fees as $fee) {
+                    $this->increase_fees($fee['amount']);
                 }
             }
 
-            $this->update_meta( '_wpinv_payment_meta', $this->payment_meta );            
+            $this->update_meta('_wpinv_payment_meta', $this->payment_meta);            
             $this->new = true;
         }
 
         return $this->ID;
     }
 
-    public function save( $setup = false ) {
+    public function save($setup = false) {
         global $wpi_session;
         
         $saved = false;
-        if ( empty( $this->items ) ) {
+        if (empty($this->items)) {
             return $saved; // Don't save empty invoice.
         }
         
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
         
-        if ( empty( $this->ID ) ) {
+        if (empty($this->ID)) {
             $invoice_id = $this->insert_invoice();
 
-            if ( false === $invoice_id ) {
+            if (false === $invoice_id) {
                 $saved = false;
             } else {
                 $this->ID = $invoice_id;
@@ -652,27 +652,27 @@ 
         }
 
         // If we have something pending, let's save it
-        if ( !empty( $this->pending ) ) {
+        if (!empty($this->pending)) {
             $total_increase = 0;
             $total_decrease = 0;
 
-            foreach ( $this->pending as $key => $value ) {
-                switch( $key ) {
+            foreach ($this->pending as $key => $value) {
+                switch ($key) {
                     case 'items':
                         // Update totals for pending items
-                        foreach ( $this->pending[ $key ] as $item ) {
-                            switch( $item['action'] ) {
+                        foreach ($this->pending[$key] as $item) {
+                            switch ($item['action']) {
                                 case 'add':
                                     $price = $item['price'];
                                     $taxes = $item['tax'];
 
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_increase += $price;
                                     }
                                     break;
 
                                 case 'remove':
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_decrease += $item['price'];
                                     }
                                     break;
@@ -680,16 +680,16 @@ 
                         }
                         break;
                     case 'fees':
-                        if ( 'publish' !== $this->status ) {
+                        if ('publish' !== $this->status) {
                             break;
                         }
 
-                        if ( empty( $this->pending[ $key ] ) ) {
+                        if (empty($this->pending[$key])) {
                             break;
                         }
 
-                        foreach ( $this->pending[ $key ] as $fee ) {
-                            switch( $fee['action'] ) {
+                        foreach ($this->pending[$key] as $fee) {
+                            switch ($fee['action']) {
                                 case 'add':
                                     $total_increase += $fee['amount'];
                                     break;
@@ -701,83 +701,83 @@ 
                         }
                         break;
                     case 'status':
-                        $this->update_status( $this->status );
+                        $this->update_status($this->status);
                         break;
                     case 'gateway':
-                        $this->update_meta( '_wpinv_gateway', $this->gateway );
+                        $this->update_meta('_wpinv_gateway', $this->gateway);
                         break;
                     case 'mode':
-                        $this->update_meta( '_wpinv_mode', $this->mode );
+                        $this->update_meta('_wpinv_mode', $this->mode);
                         break;
                     case 'transaction_id':
-                        $this->update_meta( '_wpinv_transaction_id', $this->transaction_id );
+                        $this->update_meta('_wpinv_transaction_id', $this->transaction_id);
                         break;
                     case 'ip':
-                        $this->update_meta( '_wpinv_user_ip', $this->ip );
+                        $this->update_meta('_wpinv_user_ip', $this->ip);
                         break;
                     ///case 'user_id':
                         ///$this->update_meta( '_wpinv_user_id', $this->user_id );
                         ///$this->user_info['user_id'] = $this->user_id;
                         ///break;
                     case 'first_name':
-                        $this->update_meta( '_wpinv_first_name', $this->first_name );
+                        $this->update_meta('_wpinv_first_name', $this->first_name);
                         $this->user_info['first_name'] = $this->first_name;
                         break;
                     case 'last_name':
-                        $this->update_meta( '_wpinv_last_name', $this->last_name );
+                        $this->update_meta('_wpinv_last_name', $this->last_name);
                         $this->user_info['last_name'] = $this->last_name;
                         break;
                     case 'phone':
-                        $this->update_meta( '_wpinv_phone', $this->phone );
+                        $this->update_meta('_wpinv_phone', $this->phone);
                         $this->user_info['phone'] = $this->phone;
                         break;
                     case 'address':
-                        $this->update_meta( '_wpinv_address', $this->address );
+                        $this->update_meta('_wpinv_address', $this->address);
                         $this->user_info['address'] = $this->address;
                         break;
                     case 'city':
-                        $this->update_meta( '_wpinv_city', $this->city );
+                        $this->update_meta('_wpinv_city', $this->city);
                         $this->user_info['city'] = $this->city;
                         break;
                     case 'country':
-                        $this->update_meta( '_wpinv_country', $this->country );
+                        $this->update_meta('_wpinv_country', $this->country);
                         $this->user_info['country'] = $this->country;
                         break;
                     case 'state':
-                        $this->update_meta( '_wpinv_state', $this->state );
+                        $this->update_meta('_wpinv_state', $this->state);
                         $this->user_info['state'] = $this->state;
                         break;
                     case 'zip':
-                        $this->update_meta( '_wpinv_zip', $this->zip );
+                        $this->update_meta('_wpinv_zip', $this->zip);
                         $this->user_info['zip'] = $this->zip;
                         break;
                     case 'company':
-                        $this->update_meta( '_wpinv_company', $this->company );
+                        $this->update_meta('_wpinv_company', $this->company);
                         $this->user_info['company'] = $this->company;
                         break;
                     case 'vat_number':
-                        $this->update_meta( '_wpinv_vat_number', $this->vat_number );
+                        $this->update_meta('_wpinv_vat_number', $this->vat_number);
                         $this->user_info['vat_number'] = $this->vat_number;
                         
-                        $vat_info = $wpi_session->get( 'user_vat_data' );
-                        if ( $this->vat_number && !empty( $vat_info ) && isset( $vat_info['number'] ) && isset( $vat_info['valid'] ) && $vat_info['number'] == $this->vat_number ) {
-                            $adddress_confirmed = isset( $vat_info['adddress_confirmed'] ) ? $vat_info['adddress_confirmed'] : false;
-                            $this->update_meta( '_wpinv_adddress_confirmed', (bool)$adddress_confirmed );
+                        $vat_info = $wpi_session->get('user_vat_data');
+                        if ($this->vat_number && !empty($vat_info) && isset($vat_info['number']) && isset($vat_info['valid']) && $vat_info['number'] == $this->vat_number) {
+                            $adddress_confirmed = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+                            $this->update_meta('_wpinv_adddress_confirmed', (bool)$adddress_confirmed);
                             $this->user_info['adddress_confirmed'] = (bool)$adddress_confirmed;
                         }
     
                         break;
                     case 'vat_rate':
-                        $this->update_meta( '_wpinv_vat_rate', $this->vat_rate );
+                        $this->update_meta('_wpinv_vat_rate', $this->vat_rate);
                         $this->user_info['vat_rate'] = $this->vat_rate;
                         break;
                     case 'adddress_confirmed':
-                        $this->update_meta( '_wpinv_adddress_confirmed', $this->adddress_confirmed );
+                        $this->update_meta('_wpinv_adddress_confirmed', $this->adddress_confirmed);
                         $this->user_info['adddress_confirmed'] = $this->adddress_confirmed;
                         break;
                     
                     case 'key':
-                        $this->update_meta( '_wpinv_key', $this->key );
+                        $this->update_meta('_wpinv_key', $this->key);
                         break;
                     case 'date':
                         $args = array(
@@ -786,49 +786,49 @@ 
                             'edit_date' => true,
                         );
 
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     case 'due_date':
-                        if ( empty( $this->due_date ) ) {
+                        if (empty($this->due_date)) {
                             $this->due_date = 'none';
                         }
                         
-                        $this->update_meta( '_wpinv_due_date', $this->due_date );
+                        $this->update_meta('_wpinv_due_date', $this->due_date);
                         break;
                     case 'completed_date':
-                        $this->update_meta( '_wpinv_completed_date', $this->completed_date );
+                        $this->update_meta('_wpinv_completed_date', $this->completed_date);
                         break;
                     case 'discounts':
-                        if ( ! is_array( $this->discounts ) ) {
-                            $this->discounts = explode( ',', $this->discounts );
+                        if (!is_array($this->discounts)) {
+                            $this->discounts = explode(',', $this->discounts);
                         }
 
-                        $this->user_info['discount'] = implode( ',', $this->discounts );
+                        $this->user_info['discount'] = implode(',', $this->discounts);
                         break;
                     case 'discount':
-                        $this->update_meta( '_wpinv_discount', wpinv_round_amount( $this->discount ) );
+                        $this->update_meta('_wpinv_discount', wpinv_round_amount($this->discount));
                         break;
                     case 'discount_code':
-                        $this->update_meta( '_wpinv_discount_code', $this->discount_code );
+                        $this->update_meta('_wpinv_discount_code', $this->discount_code);
                         break;
                     case 'parent_invoice':
                         $args = array(
                             'ID'          => $this->ID,
                             'post_parent' => $this->parent_invoice,
                         );
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     default:
-                        do_action( 'wpinv_save', $this, $key );
+                        do_action('wpinv_save', $this, $key);
                         break;
                 }
             }
 
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
             
-            $this->items    = array_values( $this->items );
+            $this->items = array_values($this->items);
             
             $new_meta = array(
                 'items'         => $this->items,
@@ -839,12 +839,12 @@ 
             );
             
             $meta        = $this->get_meta();
-            $merged_meta = array_merge( $meta, $new_meta );
+            $merged_meta = array_merge($meta, $new_meta);
 
             // Only save the payment meta if it's changed
-            if ( md5( serialize( $meta ) ) !== md5( serialize( $merged_meta) ) ) {
-                $updated     = $this->update_meta( '_wpinv_payment_meta', $merged_meta );
-                if ( false !== $updated ) {
+            if (md5(serialize($meta)) !== md5(serialize($merged_meta))) {
+                $updated = $this->update_meta('_wpinv_payment_meta', $merged_meta);
+                if (false !== $updated) {
                     $saved = true;
                 }
             }
@@ -852,15 +852,15 @@ 
             $this->pending = array();
             $saved         = true;
         } else {
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
         }
         
-        do_action( 'wpinv_invoice_save', $this, $saved );
+        do_action('wpinv_invoice_save', $this, $saved);
 
-        if ( true === $saved || $setup ) {
-            $this->setup_invoice( $this->ID );
+        if (true === $saved || $setup) {
+            $this->setup_invoice($this->ID);
         }
         
         $this->refresh_item_ids();
@@ -868,7 +868,7 @@ 
         return $saved;
     }
     
-    public function add_fee( $args, $global = true ) {
+    public function add_fee($args, $global = true) {
         $default_args = array(
             'label'       => '',
             'amount'      => 0,
@@ -878,75 +878,75 @@ 
             'item_id'     => 0,
         );
 
-        $fee = wp_parse_args( $args, $default_args );
+        $fee = wp_parse_args($args, $default_args);
         
-        if ( !empty( $fee['label'] ) ) {
+        if (!empty($fee['label'])) {
             return false;
         }
         
-        $fee['id']  = sanitize_title( $fee['label'] );
+        $fee['id'] = sanitize_title($fee['label']);
         
-        $this->fees[]               = $fee;
+        $this->fees[] = $fee;
         
         $added_fee               = $fee;
         $added_fee['action']     = 'add';
         $this->pending['fees'][] = $added_fee;
-        reset( $this->fees );
+        reset($this->fees);
 
-        $this->increase_fees( $fee['amount'] );
+        $this->increase_fees($fee['amount']);
         return true;
     }
 
-    public function remove_fee( $key ) {
+    public function remove_fee($key) {
         $removed = false;
 
-        if ( is_numeric( $key ) ) {
-            $removed = $this->remove_fee_by( 'index', $key );
+        if (is_numeric($key)) {
+            $removed = $this->remove_fee_by('index', $key);
         }
 
         return $removed;
     }
 
-    public function remove_fee_by( $key, $value, $global = false ) {
-        $allowed_fee_keys = apply_filters( 'wpinv_fee_keys', array(
+    public function remove_fee_by($key, $value, $global = false) {
+        $allowed_fee_keys = apply_filters('wpinv_fee_keys', array(
             'index', 'label', 'amount', 'type',
-        ) );
+        ));
 
-        if ( ! in_array( $key, $allowed_fee_keys ) ) {
+        if (!in_array($key, $allowed_fee_keys)) {
             return false;
         }
 
         $removed = false;
-        if ( 'index' === $key && array_key_exists( $value, $this->fees ) ) {
-            $removed_fee             = $this->fees[ $value ];
+        if ('index' === $key && array_key_exists($value, $this->fees)) {
+            $removed_fee             = $this->fees[$value];
             $removed_fee['action']   = 'remove';
             $this->pending['fees'][] = $removed_fee;
 
-            $this->decrease_fees( $removed_fee['amount'] );
+            $this->decrease_fees($removed_fee['amount']);
 
-            unset( $this->fees[ $value ] );
+            unset($this->fees[$value]);
             $removed = true;
-        } else if ( 'index' !== $key ) {
-            foreach ( $this->fees as $index => $fee ) {
-                if ( isset( $fee[ $key ] ) && $fee[ $key ] == $value ) {
+        } else if ('index' !== $key) {
+            foreach ($this->fees as $index => $fee) {
+                if (isset($fee[$key]) && $fee[$key] == $value) {
                     $removed_fee             = $fee;
                     $removed_fee['action']   = 'remove';
                     $this->pending['fees'][] = $removed_fee;
 
-                    $this->decrease_fees( $removed_fee['amount'] );
+                    $this->decrease_fees($removed_fee['amount']);
 
-                    unset( $this->fees[ $index ] );
+                    unset($this->fees[$index]);
                     $removed = true;
 
-                    if ( false === $global ) {
+                    if (false === $global) {
                         break;
                     }
                 }
             }
         }
 
-        if ( true === $removed ) {
-            $this->fees = array_values( $this->fees );
+        if (true === $removed) {
+            $this->fees = array_values($this->fees);
         }
 
         return $removed;
@@ -954,35 +954,35 @@ 
 
     
 
-    public function add_note( $note = '', $customer_type = false, $added_by_user = false, $system = false ) {
+    public function add_note($note = '', $customer_type = false, $added_by_user = false, $system = false) {
         // Bail if no note specified
-        if( !$note ) {
+        if (!$note) {
             return false;
         }
 
-        if ( empty( $this->ID ) )
+        if (empty($this->ID))
             return false;
         
-        if ( ( ( is_user_logged_in() && current_user_can( 'manage_options' ) ) || $added_by_user ) && !$system ) {
-            $user                 = get_user_by( 'id', get_current_user_id() );
+        if (((is_user_logged_in() && current_user_can('manage_options')) || $added_by_user) && !$system) {
+            $user                 = get_user_by('id', get_current_user_id());
             $comment_author       = $user->display_name;
             $comment_author_email = $user->user_email;
         } else {
-            $comment_author       = __( 'System', 'invoicing' );
-            $comment_author_email = strtolower( __( 'System', 'invoicing' ) ) . '@';
-            $comment_author_email .= isset( $_SERVER['HTTP_HOST'] ) ? str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) : 'noreply.com';
-            $comment_author_email = sanitize_email( $comment_author_email );
+            $comment_author       = __('System', 'invoicing');
+            $comment_author_email = strtolower(__('System', 'invoicing')) . '@';
+            $comment_author_email .= isset($_SERVER['HTTP_HOST']) ? str_replace('www.', '', $_SERVER['HTTP_HOST']) : 'noreply.com';
+            $comment_author_email = sanitize_email($comment_author_email);
         }
 
-        do_action( 'wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type );
+        do_action('wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type);
 
-        $note_id = wp_insert_comment( wp_filter_comment( array(
+        $note_id = wp_insert_comment(wp_filter_comment(array(
             'comment_post_ID'      => $this->ID,
             'comment_content'      => $note,
             'comment_agent'        => 'GeoDirectory',
             'user_id'              => is_admin() ? get_current_user_id() : 0,
-            'comment_date'         => current_time( 'mysql' ),
-            'comment_date_gmt'     => current_time( 'mysql', 1 ),
+            'comment_date'         => current_time('mysql'),
+            'comment_date_gmt'     => current_time('mysql', 1),
             'comment_approved'     => 1,
             'comment_parent'       => 0,
             'comment_author'       => $comment_author,
@@ -990,53 +990,53 @@ 
             'comment_author_url'   => '',
             'comment_author_email' => $comment_author_email,
             'comment_type'         => 'wpinv_note'
-        ) ) );
+        )));
 
-        do_action( 'wpinv_insert_payment_note', $note_id, $this->ID, $note );
+        do_action('wpinv_insert_payment_note', $note_id, $this->ID, $note);
         
-        if ( $customer_type ) {
-            add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+        if ($customer_type) {
+            add_comment_meta($note_id, '_wpi_customer_note', 1);
 
-            do_action( 'wpinv_new_customer_note', array( 'invoice_id' => $this->ID, 'user_note' => $note ) );
+            do_action('wpinv_new_customer_note', array('invoice_id' => $this->ID, 'user_note' => $note));
         }
 
         return $note_id;
     }
 
-    private function increase_subtotal( $amount = 0.00 ) {
-        $amount          = (float) $amount;
+    private function increase_subtotal($amount = 0.00) {
+        $amount          = (float)$amount;
         $this->subtotal += $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
         $this->recalculate_total();
     }
 
-    private function decrease_subtotal( $amount = 0.00 ) {
-        $amount          = (float) $amount;
+    private function decrease_subtotal($amount = 0.00) {
+        $amount          = (float)$amount;
         $this->subtotal -= $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
-        if ( $this->subtotal < 0 ) {
+        if ($this->subtotal < 0) {
             $this->subtotal = 0;
         }
 
         $this->recalculate_total();
     }
 
-    private function increase_fees( $amount = 0.00 ) {
+    private function increase_fees($amount = 0.00) {
         $amount            = (float)$amount;
         $this->fees_total += $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
         $this->recalculate_total();
     }
 
-    private function decrease_fees( $amount = 0.00 ) {
-        $amount            = (float) $amount;
+    private function decrease_fees($amount = 0.00) {
+        $amount            = (float)$amount;
         $this->fees_total -= $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
-        if ( $this->fees_total < 0 ) {
+        if ($this->fees_total < 0) {
             $this->fees_total = 0;
         }
 
@@ -1047,54 +1047,54 @@ 
         global $wpi_nosave;
         
         $this->total = $this->subtotal + $this->tax + $this->fees_total;
-        $this->total = wpinv_round_amount( $this->total );
+        $this->total = wpinv_round_amount($this->total);
         
-        do_action( 'wpinv_invoice_recalculate_total', $this, $wpi_nosave );
+        do_action('wpinv_invoice_recalculate_total', $this, $wpi_nosave);
     }
     
-    public function increase_tax( $amount = 0.00 ) {
-        $amount       = (float) $amount;
+    public function increase_tax($amount = 0.00) {
+        $amount       = (float)$amount;
         $this->tax   += $amount;
 
         $this->recalculate_total();
     }
 
-    public function decrease_tax( $amount = 0.00 ) {
-        $amount     = (float) $amount;
+    public function decrease_tax($amount = 0.00) {
+        $amount     = (float)$amount;
         $this->tax -= $amount;
 
-        if ( $this->tax < 0 ) {
+        if ($this->tax < 0) {
             $this->tax = 0;
         }
 
         $this->recalculate_total();
     }
 
-    public function update_status( $new_status = false, $note = '', $manual = false ) {
-        $old_status = ! empty( $this->old_status ) ? $this->old_status : get_post_status( $this->ID );
+    public function update_status($new_status = false, $note = '', $manual = false) {
+        $old_status = !empty($this->old_status) ? $this->old_status : get_post_status($this->ID);
         
-        if ( $old_status === $new_status && in_array( $new_status, array_keys( wpinv_get_invoice_statuses() ) ) ) {
+        if ($old_status === $new_status && in_array($new_status, array_keys(wpinv_get_invoice_statuses()))) {
             return false; // Don't permit status changes that aren't changes
         }
 
-        $do_change = apply_filters( 'wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status );
+        $do_change = apply_filters('wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status);
         $updated = false;
 
-        if ( $do_change ) {
-            do_action( 'wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status );
+        if ($do_change) {
+            do_action('wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status);
 
             $update_post_data                   = array();
             $update_post_data['ID']             = $this->ID;
             $update_post_data['post_status']    = $new_status;
-            $update_post_data['edit_date']      = current_time( 'mysql', 0 );
-            $update_post_data['edit_date_gmt']  = current_time( 'mysql', 1 );
+            $update_post_data['edit_date']      = current_time('mysql', 0);
+            $update_post_data['edit_date_gmt']  = current_time('mysql', 1);
             
-            $update_post_data = apply_filters( 'wpinv_update_invoice_status_fields', $update_post_data, $this->ID );
+            $update_post_data = apply_filters('wpinv_update_invoice_status_fields', $update_post_data, $this->ID);
 
-            $updated = wp_update_post( $update_post_data );     
+            $updated = wp_update_post($update_post_data);     
            
             // Process any specific status functions
-            switch( $new_status ) {
+            switch ($new_status) {
                 case 'wpi-refunded':
                     $this->process_refund();
                     break;
@@ -1107,9 +1107,9 @@ 
             }
             
             // Status was changed.
-            do_action( 'wpinv_status_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_update_status', $this->ID, $new_status, $old_status );
+            do_action('wpinv_status_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_update_status', $this->ID, $new_status, $old_status);
         }
 
         return $updated;
@@ -1123,72 +1123,72 @@ 
         $this->save();
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
 
-        if ( $meta_key == 'key' || $meta_key == 'date' ) {
+        if ($meta_key == 'key' || $meta_key == 'date') {
             $current_meta = $this->get_meta();
-            $current_meta[ $meta_key ] = $meta_value;
+            $current_meta[$meta_key] = $meta_value;
 
             $meta_key     = '_wpinv_payment_meta';
             $meta_value   = $current_meta;
         }
 
-        $meta_value = apply_filters( 'wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID);
         
-        if ( $meta_key == '_wpinv_completed_date' && !empty( $meta_value ) ) {
+        if ($meta_key == '_wpinv_completed_date' && !empty($meta_value)) {
             $args = array(
                 'ID'                => $this->ID,
                 'post_date'         => $meta_value,
                 'edit_date'         => true,
-                'post_date_gmt'     => get_gmt_from_date( $meta_value ),
+                'post_date_gmt'     => get_gmt_from_date($meta_value),
                 'post_modified'     => $meta_value,
-                'post_modified_gmt' => get_gmt_from_date( $meta_value )
+                'post_modified_gmt' => get_gmt_from_date($meta_value)
             );
-            wp_update_post( $args );
+            wp_update_post($args);
         }
         
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
 
     private function process_refund() {
         $process_refund = true;
 
         // If the payment was not in publish, don't decrement stats as they were never incremented
-        if ( 'publish' != $this->old_status || 'wpi-refunded' != $this->status ) {
+        if ('publish' != $this->old_status || 'wpi-refunded' != $this->status) {
             $process_refund = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_refund = apply_filters( 'wpinv_should_process_refund', $process_refund, $this );
+        $process_refund = apply_filters('wpinv_should_process_refund', $process_refund, $this);
 
-        if ( false === $process_refund ) {
+        if (false === $process_refund) {
             return;
         }
 
-        do_action( 'wpinv_pre_refund_invoice', $this );
+        do_action('wpinv_pre_refund_invoice', $this);
         
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_refund', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_refund', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_refund', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_refund', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_refund', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_refund', true, $this);
         
-        do_action( 'wpinv_post_refund_invoice', $this );
+        do_action('wpinv_post_refund_invoice', $this);
     }
 
     private function process_failure() {
         $discounts = $this->discounts;
-        if ( empty( $discounts ) ) {
+        if (empty($discounts)) {
             return;
         }
 
-        if ( ! is_array( $discounts ) ) {
-            $discounts = array_map( 'trim', explode( ',', $discounts ) );
+        if (!is_array($discounts)) {
+            $discounts = array_map('trim', explode(',', $discounts));
         }
 
-        foreach ( $discounts as $discount ) {
-            wpinv_decrease_discount_usage( $discount );
+        foreach ($discounts as $discount) {
+            wpinv_decrease_discount_usage($discount);
         }
     }
     
@@ -1196,92 +1196,92 @@ 
         $process_pending = true;
 
         // If the payment was not in publish or revoked status, don't decrement stats as they were never incremented
-        if ( ( 'publish' != $this->old_status && 'revoked' != $this->old_status ) || 'wpi-pending' != $this->status ) {
+        if (('publish' != $this->old_status && 'revoked' != $this->old_status) || 'wpi-pending' != $this->status) {
             $process_pending = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_pending = apply_filters( 'wpinv_should_process_pending', $process_pending, $this );
+        $process_pending = apply_filters('wpinv_should_process_pending', $process_pending, $this);
 
-        if ( false === $process_pending ) {
+        if (false === $process_pending) {
             return;
         }
 
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_pending', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_pending', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_pending', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_pending', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_pending', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_pending', true, $this);
 
         $this->completed_date = '';
-        $this->update_meta( '_wpinv_completed_date', '' );
+        $this->update_meta('_wpinv_completed_date', '');
     }
     
     // get data
-    public function get_meta( $meta_key = '_wpinv_payment_meta', $single = true ) {
-        $meta = get_post_meta( $this->ID, $meta_key, $single );
+    public function get_meta($meta_key = '_wpinv_payment_meta', $single = true) {
+        $meta = get_post_meta($this->ID, $meta_key, $single);
 
-        if ( $meta_key === '_wpinv_payment_meta' ) {
+        if ($meta_key === '_wpinv_payment_meta') {
 
-            if(!is_array($meta)){$meta = array();} // we need this to be an array so make sure it is.
+            if (!is_array($meta)) {$meta = array(); } // we need this to be an array so make sure it is.
 
-            if ( empty( $meta['key'] ) ) {
+            if (empty($meta['key'])) {
                 $meta['key'] = $this->setup_invoice_key();
             }
 
-            if ( empty( $meta['date'] ) ) {
-                $meta['date'] = get_post_field( 'post_date', $this->ID );
+            if (empty($meta['date'])) {
+                $meta['date'] = get_post_field('post_date', $this->ID);
             }
         }
 
-        $meta = apply_filters( 'wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID );
+        $meta = apply_filters('wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID);
 
-        return apply_filters( 'wpinv_get_invoice_meta', $meta, $this->ID, $meta_key );
+        return apply_filters('wpinv_get_invoice_meta', $meta, $this->ID, $meta_key);
     }
     
     public function get_description() {
-        $post = get_post( $this->ID );
+        $post = get_post($this->ID);
         
-        $description = !empty( $post ) ? $post->post_content : '';
-        return apply_filters( 'wpinv_get_description', $description, $this->ID, $this );
+        $description = !empty($post) ? $post->post_content : '';
+        return apply_filters('wpinv_get_description', $description, $this->ID, $this);
     }
     
-    public function get_status( $nicename = false ) {
-        if ( !$nicename ) {
+    public function get_status($nicename = false) {
+        if (!$nicename) {
             $status = $this->status;
         } else {
             $status = $this->status_nicename;
         }
         
-        return apply_filters( 'wpinv_get_status', $status, $nicename, $this->ID, $this );
+        return apply_filters('wpinv_get_status', $status, $nicename, $this->ID, $this);
     }
     
     public function get_cart_details() {
-        return apply_filters( 'wpinv_cart_details', $this->cart_details, $this->ID, $this );
+        return apply_filters('wpinv_cart_details', $this->cart_details, $this->ID, $this);
     }
     
-    public function get_subtotal( $currency = false ) {
-        $subtotal = wpinv_round_amount( $this->subtotal );
+    public function get_subtotal($currency = false) {
+        $subtotal = wpinv_round_amount($this->subtotal);
         
-        if ( $currency ) {
-            $subtotal = wpinv_price( wpinv_format_amount( $subtotal, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $subtotal = wpinv_price(wpinv_format_amount($subtotal, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency);
     }
     
-    public function get_total( $currency = false ) {        
-        if ( $this->is_free_trial() ) {
-            $total = wpinv_round_amount( 0 );
+    public function get_total($currency = false) {        
+        if ($this->is_free_trial()) {
+            $total = wpinv_round_amount(0);
         } else {
-            $total = wpinv_round_amount( $this->total );
+            $total = wpinv_round_amount($this->total);
         }
-        if ( $currency ) {
-            $total = wpinv_price( wpinv_format_amount( $total, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $total = wpinv_price(wpinv_format_amount($total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_total', $total, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_total', $total, $this->ID, $this, $currency);
     }
     
-    public function get_recurring_details( $field = '', $currency = false ) {        
+    public function get_recurring_details($field = '', $currency = false) {        
         $data                 = array();
         $data['cart_details'] = $this->cart_details;
         $data['subtotal']     = $this->get_subtotal();
@@ -1289,45 +1289,45 @@ 
         $data['tax']          = $this->get_tax();
         $data['total']        = $this->get_total();
     
-        if ( !empty( $this->cart_details ) && ( $this->is_parent() || $this->is_renewal() ) ) {
+        if (!empty($this->cart_details) && ($this->is_parent() || $this->is_renewal())) {
             $is_free_trial = $this->is_free_trial();
-            $discounts = $this->get_discounts( true );
+            $discounts = $this->get_discounts(true);
             
-            if ( $is_free_trial || !empty( $discounts ) ) {
+            if ($is_free_trial || !empty($discounts)) {
                 $first_use_only = false;
                 
-                if ( !empty( $discounts ) ) {
-                    foreach ( $discounts as $key => $code ) {
-                        if ( wpinv_discount_is_recurring( $code, true ) ) {
+                if (!empty($discounts)) {
+                    foreach ($discounts as $key => $code) {
+                        if (wpinv_discount_is_recurring($code, true)) {
                             $first_use_only = true;
                             break;
                         }
                     }
                 }
                     
-                if ( !$first_use_only ) {
-                    $data['subtotal'] = wpinv_round_amount( $this->subtotal );
-                    $data['discount'] = wpinv_round_amount( $this->discount );
-                    $data['tax']      = wpinv_round_amount( $this->tax );
-                    $data['total']    = wpinv_round_amount( $this->total );
+                if (!$first_use_only) {
+                    $data['subtotal'] = wpinv_round_amount($this->subtotal);
+                    $data['discount'] = wpinv_round_amount($this->discount);
+                    $data['tax']      = wpinv_round_amount($this->tax);
+                    $data['total']    = wpinv_round_amount($this->total);
                 } else {
                     $cart_subtotal   = 0;
                     $cart_discount   = 0;
                     $cart_tax        = 0;
 
-                    foreach ( $this->cart_details as $key => $item ) {
-                        $item_quantity  = $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                        $item_subtotal  = !empty( $item['subtotal'] ) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
+                    foreach ($this->cart_details as $key => $item) {
+                        $item_quantity  = $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                        $item_subtotal  = !empty($item['subtotal']) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
                         $item_discount  = 0;
-                        $item_tax       = $item_subtotal > 0 && !empty( $item['vat_rate'] ) ? ( $item_subtotal * 0.01 * (float)$item['vat_rate'] ) : 0;
+                        $item_tax       = $item_subtotal > 0 && !empty($item['vat_rate']) ? ($item_subtotal * 0.01 * (float)$item['vat_rate']) : 0;
                         
-                        if ( wpinv_prices_include_tax() ) {
-                            $item_subtotal -= wpinv_round_amount( $item_tax );
+                        if (wpinv_prices_include_tax()) {
+                            $item_subtotal -= wpinv_round_amount($item_tax);
                         }
                         
                         $item_total     = $item_subtotal - $item_discount + $item_tax;
                         // Do not allow totals to go negative
-                        if ( $item_total < 0 ) {
+                        if ($item_total < 0) {
                             $item_total = 0;
                         }
                         
@@ -1335,113 +1335,113 @@ 
                         $cart_discount  += (float)($item_discount);
                         $cart_tax       += (float)($item_tax);
                         
-                        $data['cart_details'][$key]['discount']   = wpinv_round_amount( $item_discount );
-                        $data['cart_details'][$key]['tax']        = wpinv_round_amount( $item_tax );
-                        $data['cart_details'][$key]['price']      = wpinv_round_amount( $item_total );
+                        $data['cart_details'][$key]['discount']   = wpinv_round_amount($item_discount);
+                        $data['cart_details'][$key]['tax']        = wpinv_round_amount($item_tax);
+                        $data['cart_details'][$key]['price']      = wpinv_round_amount($item_total);
                     }
                     
-                    $data['subtotal'] = wpinv_round_amount( $cart_subtotal );
-                    $data['discount'] = wpinv_round_amount( $cart_discount );
-                    $data['tax']      = wpinv_round_amount( $cart_tax );
-                    $data['total']    = wpinv_round_amount( $data['subtotal'] + $data['tax'] );
+                    $data['subtotal'] = wpinv_round_amount($cart_subtotal);
+                    $data['discount'] = wpinv_round_amount($cart_discount);
+                    $data['tax']      = wpinv_round_amount($cart_tax);
+                    $data['total']    = wpinv_round_amount($data['subtotal'] + $data['tax']);
                 }
             }
         }
         
-        $data = apply_filters( 'wpinv_get_invoice_recurring_details', $data, $this, $field, $currency );
+        $data = apply_filters('wpinv_get_invoice_recurring_details', $data, $this, $field, $currency);
 
-        if ( isset( $data[$field] ) ) {
-            return ( $currency ? wpinv_price( $data[$field], $this->get_currency() ) : $data[$field] );
+        if (isset($data[$field])) {
+            return ($currency ? wpinv_price($data[$field], $this->get_currency()) : $data[$field]);
         }
         
         return $data;
     }
     
-    public function get_final_tax( $currency = false ) {        
-        $final_total = wpinv_round_amount( $this->tax );
-        if ( $currency ) {
-            $final_total = wpinv_price( wpinv_format_amount( $final_total, NULL, !$currency ), $this->get_currency() );
+    public function get_final_tax($currency = false) {        
+        $final_total = wpinv_round_amount($this->tax);
+        if ($currency) {
+            $final_total = wpinv_price(wpinv_format_amount($final_total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_final_total', $final_total, $this, $currency );
+        return apply_filters('wpinv_get_invoice_final_total', $final_total, $this, $currency);
     }
     
-    public function get_discounts( $array = false ) {
+    public function get_discounts($array = false) {
         $discounts = $this->discounts;
-        if ( $array && $discounts ) {
-            $discounts = explode( ',', $discounts );
+        if ($array && $discounts) {
+            $discounts = explode(',', $discounts);
         }
-        return apply_filters( 'wpinv_payment_discounts', $discounts, $this->ID, $this, $array );
+        return apply_filters('wpinv_payment_discounts', $discounts, $this->ID, $this, $array);
     }
     
-    public function get_discount( $currency = false, $dash = false ) {
-        if ( !empty( $this->discounts ) ) {
+    public function get_discount($currency = false, $dash = false) {
+        if (!empty($this->discounts)) {
             global $ajax_cart_details;
             $ajax_cart_details = $this->get_cart_details();
             
-            if ( !empty( $ajax_cart_details ) && count( $ajax_cart_details ) == count( $this->items ) ) {
+            if (!empty($ajax_cart_details) && count($ajax_cart_details) == count($this->items)) {
                 $cart_items = $ajax_cart_details;
             } else {
                 $cart_items = $this->items;
             }
 
-            $this->discount = wpinv_get_cart_items_discount_amount( $cart_items , $this->discounts );
+            $this->discount = wpinv_get_cart_items_discount_amount($cart_items, $this->discounts);
         }
-        $discount   = wpinv_round_amount( $this->discount );
+        $discount   = wpinv_round_amount($this->discount);
         $dash       = $dash && $discount > 0 ? '&ndash;' : '';
         
-        if ( $currency ) {
-            $discount = wpinv_price( wpinv_format_amount( $discount, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $discount = wpinv_price(wpinv_format_amount($discount, NULL, !$currency), $this->get_currency());
         }
         
-        $discount   = $dash . $discount;
+        $discount = $dash . $discount;
         
-        return apply_filters( 'wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash );
+        return apply_filters('wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash);
     }
     
     public function get_discount_code() {
         return $this->discount_code;
     }
     
-    public function get_tax( $currency = false ) {
-        $tax = wpinv_round_amount( $this->tax );
+    public function get_tax($currency = false) {
+        $tax = wpinv_round_amount($this->tax);
         
-        if ( $currency ) {
-            $tax = wpinv_price( wpinv_format_amount( $tax, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $tax = wpinv_price(wpinv_format_amount($tax, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency);
     }
     
-    public function get_fees( $type = 'all' ) {
-        $fees    = array();
+    public function get_fees($type = 'all') {
+        $fees = array();
 
-        if ( ! empty( $this->fees ) && is_array( $this->fees ) ) {
-            foreach ( $this->fees as $fee ) {
-                if( 'all' != $type && ! empty( $fee['type'] ) && $type != $fee['type'] ) {
+        if (!empty($this->fees) && is_array($this->fees)) {
+            foreach ($this->fees as $fee) {
+                if ('all' != $type && !empty($fee['type']) && $type != $fee['type']) {
                     continue;
                 }
 
-                $fee['label'] = stripslashes( $fee['label'] );
-                $fee['amount_display'] = wpinv_price( $fee['amount'], $this->get_currency() );
-                $fees[]    = $fee;
+                $fee['label'] = stripslashes($fee['label']);
+                $fee['amount_display'] = wpinv_price($fee['amount'], $this->get_currency());
+                $fees[] = $fee;
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees', $fees, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees', $fees, $this->ID, $this);
     }
     
-    public function get_fees_total( $type = 'all' ) {
-        $fees_total = (float) 0.00;
+    public function get_fees_total($type = 'all') {
+        $fees_total = (float)0.00;
 
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
-        if ( ! empty( $payment_fees ) ) {
-            foreach ( $payment_fees as $fee ) {
-                $fees_total += (float) $fee['amount'];
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
+        if (!empty($payment_fees)) {
+            foreach ($payment_fees as $fee) {
+                $fees_total += (float)$fee['amount'];
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this);
         /*
         $fees = $this->get_fees( $type );
 
@@ -1461,116 +1461,116 @@ 
     }
 
     public function get_user_id() {
-        return apply_filters( 'wpinv_user_id', $this->user_id, $this->ID, $this );
+        return apply_filters('wpinv_user_id', $this->user_id, $this->ID, $this);
     }
     
     public function get_first_name() {
-        return apply_filters( 'wpinv_first_name', $this->first_name, $this->ID, $this );
+        return apply_filters('wpinv_first_name', $this->first_name, $this->ID, $this);
     }
     
     public function get_last_name() {
-        return apply_filters( 'wpinv_last_name', $this->last_name, $this->ID, $this );
+        return apply_filters('wpinv_last_name', $this->last_name, $this->ID, $this);
     }
     
     public function get_user_full_name() {
-        return apply_filters( 'wpinv_user_full_name', $this->full_name, $this->ID, $this );
+        return apply_filters('wpinv_user_full_name', $this->full_name, $this->ID, $this);
     }
     
     public function get_user_info() {
-        return apply_filters( 'wpinv_user_info', $this->user_info, $this->ID, $this );
+        return apply_filters('wpinv_user_info', $this->user_info, $this->ID, $this);
     }
     
     public function get_email() {
-        return apply_filters( 'wpinv_user_email', $this->email, $this->ID, $this );
+        return apply_filters('wpinv_user_email', $this->email, $this->ID, $this);
     }
     
     public function get_address() {
-        return apply_filters( 'wpinv_address', $this->address, $this->ID, $this );
+        return apply_filters('wpinv_address', $this->address, $this->ID, $this);
     }
     
     public function get_phone() {
-        return apply_filters( 'wpinv_phone', $this->phone, $this->ID, $this );
+        return apply_filters('wpinv_phone', $this->phone, $this->ID, $this);
     }
     
     public function get_number() {
-        return apply_filters( 'wpinv_number', $this->number, $this->ID, $this );
+        return apply_filters('wpinv_number', $this->number, $this->ID, $this);
     }
     
     public function get_items() {
-        return apply_filters( 'wpinv_payment_meta_items', $this->items, $this->ID, $this );
+        return apply_filters('wpinv_payment_meta_items', $this->items, $this->ID, $this);
     }
     
     public function get_key() {
-        return apply_filters( 'wpinv_key', $this->key, $this->ID, $this );
+        return apply_filters('wpinv_key', $this->key, $this->ID, $this);
     }
     
     public function get_transaction_id() {
-        return apply_filters( 'wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this);
     }
     
     public function get_gateway() {
-        return apply_filters( 'wpinv_gateway', $this->gateway, $this->ID, $this );
+        return apply_filters('wpinv_gateway', $this->gateway, $this->ID, $this);
     }
     
     public function get_gateway_title() {
-        $this->gateway_title = !empty( $this->gateway_title ) ? $this->gateway_title : wpinv_get_gateway_checkout_label( $this->gateway );
+        $this->gateway_title = !empty($this->gateway_title) ? $this->gateway_title : wpinv_get_gateway_checkout_label($this->gateway);
         
-        return apply_filters( 'wpinv_gateway_title', $this->gateway_title, $this->ID, $this );
+        return apply_filters('wpinv_gateway_title', $this->gateway_title, $this->ID, $this);
     }
     
     public function get_currency() {
-        return apply_filters( 'wpinv_currency_code', $this->currency, $this->ID, $this );
+        return apply_filters('wpinv_currency_code', $this->currency, $this->ID, $this);
     }
     
     public function get_created_date() {
-        return apply_filters( 'wpinv_created_date', $this->date, $this->ID, $this );
+        return apply_filters('wpinv_created_date', $this->date, $this->ID, $this);
     }
     
-    public function get_due_date( $display = false ) {
-        $due_date = apply_filters( 'wpinv_due_date', $this->due_date, $this->ID, $this );
+    public function get_due_date($display = false) {
+        $due_date = apply_filters('wpinv_due_date', $this->due_date, $this->ID, $this);
         
-        if ( !$display || empty( $due_date ) ) {
+        if (!$display || empty($due_date)) {
             return $due_date;
         }
         
-        return date_i18n( get_option( 'date_format' ), strtotime( $due_date ) );
+        return date_i18n(get_option('date_format'), strtotime($due_date));
     }
     
     public function get_completed_date() {
-        return apply_filters( 'wpinv_completed_date', $this->completed_date, $this->ID, $this );
+        return apply_filters('wpinv_completed_date', $this->completed_date, $this->ID, $this);
     }
     
-    public function get_invoice_date( $formatted = true ) {
+    public function get_invoice_date($formatted = true) {
         $date_completed = $this->completed_date;
         $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? $date_completed : '';
         
-        if ( $invoice_date == '' ) {
+        if ($invoice_date == '') {
             $date_created   = $this->date;
             $invoice_date   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? $date_created : '';
         }
         
-        if ( $formatted && $invoice_date ) {
-            $invoice_date   = date_i18n( get_option( 'date_format' ), strtotime( $invoice_date ) );
+        if ($formatted && $invoice_date) {
+            $invoice_date = date_i18n(get_option('date_format'), strtotime($invoice_date));
         }
 
-        return apply_filters( 'wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this);
     }
     
     public function get_ip() {
-        return apply_filters( 'wpinv_user_ip', $this->ip, $this->ID, $this );
+        return apply_filters('wpinv_user_ip', $this->ip, $this->ID, $this);
     }
         
-    public function has_status( $status ) {
-        return apply_filters( 'wpinv_has_status', ( is_array( $status ) && in_array( $this->get_status(), $status ) ) || $this->get_status() === $status ? true : false, $this, $status );
+    public function has_status($status) {
+        return apply_filters('wpinv_has_status', (is_array($status) && in_array($this->get_status(), $status)) || $this->get_status() === $status ? true : false, $this, $status);
     }
     
-    public function add_item( $item_id = 0, $args = array() ) {
+    public function add_item($item_id = 0, $args = array()) {
         global $wpi_current_id, $wpi_item_id;
         
-        $item = new WPInv_Item( $item_id );
+        $item = new WPInv_Item($item_id);
 
         // Bail if this post isn't a item
-        if( !$item || $item->post_type !== 'wpi_item' ) {
+        if (!$item || $item->post_type !== 'wpi_item') {
             return false;
         }
         
@@ -1589,8 +1589,8 @@ 
             'fees'          => array()
         );
 
-        $args = wp_parse_args( apply_filters( 'wpinv_add_item_args', $args, $item->ID ), $defaults );
-        $args['quantity']   = $has_quantities && $args['quantity'] > 0 ? absint( $args['quantity'] ) : 1;
+        $args = wp_parse_args(apply_filters('wpinv_add_item_args', $args, $item->ID), $defaults);
+        $args['quantity'] = $has_quantities && $args['quantity'] > 0 ? absint($args['quantity']) : 1;
 
         $wpi_current_id         = $this->ID;
         $wpi_item_id            = $item->ID;
@@ -1602,19 +1602,19 @@ 
         $found_cart_key         = false;
         
         if ($has_quantities) {
-            $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+            $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
             
-            foreach ( $this->items as $key => $cart_item ) {
-                if ( (int)$item_id !== (int)$cart_item['id'] ) {
+            foreach ($this->items as $key => $cart_item) {
+                if ((int)$item_id !== (int)$cart_item['id']) {
                     continue;
                 }
 
-                $this->items[ $key ]['quantity'] += $args['quantity'];
+                $this->items[$key]['quantity'] += $args['quantity'];
                 break;
             }
             
-            foreach ( $this->cart_details as $cart_key => $cart_item ) {
-                if ( $item_id != $cart_item['id'] ) {
+            foreach ($this->cart_details as $cart_key => $cart_item) {
+                if ($item_id != $cart_item['id']) {
                     continue;
                 }
 
@@ -1626,29 +1626,29 @@ 
         if ($has_quantities && $found_cart_key !== false) {
             $cart_item          = $this->cart_details[$found_cart_key];
             $item_price         = $cart_item['item_price'];
-            $quantity           = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $quantity           = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
             $new_quantity       = $quantity + $args['quantity'];
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
             
             $discount_increased = $discount > 0 && $subtotal > 0 && $discount > (float)$cart_item['discount'] ? $discount - (float)$cart_item['discount'] : 0;
             $tax_increased      = $tax > 0 && $subtotal > 0 && $tax > (float)$cart_item['tax'] ? $tax - (float)$cart_item['tax'] : 0;
             // The total increase equals the number removed * the item_price
-            $total_increased    = wpinv_round_amount( $item_price );
+            $total_increased    = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1664,25 +1664,25 @@ 
             $this->cart_details[$found_cart_key] = $cart_item;
         } else {
             // Set custom price.
-            if ( $args['custom_price'] !== '' ) {
+            if ($args['custom_price'] !== '') {
                 $item_price = $args['custom_price'];
             } else {
                 // Allow overriding the price
-                if ( false !== $args['item_price'] ) {
+                if (false !== $args['item_price']) {
                     $item_price = $args['item_price'];
                 } else {
-                    $item_price = wpinv_get_item_price( $item->ID );
+                    $item_price = wpinv_get_item_price($item->ID);
                 }
             }
 
             // Sanitizing the price here so we don't have a dozen calls later
-            $item_price = wpinv_sanitize_amount( $item_price );
-            $subtotal   = wpinv_round_amount( $item_price * $args['quantity'] );
+            $item_price = wpinv_sanitize_amount($item_price);
+            $subtotal   = wpinv_round_amount($item_price * $args['quantity']);
         
-            $discount   = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax_class  = !empty( $args['vat_class'] ) ? $args['vat_class'] : '';
-            $tax_rate   = !empty( $args['vat_rate'] ) ? $args['vat_rate'] : 0;
-            $tax        = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount   = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax_class  = !empty($args['vat_class']) ? $args['vat_class'] : '';
+            $tax_rate   = !empty($args['vat_rate']) ? $args['vat_rate'] : 0;
+            $tax        = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
 
             // Setup the items meta item
             $new_item = array(
@@ -1690,29 +1690,29 @@ 
                 'quantity' => $args['quantity'],
             );
 
-            $this->items[]  = $new_item;
+            $this->items[] = $new_item;
 
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total      = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
         
             $this->cart_details[] = array(
                 'name'          => !empty($args['name']) ? $args['name'] : $item->get_name(),
                 'id'            => $item->ID,
-                'item_price'    => wpinv_round_amount( $item_price ),
-                'custom_price'  => ( $args['custom_price'] !== '' ? wpinv_round_amount( $args['custom_price'] ) : '' ),
+                'item_price'    => wpinv_round_amount($item_price),
+                'custom_price'  => ($args['custom_price'] !== '' ? wpinv_round_amount($args['custom_price']) : ''),
                 'quantity'      => $args['quantity'],
                 'discount'      => $discount,
-                'subtotal'      => wpinv_round_amount( $subtotal ),
-                'tax'           => wpinv_round_amount( $tax ),
-                'price'         => wpinv_round_amount( $total ),
+                'subtotal'      => wpinv_round_amount($subtotal),
+                'tax'           => wpinv_round_amount($tax),
+                'price'         => wpinv_round_amount($total),
                 'vat_rate'      => $tax_rate,
                 'vat_class'     => $tax_class,
                 'meta'          => $args['meta'],
@@ -1722,18 +1722,18 @@ 
             $subtotal = $subtotal - $discount;
         }
         
-        $added_item = end( $this->cart_details );
-        $added_item['action']  = 'add';
+        $added_item = end($this->cart_details);
+        $added_item['action'] = 'add';
         
         $this->pending['items'][] = $added_item;
         
-        $this->increase_subtotal( $subtotal );
-        $this->increase_tax( $tax );
+        $this->increase_subtotal($subtotal);
+        $this->increase_tax($tax);
 
         return true;
     }
     
-    public function remove_item( $item_id, $args = array() ) {
+    public function remove_item($item_id, $args = array()) {
         // Set some defaults
         $defaults = array(
             'quantity'      => 1,
@@ -1741,51 +1741,51 @@ 
             'custom_price'  => '',
             'cart_index'    => false,
         );
-        $args = wp_parse_args( $args, $defaults );
+        $args = wp_parse_args($args, $defaults);
 
         // Bail if this post isn't a item
-        if ( get_post_type( $item_id ) !== 'wpi_item' ) {
+        if (get_post_type($item_id) !== 'wpi_item') {
             return false;
         }
         
-        $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+        $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
 
-        foreach ( $this->items as $key => $item ) {
-            if ( !empty($item['id']) && (int)$item_id !== (int)$item['id'] ) {
+        foreach ($this->items as $key => $item) {
+            if (!empty($item['id']) && (int)$item_id !== (int)$item['id']) {
                 continue;
             }
 
-            if ( false !== $args['cart_index'] ) {
-                $cart_index = absint( $args['cart_index'] );
-                $cart_item  = ! empty( $this->cart_details[ $cart_index ] ) ? $this->cart_details[ $cart_index ] : false;
+            if (false !== $args['cart_index']) {
+                $cart_index = absint($args['cart_index']);
+                $cart_item  = !empty($this->cart_details[$cart_index]) ? $this->cart_details[$cart_index] : false;
 
-                if ( ! empty( $cart_item ) ) {
+                if (!empty($cart_item)) {
                     // If the cart index item isn't the same item ID, don't remove it
-                    if ( !empty($cart_item['id']) && $cart_item['id'] != $item['id'] ) {
+                    if (!empty($cart_item['id']) && $cart_item['id'] != $item['id']) {
                         continue;
                     }
                 }
             }
 
-            $item_quantity = $this->items[ $key ]['quantity'];
-            if ( $item_quantity > $args['quantity'] ) {
-                $this->items[ $key ]['quantity'] -= $args['quantity'];
+            $item_quantity = $this->items[$key]['quantity'];
+            if ($item_quantity > $args['quantity']) {
+                $this->items[$key]['quantity'] -= $args['quantity'];
                 break;
             } else {
-                unset( $this->items[ $key ] );
+                unset($this->items[$key]);
                 break;
             }
         }
 
         $found_cart_key = false;
-        if ( false === $args['cart_index'] ) {
-            foreach ( $this->cart_details as $cart_key => $item ) {
-                if ( $item_id != $item['id'] ) {
+        if (false === $args['cart_index']) {
+            foreach ($this->cart_details as $cart_key => $item) {
+                if ($item_id != $item['id']) {
                     continue;
                 }
 
-                if ( false !== $args['item_price'] ) {
-                    if ( isset( $item['item_price'] ) && (float) $args['item_price'] != (float) $item['item_price'] ) {
+                if (false !== $args['item_price']) {
+                    if (isset($item['item_price']) && (float)$args['item_price'] != (float)$item['item_price']) {
                         continue;
                     }
                 }
@@ -1794,13 +1794,13 @@ 
                 break;
             }
         } else {
-            $cart_index = absint( $args['cart_index'] );
+            $cart_index = absint($args['cart_index']);
 
-            if ( ! array_key_exists( $cart_index, $this->cart_details ) ) {
+            if (!array_key_exists($cart_index, $this->cart_details)) {
                 return false; // Invalid cart index passed.
             }
 
-            if ( (int) $this->cart_details[ $cart_index ]['id'] > 0 && (int) $this->cart_details[ $cart_index ]['id'] !== (int) $item_id ) {
+            if ((int)$this->cart_details[$cart_index]['id'] > 0 && (int)$this->cart_details[$cart_index]['id'] !== (int)$item_id) {
                 return false; // We still need the proper Item ID to be sure.
             }
 
@@ -1808,41 +1808,41 @@ 
         }
         
         $cart_item  = $this->cart_details[$found_cart_key];
-        $quantity   = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
+        $quantity   = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
         
-        if ( count( $this->cart_details ) == 1 && ( $quantity - $args['quantity'] ) < 1 ) {
+        if (count($this->cart_details) == 1 && ($quantity - $args['quantity']) < 1) {
             return false; // Invoice must contain at least one item.
         }
         
-        $discounts  = $this->get_discounts();
+        $discounts = $this->get_discounts();
         
-        if ( $quantity > $args['quantity'] ) {
+        if ($quantity > $args['quantity']) {
             $item_price         = $cart_item['item_price'];
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
-            $new_quantity       = max( $quantity - $args['quantity'], 1);
+            $new_quantity       = max($quantity - $args['quantity'], 1);
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
             
-            $discount_decrease  = (float)$cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['discount'] / $quantity ) ) : 0;
+            $discount_decrease  = (float)$cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount(((float)$cart_item['discount'] / $quantity)) : 0;
             $discount_decrease  = $discount > 0 && $subtotal > 0 && (float)$cart_item['discount'] > $discount ? (float)$cart_item['discount'] - $discount : $discount_decrease; 
-            $tax_decrease       = (float)$cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['tax'] / $quantity ) ) : 0;
+            $tax_decrease       = (float)$cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount(((float)$cart_item['tax'] / $quantity)) : 0;
             $tax_decrease       = $tax > 0 && $subtotal > 0 && (float)$cart_item['tax'] > $tax ? (float)$cart_item['tax'] - $tax : $tax_decrease;
             
             // The total increase equals the number removed * the item_price
-            $total_decrease     = wpinv_round_amount( $item_price );
+            $total_decrease     = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1861,16 +1861,16 @@ 
             
             $this->cart_details[$found_cart_key] = $cart_item;
             
-            $remove_item = end( $this->cart_details );
+            $remove_item = end($this->cart_details);
         } else {
             $item_price     = $cart_item['item_price'];
-            $discount       = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax            = !empty( $cart_item['tax'] ) ? $cart_item['tax'] : 0;
+            $discount       = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax            = !empty($cart_item['tax']) ? $cart_item['tax'] : 0;
         
-            $subtotal_decrease  = ( $item_price * $quantity ) - $discount;
+            $subtotal_decrease  = ($item_price * $quantity) - $discount;
             $tax_decrease       = $tax;
 
-            unset( $this->cart_details[$found_cart_key] );
+            unset($this->cart_details[$found_cart_key]);
             
             $remove_item             = $args;
             $remove_item['id']       = $item_id;
@@ -1881,8 +1881,8 @@ 
         $remove_item['action']      = 'remove';
         $this->pending['items'][]   = $remove_item;
                
-        $this->decrease_subtotal( $subtotal_decrease );
-        $this->decrease_tax( $tax_decrease );
+        $this->decrease_subtotal($subtotal_decrease);
+        $this->decrease_tax($tax_decrease);
         
         return true;
     }
@@ -1890,7 +1890,7 @@ 
     public function update_items($temp = false) {
         global $wpinv_euvat, $wpi_current_id, $wpi_item_id, $wpi_nosave;
         
-        if ( !empty( $this->cart_details ) ) {
+        if (!empty($this->cart_details)) {
             $wpi_nosave             = $temp;
             $cart_subtotal          = 0;
             $cart_discount          = 0;
@@ -1900,42 +1900,42 @@ 
             $_POST['wpinv_country'] = $this->country;
             $_POST['wpinv_state']   = $this->state;
             
-            foreach ( $this->cart_details as $key => $item ) {
+            foreach ($this->cart_details as $key => $item) {
                 $item_price = $item['item_price'];
-                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                $amount     = wpinv_round_amount( $item_price * $quantity );
+                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                $amount     = wpinv_round_amount($item_price * $quantity);
                 $subtotal   = $item_price * $quantity;
                 
                 $wpi_current_id         = $this->ID;
                 $wpi_item_id            = $item['id'];
                 
-                $discount   = wpinv_get_cart_item_discount_amount( $item, $this->get_discounts() );
+                $discount   = wpinv_get_cart_item_discount_amount($item, $this->get_discounts());
                 
-                $tax_rate   = wpinv_get_tax_rate( $this->country, $this->state, $wpi_item_id );
-                $tax_class  = $wpinv_euvat->get_item_class( $wpi_item_id );
-                $tax        = $item_price > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+                $tax_rate   = wpinv_get_tax_rate($this->country, $this->state, $wpi_item_id);
+                $tax_class  = $wpinv_euvat->get_item_class($wpi_item_id);
+                $tax        = $item_price > 0 ? (($subtotal - $discount) * 0.01 * (float)$tax_rate) : 0;
 
-                if ( wpinv_prices_include_tax() ) {
-                    $subtotal -= wpinv_round_amount( $tax );
+                if (wpinv_prices_include_tax()) {
+                    $subtotal -= wpinv_round_amount($tax);
                 }
 
-                $total      = $subtotal - $discount + $tax;
+                $total = $subtotal - $discount + $tax;
 
                 // Do not allow totals to go negative
-                if( $total < 0 ) {
+                if ($total < 0) {
                     $total = 0;
                 }
 
                 $cart_details[] = array(
                     'id'          => $item['id'],
                     'name'        => $item['name'],
-                    'item_price'  => wpinv_round_amount( $item_price ),
-                    'custom_price'=> ( isset( $item['custom_price'] ) ? $item['custom_price'] : '' ),
+                    'item_price'  => wpinv_round_amount($item_price),
+                    'custom_price'=> (isset($item['custom_price']) ? $item['custom_price'] : ''),
                     'quantity'    => $quantity,
                     'discount'    => $discount,
-                    'subtotal'    => wpinv_round_amount( $subtotal ),
-                    'tax'         => wpinv_round_amount( $tax ),
-                    'price'       => wpinv_round_amount( $total ),
+                    'subtotal'    => wpinv_round_amount($subtotal),
+                    'tax'         => wpinv_round_amount($tax),
+                    'price'       => wpinv_round_amount($total),
                     'vat_rate'    => $tax_rate,
                     'vat_class'   => $tax_class,
                     'meta'        => isset($item['meta']) ? $item['meta'] : array(),
@@ -1946,9 +1946,9 @@ 
                 $cart_discount  += (float)($discount);
                 $cart_tax       += (float)($tax);
             }
-            $this->subtotal = wpinv_round_amount( $cart_subtotal );
-            $this->tax      = wpinv_round_amount( $cart_tax );
-            $this->discount = wpinv_round_amount( $cart_discount );
+            $this->subtotal = wpinv_round_amount($cart_subtotal);
+            $this->tax      = wpinv_round_amount($cart_tax);
+            $this->discount = wpinv_round_amount($cart_discount);
             
             $this->recalculate_total();
             
@@ -1960,221 +1960,221 @@ 
     
     public function recalculate_totals($temp = false) {        
         $this->update_items($temp);
-        $this->save( true );
+        $this->save(true);
         
         return $this;
     }
     
     public function needs_payment() {
-        $valid_invoice_statuses = apply_filters( 'wpinv_valid_invoice_statuses_for_payment', array( 'wpi-pending' ), $this );
+        $valid_invoice_statuses = apply_filters('wpinv_valid_invoice_statuses_for_payment', array('wpi-pending'), $this);
 
-        if ( $this->has_status( $valid_invoice_statuses ) && ( $this->get_total() > 0 || $this->is_free_trial() || $this->is_free() ) ) {
+        if ($this->has_status($valid_invoice_statuses) && ($this->get_total() > 0 || $this->is_free_trial() || $this->is_free())) {
             $needs_payment = true;
         } else {
             $needs_payment = false;
         }
 
-        return apply_filters( 'wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses );
+        return apply_filters('wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses);
     }
     
-    public function get_checkout_payment_url( $with_key = false, $secret = false ) {
+    public function get_checkout_payment_url($with_key = false, $secret = false) {
         $pay_url = wpinv_get_checkout_uri();
 
-        if ( is_ssl() ) {
-            $pay_url = str_replace( 'http:', 'https:', $pay_url );
+        if (is_ssl()) {
+            $pay_url = str_replace('http:', 'https:', $pay_url);
         }
         
         $key = $this->get_key();
 
-        if ( $with_key ) {
-            $pay_url = add_query_arg( 'invoice_key', $key, $pay_url );
+        if ($with_key) {
+            $pay_url = add_query_arg('invoice_key', $key, $pay_url);
         } else {
-            $pay_url = add_query_arg( array( 'wpi_action' => 'pay_for_invoice', 'invoice_key' => $key ), $pay_url );
+            $pay_url = add_query_arg(array('wpi_action' => 'pay_for_invoice', 'invoice_key' => $key), $pay_url);
         }
         
-        if ( $secret ) {
-            $pay_url = add_query_arg( array( '_wpipay' => md5( $this->get_user_id() . '::' . $this->get_email() . '::' . $key ) ), $pay_url );
+        if ($secret) {
+            $pay_url = add_query_arg(array('_wpipay' => md5($this->get_user_id() . '::' . $this->get_email() . '::' . $key)), $pay_url);
         }
 
-        return apply_filters( 'wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret );
+        return apply_filters('wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret);
     }
     
-    public function get_view_url( $with_key = false ) {
-        $invoice_url = get_permalink( $this->ID );
+    public function get_view_url($with_key = false) {
+        $invoice_url = get_permalink($this->ID);
 
-        if ( $with_key ) {
-            $invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
+        if ($with_key) {
+            $invoice_url = add_query_arg('invoice_key', $this->get_key(), $invoice_url);
         }
 
-        return apply_filters( 'wpinv_get_view_url', $invoice_url, $this, $with_key );
+        return apply_filters('wpinv_get_view_url', $invoice_url, $this, $with_key);
     }
     
-    public function generate_key( $string = '' ) {
-        $auth_key  = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-        return strtolower( md5( $string . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'wpinv', true ) ) );  // Unique key
+    public function generate_key($string = '') {
+        $auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+        return strtolower(md5($string . date('Y-m-d H:i:s') . $auth_key . uniqid('wpinv', true))); // Unique key
     }
     
     public function is_recurring() {
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return false;
         }
         
         $has_subscription = false;
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $has_subscription = true;
                 break;
             }
         }
         
-        if ( count( $this->cart_details ) > 1 ) {
+        if (count($this->cart_details) > 1) {
             $has_subscription = false;
         }
 
-        return apply_filters( 'wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details );
+        return apply_filters('wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details);
     }
     
     public function is_free_trial() {
         $is_free_trial = false;
         
-        if ( $this->is_parent() && $item = $this->get_recurring( true ) ) {
-            if ( !empty( $item ) && $item->has_free_trial() ) {
+        if ($this->is_parent() && $item = $this->get_recurring(true)) {
+            if (!empty($item) && $item->has_free_trial()) {
                 $is_free_trial = true;
             }
         }
 
-        return apply_filters( 'wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details );
+        return apply_filters('wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details);
     }
     
-    public function get_recurring( $object = false ) {
+    public function get_recurring($object = false) {
         $item = NULL;
         
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return $item;
         }
         
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $item = $cart_item['id'];
                 break;
             }
         }
         
-        if ( $object ) {
-            $item = $item ? new WPInv_Item( $item ) : NULL;
+        if ($object) {
+            $item = $item ? new WPInv_Item($item) : NULL;
             
-            apply_filters( 'wpinv_invoice_get_recurring_item', $item, $this );
+            apply_filters('wpinv_invoice_get_recurring_item', $item, $this);
         }
 
-        return apply_filters( 'wpinv_invoice_get_recurring_item_id', $item, $this );
+        return apply_filters('wpinv_invoice_get_recurring_item_id', $item, $this);
     }
     
     public function get_subscription_name() {
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return NULL;
         }
         
-        if ( !($name = $item->get_name()) ) {
+        if (!($name = $item->get_name())) {
             $name = $item->post_name;
         }
 
-        return apply_filters( 'wpinv_invoice_get_subscription_name', $name, $this );
+        return apply_filters('wpinv_invoice_get_subscription_name', $name, $this);
     }
         
     public function get_expiration() {
-        $expiration = $this->get_meta( '_wpinv_subscr_expiration', true );
+        $expiration = $this->get_meta('_wpinv_subscr_expiration', true);
         return $expiration;
     }
     
-    public function get_cancelled_date( $formatted = true ) {
-        $cancelled_date = $this->get_subscription_status() == 'cancelled' ? $this->get_meta( '_wpinv_subscr_cancelled_on', true ) : '';
+    public function get_cancelled_date($formatted = true) {
+        $cancelled_date = $this->get_subscription_status() == 'cancelled' ? $this->get_meta('_wpinv_subscr_cancelled_on', true) : '';
         
-        if ( $formatted && $cancelled_date ) {
-            $cancelled_date = date_i18n( get_option( 'date_format' ), strtotime( $cancelled_date ) );
+        if ($formatted && $cancelled_date) {
+            $cancelled_date = date_i18n(get_option('date_format'), strtotime($cancelled_date));
         }
         
         return $cancelled_date;
     }
     
-    public function get_trial_end_date( $formatted = true ) {
-        if ( !$this->is_free_trial() || !$this->is_paid() ) {
+    public function get_trial_end_date($formatted = true) {
+        if (!$this->is_free_trial() || !$this->is_paid()) {
             return NULL;
         }
         
-        $trial_end_date = $this->get_subscription_status() == 'trialing' ? $this->get_meta( '_wpinv_subscr_trial_end', true ) : '';
+        $trial_end_date = $this->get_subscription_status() == 'trialing' ? $this->get_meta('_wpinv_subscr_trial_end', true) : '';
         
-        if ( empty( $trial_end_date ) ) {
-            $trial_start_time = strtotime( $this->get_subscription_start() );
-            $trial_start_time += ( wpinv_period_in_days( $this->get_subscription_trial_interval(), $this->get_subscription_trial_period() ) * DAY_IN_SECONDS ) ;
+        if (empty($trial_end_date)) {
+            $trial_start_time = strtotime($this->get_subscription_start());
+            $trial_start_time += (wpinv_period_in_days($this->get_subscription_trial_interval(), $this->get_subscription_trial_period()) * DAY_IN_SECONDS);
             
-            $trial_end_date = date_i18n( 'Y-m-d H:i:s', $trial_start_time );
+            $trial_end_date = date_i18n('Y-m-d H:i:s', $trial_start_time);
         }
         
-        if ( $formatted && $trial_end_date ) {
-            $trial_end_date = date_i18n( get_option( 'date_format' ), strtotime( $trial_end_date ) );
+        if ($formatted && $trial_end_date) {
+            $trial_end_date = date_i18n(get_option('date_format'), strtotime($trial_end_date));
         }
         
         return $trial_end_date;
     }
     
-    public function get_subscription_created( $default = true ) {
-        $created = $this->get_meta( '_wpinv_subscr_created', true );
+    public function get_subscription_created($default = true) {
+        $created = $this->get_meta('_wpinv_subscr_created', true);
         
-        if ( empty( $created ) && $default ) {
+        if (empty($created) && $default) {
             $created = $this->date;
         }
         return $created;
     }
     
-    public function get_subscription_start( $formatted = true ) {
-        if ( !$this->is_paid() ) {
+    public function get_subscription_start($formatted = true) {
+        if (!$this->is_paid()) {
             return '-';
         }
-        $start   = $this->get_subscription_created();
+        $start = $this->get_subscription_created();
         
-        if ( $formatted ) {
-            $date = date_i18n( get_option( 'date_format' ), strtotime( $start ) );
+        if ($formatted) {
+            $date = date_i18n(get_option('date_format'), strtotime($start));
         } else {
-            $date = date_i18n( 'Y-m-d H:i:s', strtotime( $start ) );
+            $date = date_i18n('Y-m-d H:i:s', strtotime($start));
         }
 
         return $date;
     }
     
-    public function get_subscription_end( $formatted = true ) {
-        if ( !$this->is_paid() ) {
+    public function get_subscription_end($formatted = true) {
+        if (!$this->is_paid()) {
             return '-';
         }
         $start          = $this->get_subscription_created();
         $interval       = $this->get_subscription_interval();
-        $period         = $this->get_subscription_period( true );
+        $period         = $this->get_subscription_period(true);
         $bill_times     = (int)$this->get_bill_times();
         
-        if ( $bill_times == 0 ) {
-            return $formatted ? __( 'Until cancelled', 'invoicing' ) : $bill_times;
+        if ($bill_times == 0) {
+            return $formatted ? __('Until cancelled', 'invoicing') : $bill_times;
         }
         
-        $total_period = $start . '+' . ( $interval * $bill_times ) . ' ' . $period;
+        $total_period = $start . '+' . ($interval * $bill_times) . ' ' . $period;
         
-        $end_time = strtotime( $start . '+' . ( $interval * $bill_times ) . ' ' . $period );
+        $end_time = strtotime($start . '+' . ($interval * $bill_times) . ' ' . $period);
         
-        if ( $this->is_free_trial() ) {
-            $end_time += ( wpinv_period_in_days( $this->get_subscription_trial_interval(), $this->get_subscription_trial_period() ) * DAY_IN_SECONDS ) ;
+        if ($this->is_free_trial()) {
+            $end_time += (wpinv_period_in_days($this->get_subscription_trial_interval(), $this->get_subscription_trial_period()) * DAY_IN_SECONDS);
         }
         
-        if ( $formatted ) {
-            $date = date_i18n( get_option( 'date_format' ), $end_time );
+        if ($formatted) {
+            $date = date_i18n(get_option('date_format'), $end_time);
         } else {
-            $date = date_i18n( 'Y-m-d H:i:s', $end_time );
+            $date = date_i18n('Y-m-d H:i:s', $end_time);
         }
 
         return $date;
     }
     
     public function get_expiration_time() {
-        return strtotime( $this->get_expiration(), current_time( 'timestamp' ) );
+        return strtotime($this->get_expiration(), current_time('timestamp'));
     }
     
     public function get_original_invoice_id() {        
@@ -2186,125 +2186,125 @@ 
         return $subscription_data['bill_times'];
     }
 
-    public function get_child_payments( $self = false ) {
-        $invoices = get_posts( array(
+    public function get_child_payments($self = false) {
+        $invoices = get_posts(array(
             'post_type'         => $this->post_type,
             'post_parent'       => (int)$this->ID,
             'posts_per_page'    => '999',
-            'post_status'       => array( 'publish', 'wpi-processing', 'wpi-renewal' ),
+            'post_status'       => array('publish', 'wpi-processing', 'wpi-renewal'),
             'orderby'           => 'ID',
             'order'             => 'DESC',
             'fields'            => 'ids'
-        ) );
+        ));
         
-        if ( $this->is_free_trial() ) {
+        if ($this->is_free_trial()) {
             $self = false;
         }
         
-        if ( $self && $this->is_paid() ) {
-            if ( !empty( $invoices ) ) {
+        if ($self && $this->is_paid()) {
+            if (!empty($invoices)) {
                 $invoices[] = (int)$this->ID;
             } else {
-                $invoices = array( $this->ID );
+                $invoices = array($this->ID);
             }
             
-            $invoices = array_unique( $invoices );
+            $invoices = array_unique($invoices);
         }
 
         return $invoices;
     }
 
-    public function get_total_payments( $self = true ) {
-        return count( $this->get_child_payments( $self ) );
+    public function get_total_payments($self = true) {
+        return count($this->get_child_payments($self));
     }
     
-    public function get_subscriptions( $limit = -1 ) {
-        $subscriptions = wpinv_get_subscriptions( array( 'parent_invoice_id' => $this->ID, 'numberposts' => $limit ) );
+    public function get_subscriptions($limit = -1) {
+        $subscriptions = wpinv_get_subscriptions(array('parent_invoice_id' => $this->ID, 'numberposts' => $limit));
 
         return $subscriptions;
     }
     
     public function get_subscription_id() {
-        $subscription_id = $this->get_meta( '_wpinv_subscr_profile_id', true );
+        $subscription_id = $this->get_meta('_wpinv_subscr_profile_id', true);
         
-        if ( empty( $subscription_id ) && !empty( $this->parent_invoice ) ) {
-            $parent_invoice = wpinv_get_invoice( $this->parent_invoice );
+        if (empty($subscription_id) && !empty($this->parent_invoice)) {
+            $parent_invoice = wpinv_get_invoice($this->parent_invoice);
             
-            $subscription_id = $parent_invoice->get_meta( '_wpinv_subscr_profile_id', true );
+            $subscription_id = $parent_invoice->get_meta('_wpinv_subscr_profile_id', true);
         }
         
         return $subscription_id;
     }
     
     public function get_subscription_status() {
-        $subscription_status = $this->get_meta( '_wpinv_subscr_status', true );
+        $subscription_status = $this->get_meta('_wpinv_subscr_status', true);
 
-        if ( empty( $subscription_status ) ) {
+        if (empty($subscription_status)) {
             $status = 'pending';
             
-            if ( $this->is_paid() ) {        
+            if ($this->is_paid()) {        
                 $bill_times   = (int)$this->get_bill_times();
                 $times_billed = (int)$this->get_total_payments();
-                $expiration = $this->get_subscription_end( false );
-                $expired = $bill_times != 0 && $expiration != '' && $expiration != '-' && strtotime( date_i18n( 'Y-m-d', strtotime( $expiration ) ) ) < strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) ) ? true : false;
+                $expiration = $this->get_subscription_end(false);
+                $expired = $bill_times != 0 && $expiration != '' && $expiration != '-' && strtotime(date_i18n('Y-m-d', strtotime($expiration))) < strtotime(date_i18n('Y-m-d', current_time('timestamp'))) ? true : false;
                 
-                if ( (int)$bill_times == 0 ) {
+                if ((int)$bill_times == 0) {
                     $status = $expired ? 'expired' : 'active';
-                } else if ( $bill_times > 0 && $times_billed >= $bill_times ) {
+                } else if ($bill_times > 0 && $times_billed >= $bill_times) {
                     $status = 'completed';
-                } else if ( $expired ) {
+                } else if ($expired) {
                     $status = 'expired';
-                } else if ( $bill_times > 0 ) {
+                } else if ($bill_times > 0) {
                     $status = 'active';
                 } else {
                     $status = 'pending';
                 }
             }
             
-            if ( $status && $status != $subscription_status ) {
+            if ($status && $status != $subscription_status) {
                 $subscription_status = $status;
                 
-                $this->update_meta( '_wpinv_subscr_status', $status );
+                $this->update_meta('_wpinv_subscr_status', $status);
             }
         }
         
         return $subscription_status;
     }
     
-    public function get_subscription_status_label( $status = '' ) {
-        $status = !empty( $status ) ? $status : $this->get_subscription_status();
+    public function get_subscription_status_label($status = '') {
+        $status = !empty($status) ? $status : $this->get_subscription_status();
 
-        switch( $status ) {
+        switch ($status) {
             case 'active' :
-                $status_label = __( 'Active', 'invoicing' );
+                $status_label = __('Active', 'invoicing');
                 break;
 
             case 'cancelled' :
-                $status_label = __( 'Cancelled', 'invoicing' );
+                $status_label = __('Cancelled', 'invoicing');
                 break;
                 
             case 'completed' :
-                $status_label = __( 'Completed', 'invoicing' );
+                $status_label = __('Completed', 'invoicing');
                 break;
 
             case 'expired' :
-                $status_label = __( 'Expired', 'invoicing' );
+                $status_label = __('Expired', 'invoicing');
                 break;
 
             case 'pending' :
-                $status_label = __( 'Pending', 'invoicing' );
+                $status_label = __('Pending', 'invoicing');
                 break;
 
             case 'failing' :
-                $status_label = __( 'Failing', 'invoicing' );
+                $status_label = __('Failing', 'invoicing');
                 break;
                 
             case 'stopped' :
-                $status_label = __( 'Stopped', 'invoicing' );
+                $status_label = __('Stopped', 'invoicing');
                 break;
                 
             case 'trialing' :
-                $status_label = __( 'Trialing', 'invoicing' );
+                $status_label = __('Trialing', 'invoicing');
                 break;
 
             default:
@@ -2315,26 +2315,26 @@ 
         return $status_label;
     }
     
-    public function get_subscription_period( $full = false ) {
-        $period = $this->get_meta( '_wpinv_subscr_period', true );
+    public function get_subscription_period($full = false) {
+        $period = $this->get_meta('_wpinv_subscr_period', true);
         
         // Fix period for old invoices
-        if ( $period == 'day' ) {
+        if ($period == 'day') {
             $period = 'D';
-        } else if ( $period == 'week' ) {
+        } else if ($period == 'week') {
             $period = 'W';
-        } else if ( $period == 'month' ) {
+        } else if ($period == 'month') {
             $period = 'M';
-        } else if ( $period == 'year' ) {
+        } else if ($period == 'year') {
             $period = 'Y';
         }
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -2354,39 +2354,39 @@ 
     }
     
     public function get_subscription_interval() {
-        $interval = (int)$this->get_meta( '_wpinv_subscr_interval', true );
+        $interval = (int)$this->get_meta('_wpinv_subscr_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
         
         return $interval;
     }
     
-    public function get_subscription_trial_period( $full = false ) {
-        if ( !$this->is_free_trial() ) {
+    public function get_subscription_trial_period($full = false) {
+        if (!$this->is_free_trial()) {
             return '';
         }
         
-        $period = $this->get_meta( '_wpinv_subscr_trial_period', true );
+        $period = $this->get_meta('_wpinv_subscr_trial_period', true);
         
         // Fix period for old invoices
-        if ( $period == 'day' ) {
+        if ($period == 'day') {
             $period = 'D';
-        } else if ( $period == 'week' ) {
+        } else if ($period == 'week') {
             $period = 'W';
-        } else if ( $period == 'month' ) {
+        } else if ($period == 'month') {
             $period = 'M';
-        } else if ( $period == 'year' ) {
+        } else if ($period == 'year') {
             $period = 'Y';
         }
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -2406,13 +2406,13 @@ 
     }
     
     public function get_subscription_trial_interval() {
-        if ( !$this->is_free_trial() ) {
+        if (!$this->is_free_trial()) {
             return 0;
         }
         
-        $interval = (int)$this->get_meta( '_wpinv_subscr_trial_interval', true );
+        $interval = (int)$this->get_meta('_wpinv_subscr_trial_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
         
@@ -2424,8 +2424,8 @@ 
             'status' => 'failing'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_failing', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_failing', $this->ID, $this);
             return true;
         }
 
@@ -2437,8 +2437,8 @@ 
             'status' => 'stopped'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_stopped', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_stopped', $this->ID, $this);
             return true;
         }
 
@@ -2450,8 +2450,8 @@ 
             'status' => 'active'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_restarted', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_restarted', $this->ID, $this);
             return true;
         }
 
@@ -2463,23 +2463,23 @@ 
             'status' => 'cancelled'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            if ( is_user_logged_in() ) {
-                $userdata = get_userdata( get_current_user_id() );
+        if ($this->update_subscription($args)) {
+            if (is_user_logged_in()) {
+                $userdata = get_userdata(get_current_user_id());
                 $user     = $userdata->user_login;
             } else {
-                $user = __( 'gateway', 'invoicing' );
+                $user = __('gateway', 'invoicing');
             }
             
             $subscription_id = $this->get_subscription_id();
-            if ( !$subscription_id ) {
+            if (!$subscription_id) {
                 $subscription_id = $this->ID;
             }
 
-            $note = sprintf( __( 'Subscription %s has been cancelled by %s', 'invoicing' ), $subscription_id, $user );
-            $this->add_note( $note );
+            $note = sprintf(__('Subscription %s has been cancelled by %s', 'invoicing'), $subscription_id, $user);
+            $this->add_note($note);
 
-            do_action( 'wpinv_subscription_cancelled', $this->ID, $this );
+            do_action('wpinv_subscription_cancelled', $this->ID, $this);
             return true;
         }
 
@@ -2487,11 +2487,11 @@ 
     }
 
     public function can_cancel() {
-        return apply_filters( 'wpinv_subscription_can_cancel', false, $this );
+        return apply_filters('wpinv_subscription_can_cancel', false, $this);
     }
     
-    public function add_subscription( $data = array() ) {
-        if ( empty( $this->ID ) ) {
+    public function add_subscription($data = array()) {
+        if (empty($this->ID)) {
             return false;
         }
 
@@ -2510,85 +2510,85 @@ 
             'profile_id'        => '',
         );
 
-        $args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args($data, $defaults);
 
-        if ( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
-            if ( 'active' == $args['status'] || $args['status'] == 'trialing' ) {
+        if ($args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
+            if ('active' == $args['status'] || $args['status'] == 'trialing') {
                 $args['status'] = 'expired';
             }
         }
 
-        do_action( 'wpinv_subscription_pre_create', $args, $data, $this );
+        do_action('wpinv_subscription_pre_create', $args, $data, $this);
         
-        if ( !empty( $args ) ) {
-            foreach ( $args as $key => $value ) {
-                $this->update_meta( '_wpinv_subscr_' . $key, $value );
+        if (!empty($args)) {
+            foreach ($args as $key => $value) {
+                $this->update_meta('_wpinv_subscr_' . $key, $value);
             }
         }
 
-        do_action( 'wpinv_subscription_post_create', $args, $data, $this );
+        do_action('wpinv_subscription_post_create', $args, $data, $this);
 
         return true;
     }
     
-    public function update_subscription( $args = array() ) {
-        if ( empty( $this->ID ) ) {
+    public function update_subscription($args = array()) {
+        if (empty($this->ID)) {
             return false;
         }
 
-        if ( !empty( $args['expiration'] ) && $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
-            if ( !isset( $args['status'] ) || ( isset( $args['status'] ) && ( 'active' == $args['status'] || $args['status'] == 'trialing' ) ) ) {
+        if (!empty($args['expiration']) && $args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
+            if (!isset($args['status']) || (isset($args['status']) && ('active' == $args['status'] || $args['status'] == 'trialing'))) {
                 $args['status'] = 'expired';
             }
         }
 
-        if ( isset( $args['status'] ) && $args['status'] == 'cancelled' && empty( $args['cancelled_on'] ) ) {
-            $args['cancelled_on'] = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) );
+        if (isset($args['status']) && $args['status'] == 'cancelled' && empty($args['cancelled_on'])) {
+            $args['cancelled_on'] = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
         }
 
-        do_action( 'wpinv_subscription_pre_update', $args, $this );
+        do_action('wpinv_subscription_pre_update', $args, $this);
         
-        if ( !empty( $args ) ) {
-            foreach ( $args as $key => $value ) {
-                $this->update_meta( '_wpinv_subscr_' . $key, $value );
+        if (!empty($args)) {
+            foreach ($args as $key => $value) {
+                $this->update_meta('_wpinv_subscr_' . $key, $value);
             }
         }
 
-        do_action( 'wpinv_subscription_post_update', $args, $this );
+        do_action('wpinv_subscription_post_update', $args, $this);
 
         return true;
     }
     
     public function renew_subscription() {
         $parent_invoice = $this->get_parent_payment();
-        $parent_invoice = empty( $parent_invoice ) ? $this : $parent_invoice;
+        $parent_invoice = empty($parent_invoice) ? $this : $parent_invoice;
         
-        $current_time   = current_time( 'timestamp' );
+        $current_time   = current_time('timestamp');
         $start          = $this->get_subscription_created();
-        $start          = $start ? strtotime( $start ) : $current_time;
+        $start          = $start ? strtotime($start) : $current_time;
         $expires        = $this->get_expiration_time();
         
-        if ( !$expires ) {
-            $expires    = strtotime( '+' . $parent_invoice->get_subscription_interval() . ' ' . $parent_invoice->get_subscription_period( true ), $start );
+        if (!$expires) {
+            $expires    = strtotime('+' . $parent_invoice->get_subscription_interval() . ' ' . $parent_invoice->get_subscription_period(true), $start);
         }
         
-        $expiration     = date_i18n( 'Y-m-d 23:59:59', $expires );
-        $expiration     = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->ID, $this );
+        $expiration     = date_i18n('Y-m-d 23:59:59', $expires);
+        $expiration     = apply_filters('wpinv_subscription_renewal_expiration', $expiration, $this->ID, $this);
         $bill_times     = $parent_invoice->get_bill_times();
         $times_billed   = $parent_invoice->get_total_payments();
         
-        if ( $parent_invoice->get_subscription_status() == 'trialing' && ( $times_billed > 0 || strtotime( date_i18n( 'Y-m-d' ) ) < strtotime( $parent_invoice->get_trial_end_date( false ) ) ) ) {
+        if ($parent_invoice->get_subscription_status() == 'trialing' && ($times_billed > 0 || strtotime(date_i18n('Y-m-d')) < strtotime($parent_invoice->get_trial_end_date(false)))) {
             $args = array(
                 'status'     => 'active',
             );
 
-            $parent_invoice->update_subscription( $args );
+            $parent_invoice->update_subscription($args);
         }
         
-        do_action( 'wpinv_subscription_pre_renew', $this->ID, $expiration, $this );
+        do_action('wpinv_subscription_pre_renew', $this->ID, $expiration, $this);
 
-        $status       = 'active';
-        if ( $bill_times > 0 && $times_billed >= $bill_times ) {
+        $status = 'active';
+        if ($bill_times > 0 && $times_billed >= $bill_times) {
             $this->complete_subscription();
             $status = 'completed';
         }
@@ -2598,10 +2598,10 @@ 
             'status'     => $status,
         );
 
-        $this->update_subscription( $args );
+        $this->update_subscription($args);
 
-        do_action( 'wpinv_subscription_post_renew', $this->ID, $expiration, $this );
-        do_action( 'wpinv_recurring_set_subscription_status', $this->ID, $status, $this );
+        do_action('wpinv_subscription_post_renew', $this->ID, $expiration, $this);
+        do_action('wpinv_recurring_set_subscription_status', $this->ID, $status, $this);
     }
     
     public function complete_subscription() {
@@ -2609,8 +2609,8 @@ 
             'status' => 'completed'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_completed', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_completed', $this->ID, $this);
         }
     }
     
@@ -2619,44 +2619,44 @@ 
             'status' => 'expired'
         );
 
-        if ( $this->update_subscription( $args ) ) {
-            do_action( 'wpinv_subscription_expired', $this->ID, $this );
+        if ($this->update_subscription($args)) {
+            do_action('wpinv_subscription_expired', $this->ID, $this);
         }
     }
 
     public function get_cancel_url() {
-        $url = wp_nonce_url( add_query_arg( array( 'wpi_action' => 'cancel_subscription', 'sub_id' => $this->ID ) ), 'wpinv-recurring-cancel' );
+        $url = wp_nonce_url(add_query_arg(array('wpi_action' => 'cancel_subscription', 'sub_id' => $this->ID)), 'wpinv-recurring-cancel');
 
-        return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+        return apply_filters('wpinv_subscription_cancel_url', $url, $this);
     }
 
     public function can_update() {
-        return apply_filters( 'wpinv_subscription_can_update', false, $this );
+        return apply_filters('wpinv_subscription_can_update', false, $this);
     }
 
     public function get_update_url() {
-        $url = add_query_arg( array( 'action' => 'update', 'sub_id' => $this->ID ) );
+        $url = add_query_arg(array('action' => 'update', 'sub_id' => $this->ID));
 
-        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+        return apply_filters('wpinv_subscription_update_url', $url, $this);
     }
 
     public function is_parent() {
-        $is_parent = empty( $this->parent_invoice ) ? true : false;
+        $is_parent = empty($this->parent_invoice) ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_parent', $is_parent, $this );
+        return apply_filters('wpinv_invoice_is_parent', $is_parent, $this);
     }
     
     public function is_renewal() {
         $is_renewal = $this->parent_invoice && $this->parent_invoice != $this->ID ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_renewal', $is_renewal, $this );
+        return apply_filters('wpinv_invoice_is_renewal', $is_renewal, $this);
     }
     
     public function get_parent_payment() {
         $parent_payment = NULL;
         
-        if ( $this->is_renewal() ) {
-            $parent_payment = wpinv_get_invoice( $this->parent_invoice );
+        if ($this->is_renewal()) {
+            $parent_payment = wpinv_get_invoice($this->parent_invoice);
         }
         
         return $parent_payment;
@@ -2667,100 +2667,100 @@ 
         
         $subscription_status = $this->get_subscription_status();
 
-        if( ! $this->is_subscription_expired() && ( $subscription_status == 'active' || $subscription_status == 'cancelled' || $subscription_status == 'trialing' ) ) {
+        if (!$this->is_subscription_expired() && ($subscription_status == 'active' || $subscription_status == 'cancelled' || $subscription_status == 'trialing')) {
             $ret = true;
         }
 
-        return apply_filters( 'wpinv_subscription_is_active', $ret, $this->ID, $this );
+        return apply_filters('wpinv_subscription_is_active', $ret, $this->ID, $this);
     }
 
     public function is_subscription_expired() {
         $ret = false;
         $subscription_status = $this->get_subscription_status();
 
-        if ( $subscription_status == 'expired' ) {
+        if ($subscription_status == 'expired') {
             $ret = true;
-        } else if ( 'active' === $subscription_status || 'cancelled' === $subscription_status || 'trialing' == $subscription_status ) {
+        } else if ('active' === $subscription_status || 'cancelled' === $subscription_status || 'trialing' == $subscription_status) {
             $ret        = false;
             $expiration = $this->get_expiration_time();
 
-            if ( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+            if ($expiration && strtotime('NOW', current_time('timestamp')) > $expiration) {
                 $ret = true;
 
-                if ( 'active' === $subscription_status || 'trialing' === $subscription_status ) {
+                if ('active' === $subscription_status || 'trialing' === $subscription_status) {
                     $this->expire_subscription();
                 }
             }
         }
 
-        return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->ID, $this );
+        return apply_filters('wpinv_subscription_is_expired', $ret, $this->ID, $this);
     }
     
-    public function get_new_expiration( $item_id = 0, $trial = true ) {
-        $item   = new WPInv_Item( $item_id );
+    public function get_new_expiration($item_id = 0, $trial = true) {
+        $item   = new WPInv_Item($item_id);
         $interval = $item->get_recurring_interval();
-        $period = $item->get_recurring_period( true );
+        $period = $item->get_recurring_period(true);
         
-        $expiration_time = strtotime( '+' . $interval . ' ' . $period );
+        $expiration_time = strtotime('+' . $interval . ' ' . $period);
         
-        if ( $trial && $this->is_free_trial() && $item->has_free_trial() ) {
-            $expiration_time += ( wpinv_period_in_days( $item->get_trial_interval(), $item->get_trial_period() ) * DAY_IN_SECONDS ) ;
+        if ($trial && $this->is_free_trial() && $item->has_free_trial()) {
+            $expiration_time += (wpinv_period_in_days($item->get_trial_interval(), $item->get_trial_period()) * DAY_IN_SECONDS);
         }
 
-        return date_i18n( 'Y-m-d 23:59:59', $expiration_time );
+        return date_i18n('Y-m-d 23:59:59', $expiration_time);
     }
     
-    public function get_subscription_data( $filed = '' ) {
-        $fields = array( 'item_id', 'status', 'period', 'initial_amount', 'recurring_amount', 'interval', 'bill_times', 'trial_period', 'trial_interval', 'expiration', 'profile_id', 'created', 'cancelled_on' );
+    public function get_subscription_data($filed = '') {
+        $fields = array('item_id', 'status', 'period', 'initial_amount', 'recurring_amount', 'interval', 'bill_times', 'trial_period', 'trial_interval', 'expiration', 'profile_id', 'created', 'cancelled_on');
         
         $subscription_meta = array();
-        foreach ( $fields as $field ) {
-            $subscription_meta[ $field ] = $this->get_meta( '_wpinv_subscr_' . $field );
+        foreach ($fields as $field) {
+            $subscription_meta[$field] = $this->get_meta('_wpinv_subscr_' . $field);
         }
         
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
         
-        if ( !empty( $item ) ) {
-            if ( empty( $subscription_meta['item_id'] ) ) {
+        if (!empty($item)) {
+            if (empty($subscription_meta['item_id'])) {
                 $subscription_meta['item_id'] = $item->ID;
             }
-            if ( empty( $subscription_meta['period'] ) ) {
+            if (empty($subscription_meta['period'])) {
                 $subscription_meta['period'] = $item->get_recurring_period();
             }
-            if ( empty( $subscription_meta['interval'] ) ) {
+            if (empty($subscription_meta['interval'])) {
                 $subscription_meta['interval'] = $item->get_recurring_interval();
             }
-            if ( $item->has_free_trial() ) {
-                if ( empty( $subscription_meta['trial_period'] ) ) {
+            if ($item->has_free_trial()) {
+                if (empty($subscription_meta['trial_period'])) {
                     $subscription_meta['trial_period'] = $item->get_trial_period();
                 }
-                if ( empty( $subscription_meta['trial_interval'] ) ) {
+                if (empty($subscription_meta['trial_interval'])) {
                     $subscription_meta['trial_interval'] = $item->get_trial_interval();
                 }
             } else {
                 $subscription_meta['trial_period']      = '';
                 $subscription_meta['trial_interval']    = 0;
             }
-            if ( !$subscription_meta['bill_times'] && $subscription_meta['bill_times'] !== 0 ) {
+            if (!$subscription_meta['bill_times'] && $subscription_meta['bill_times'] !== 0) {
                 $subscription_meta['bill_times'] = $item->get_recurring_limit();
             }
-            if ( $subscription_meta['initial_amount'] === '' || $subscription_meta['recurring_amount'] === '' ) {
-                $subscription_meta['initial_amount']    = wpinv_round_amount( $this->get_total() );
-                $subscription_meta['recurring_amount']  = wpinv_round_amount( $this->get_recurring_details( 'total' ) );
+            if ($subscription_meta['initial_amount'] === '' || $subscription_meta['recurring_amount'] === '') {
+                $subscription_meta['initial_amount']    = wpinv_round_amount($this->get_total());
+                $subscription_meta['recurring_amount']  = wpinv_round_amount($this->get_recurring_details('total'));
             }
         }
         
-        if ( $filed === '' ) {
-            return apply_filters( 'wpinv_get_invoice_subscription_data', $subscription_meta, $this );
+        if ($filed === '') {
+            return apply_filters('wpinv_get_invoice_subscription_data', $subscription_meta, $this);
         }
         
-        $value = isset( $subscription_meta[$filed] ) ? $subscription_meta[$filed] : '';
+        $value = isset($subscription_meta[$filed]) ? $subscription_meta[$filed] : '';
         
-        return apply_filters( 'wpinv_invoice_subscription_data_value', $value, $subscription_meta, $this );
+        return apply_filters('wpinv_invoice_subscription_data_value', $value, $subscription_meta, $this);
     }
     
     public function is_paid() {
-        if ( $this->has_status( array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+        if ($this->has_status(array('publish', 'wpi-processing', 'wpi-renewal'))) {
             return true;
         }
         
@@ -2768,23 +2768,23 @@ 
     }
     
     public function is_refunded() {
-        $is_refunded = $this->has_status( array( 'wpi-refunded' ) );
+        $is_refunded = $this->has_status(array('wpi-refunded'));
 
-        return apply_filters( 'wpinv_invoice_is_refunded', $is_refunded, $this );
+        return apply_filters('wpinv_invoice_is_refunded', $is_refunded, $this);
     }
     
     public function is_free() {
         $is_free = false;
         
-        if ( !( (float)wpinv_round_amount( $this->get_total() ) > 0 ) ) {
-            if ( $this->is_parent() && $this->is_recurring() ) {
-                $is_free = (float)wpinv_round_amount( $this->get_recurring_details( 'total' ) ) > 0 ? false : true;
+        if (!((float)wpinv_round_amount($this->get_total()) > 0)) {
+            if ($this->is_parent() && $this->is_recurring()) {
+                $is_free = (float)wpinv_round_amount($this->get_recurring_details('total')) > 0 ? false : true;
             } else {
                 $is_free = true;
             }
         }
         
-        return apply_filters( 'wpinv_invoice_is_free', $is_free, $this );
+        return apply_filters('wpinv_invoice_is_free', $is_free, $this);
     }
     
     public function has_vat() {
@@ -2792,41 +2792,41 @@ 
         
         $requires_vat = false;
         
-        if ( $this->country ) {
+        if ($this->country) {
             $wpi_country        = $this->country;
             
-            $requires_vat       = $wpinv_euvat->requires_vat( $requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule( $this ) );
+            $requires_vat       = $wpinv_euvat->requires_vat($requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule($this));
         }
         
-        return apply_filters( 'wpinv_invoice_has_vat', $requires_vat, $this );
+        return apply_filters('wpinv_invoice_has_vat', $requires_vat, $this);
     }
     
     public function refresh_item_ids() {
         $item_ids = array();
         
-        if ( !empty( $this->cart_details ) ) {
-            foreach ( $this->cart_details as $key => $item ) {
-                if ( !empty( $item['id'] ) ) {
+        if (!empty($this->cart_details)) {
+            foreach ($this->cart_details as $key => $item) {
+                if (!empty($item['id'])) {
                     $item_ids[] = $item['id'];
                 }
             }
         }
         
-        $item_ids = !empty( $item_ids ) ? implode( ',', array_unique( $item_ids ) ) : '';
+        $item_ids = !empty($item_ids) ? implode(',', array_unique($item_ids)) : '';
         
-        update_post_meta( $this->ID, '_wpinv_item_ids', $item_ids );
+        update_post_meta($this->ID, '_wpinv_item_ids', $item_ids);
     }
     
-    public function get_invoice_quote_type( $post_id ) {
-        if ( empty( $post_id ) ) {
+    public function get_invoice_quote_type($post_id) {
+        if (empty($post_id)) {
             return '';
         }
 
-        $type = get_post_type( $post_id );
+        $type = get_post_type($post_id);
 
-        if ( 'wpi_invoice' === $type ) {
+        if ('wpi_invoice' === $type) {
             $post_type = __('Invoice', 'invoicing');
-        } else{
+        } else {
             $post_type = __('Quote', 'invoicing');
         }
 

includes/libraries/GeoIp2/Model/City.php

Spacing +1 added lines, -2 removed lines

@@ -130,7 +130,6 @@
     private function mostSpecificSubdivision()
     {
         return empty($this->subdivisions) ?
-            new \GeoIp2\Record\Subdivision(array(), $this->locales) :
-            end($this->subdivisions);
+            new \GeoIp2\Record\Subdivision(array(), $this->locales) : end($this->subdivisions);
     }
 }

includes/libraries/GeoIp2/Compat/JsonSerializable.php

Indentation +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
 // @codingStandardsIgnoreFile
 
 /**
-  * This interface exists to provide backwards compatibility with PHP 5.3
-  *
-  * This should _not_ be used by any third-party code.
-  *
-  * @ignore
-  */
+ * This interface exists to provide backwards compatibility with PHP 5.3
+ *
+ * This should _not_ be used by any third-party code.
+ *
+ * @ignore
+ */
 if (interface_exists('JsonSerializable')) {
     interface JsonSerializable extends \JsonSerializable
     {

includes/libraries/class-emogrifier.php

Indentation +776 added lines, -776 removed lines

@@ -9,780 +9,780 @@
  * @author Roman Ožana <ozana@omdesign.cz>
  */
 class Emogrifier {
-	/**
-	 * @var string
-	 */
-	const ENCODING = 'UTF-8';
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_CSS = 0;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_SELECTOR = 1;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_XPATH = 2;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_CSS_DECLARATION_BLOCK = 3;
-
-	/**
-	 * for calculating nth-of-type and nth-child selectors.
-	 *
-	 * @var integer
-	 */
-	const INDEX = 0;
-
-	/**
-	 * for calculating nth-of-type and nth-child selectors.
-	 *
-	 * @var integer
-	 */
-	const MULTIPLIER = 1;
-
-	/**
-	 * @var string
-	 */
-	const ID_ATTRIBUTE_MATCHER = '/(\\w+)?\\#([\\w\\-]+)/';
-
-	/**
-	 * @var string
-	 */
-	const CLASS_ATTRIBUTE_MATCHER = '/(\\w+|[\\*\\]])?((\\.[\\w\\-]+)+)/';
-
-	/**
-	 * @var string
-	 */
-	private $html = '';
-
-	/**
-	 * @var string
-	 */
-	private $css = '';
-
-	/**
-	 * @var array<string>
-	 */
-	private $unprocessableHtmlTags = array('wbr');
-
-	/**
-	 * @var array<array>
-	 */
-	private $caches = array(
-		self::CACHE_KEY_CSS => array(),
-		self::CACHE_KEY_SELECTOR => array(),
-		self::CACHE_KEY_XPATH => array(),
-		self::CACHE_KEY_CSS_DECLARATION_BLOCK => array(),
-	);
-
-	/**
-	 * the visited nodes with the XPath paths as array keys.
-	 *
-	 * @var array<\DOMNode>
-	 */
-	private $visitedNodes = array();
-
-	/**
-	 * the styles to apply to the nodes with the XPath paths as array keys for the outer array and the attribute names/values.
-	 * as key/value pairs for the inner array.
-	 *
-	 * @var array<array><string>
-	 */
-	private $styleAttributesForNodes = array();
-
-	/**
-	 * This attribute applies to the case where you want to preserve your original text encoding.
-	 *
-	 * By default, emogrifier translates your text into HTML entities for two reasons:
-	 *
-	 * 1. Because of client incompatibilities, it is better practice to send out HTML entities rather than unicode over email.
-	 *
-	 * 2. It translates any illegal XML characters that DOMDocument cannot work with.
-	 *
-	 * If you would like to preserve your original encoding, set this attribute to TRUE.
-	 *
-	 * @var boolean
-	 */
-	public $preserveEncoding = false;
-
-	public static $_media = '';
-
-	/**
-	 * The constructor.
-	 *
-	 * @param string $html the HTML to emogrify, must be UTF-8-encoded
-	 * @param string $css the CSS to merge, must be UTF-8-encoded
-	 */
-	public function __construct($html = '', $css = '') {
-		$this->setHtml($html);
-		$this->setCss($css);
-	}
-
-	/**
-	 * The destructor.
-	 */
-	public function __destruct() {
-		$this->purgeVisitedNodes();
-	}
-
-	/**
-	 * Sets the HTML to emogrify.
-	 *
-	 * @param string $html the HTML to emogrify, must be UTF-8-encoded
-	 */
-	public function setHtml($html = '') {
-		$this->html = $html;
-	}
-
-	/**
-	 * Sets the CSS to merge with the HTML.
-	 *
-	 * @param string $css the CSS to merge, must be UTF-8-encoded
-	 */
-	public function setCss($css = '') {
-		$this->css = $css;
-	}
-
-	/**
-	 * Clears all caches.
-	 */
-	private function clearAllCaches() {
-		$this->clearCache(self::CACHE_KEY_CSS);
-		$this->clearCache(self::CACHE_KEY_SELECTOR);
-		$this->clearCache(self::CACHE_KEY_XPATH);
-		$this->clearCache(self::CACHE_KEY_CSS_DECLARATION_BLOCK);
-	}
-
-	/**
-	 * Clears a single cache by key.
-	 *
-	 * @param integer $key the cache key, must be CACHE_KEY_CSS, CACHE_KEY_SELECTOR, CACHE_KEY_XPATH or CACHE_KEY_CSS_DECLARATION_BLOCK
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	private function clearCache($key) {
-		$allowedCacheKeys = array(self::CACHE_KEY_CSS, self::CACHE_KEY_SELECTOR, self::CACHE_KEY_XPATH, self::CACHE_KEY_CSS_DECLARATION_BLOCK);
-		if (!in_array($key, $allowedCacheKeys, true)) {
-			throw new InvalidArgumentException('Invalid cache key: ' . $key, 1391822035);
-		}
-
-		$this->caches[$key] = array();
-	}
-
-	/**
-	 * Purges the visited nodes.
-	 */
-	private function purgeVisitedNodes() {
-		$this->visitedNodes = array();
-		$this->styleAttributesForNodes = array();
-	}
-
-	/**
-	 * Marks a tag for removal.
-	 *
-	 * There are some HTML tags that DOMDocument cannot process, and it will throw an error if it encounters them.
-	 * In particular, DOMDocument will complain if you try to use HTML5 tags in an XHTML document.
-	 *
-	 * Note: The tags will not be removed if they have any content.
-	 *
-	 * @param string $tagName the tag name, e.g., "p"
-	 */
-	public function addUnprocessableHtmlTag($tagName) {
-		$this->unprocessableHtmlTags[] = $tagName;
-	}
-
-	/**
-	 * Drops a tag from the removal list.
-	 *
-	 * @param string $tagName the tag name, e.g., "p"
-	 */
-	public function removeUnprocessableHtmlTag($tagName) {
-		$key = array_search($tagName, $this->unprocessableHtmlTags, true);
-		if ($key !== false) {
-			unset($this->unprocessableHtmlTags[$key]);
-		}
-	}
-
-	/**
-	 * Applies the CSS you submit to the HTML you submit.
-	 *
-	 * This method places the CSS inline.
-	 *
-	 * @return string
-	 *
-	 * @throws BadMethodCallException
-	 */
-	public function emogrify() {
-		if ($this->html === '') {
-			throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
-		}
-
-		$xmlDocument = $this->createXmlDocument();
-		$xpath = new DOMXPath($xmlDocument);
-		$this->clearAllCaches();
-
-		// before be begin processing the CSS file, parse the document and normalize all existing CSS attributes (changes 'DISPLAY: none' to 'display: none');
-		// we wouldn't have to do this if DOMXPath supported XPath 2.0.
-		// also store a reference of nodes with existing inline styles so we don't overwrite them
-		$this->purgeVisitedNodes();
-
-		$nodesWithStyleAttributes = $xpath->query('//*[@style]');
-		if ($nodesWithStyleAttributes !== false) {
-			/** @var $nodeWithStyleAttribute DOMNode */
-			foreach ($nodesWithStyleAttributes as $node) {
-				$normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
-
-				// in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
-				$nodePath = $node->getNodePath();
-				if (!isset($this->styleAttributesForNodes[$nodePath])) {
-					$this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationBlock($normalizedOriginalStyle);
-					$this->visitedNodes[$nodePath] = $node;
-				}
-
-				$node->setAttribute('style', $normalizedOriginalStyle);
-			}
-		}
-
-		// grab any existing style blocks from the html and append them to the existing CSS
-		// (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
-		$allCss = $this->css;
-
-		$allCss .= $this->getCssFromAllStyleNodes($xpath);
-
-		$cssParts = $this->splitCssAndMediaQuery($allCss);
-		self::$_media = ''; // reset
-
-		$cssKey = md5($cssParts['css']);
-		if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
-			// process the CSS file for selectors and definitions
-			preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mis', $cssParts['css'], $matches, PREG_SET_ORDER);
-
-			$allSelectors = array();
-			foreach ($matches as $key => $selectorString) {
-				// if there is a blank definition, skip
-				if (!strlen(trim($selectorString[2]))) {
-					continue;
-				}
-
-				// else split by commas and duplicate attributes so we can sort by selector precedence
-				$selectors = explode(',', $selectorString[1]);
-				foreach ($selectors as $selector) {
-					// don't process pseudo-elements and behavioral (dynamic) pseudo-classes; ONLY allow structural pseudo-classes
-					if (strpos($selector, ':') !== false && !preg_match('/:\\S+\\-(child|type)\\(/i', $selector)) {
-						continue;
-					}
-
-					$allSelectors[] = array('selector' => trim($selector),
-											 'attributes' => trim($selectorString[2]),
-											 // keep track of where it appears in the file, since order is important
-											 'line' => $key,
-					);
-				}
-			}
-
-			// now sort the selectors by precedence
-			usort($allSelectors, array($this,'sortBySelectorPrecedence'));
-
-			$this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
-		}
-
-		foreach ($this->caches[self::CACHE_KEY_CSS][$cssKey] as $value) {
-			// query the body for the xpath selector
-			$nodesMatchingCssSelectors = $xpath->query($this->translateCssToXpath($value['selector']));
-
-			/** @var $node \DOMNode */
-			foreach ($nodesMatchingCssSelectors as $node) {
-				// if it has a style attribute, get it, process it, and append (overwrite) new stuff
-				if ($node->hasAttribute('style')) {
-					// break it up into an associative array
-					$oldStyleDeclarations = $this->parseCssDeclarationBlock($node->getAttribute('style'));
-				} else {
-					$oldStyleDeclarations = array();
-				}
-				$newStyleDeclarations = $this->parseCssDeclarationBlock($value['attributes']);
-				$node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations));
-			}
-		}
-
-		// now iterate through the nodes that contained inline styles in the original HTML
-		foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
-			$node = $this->visitedNodes[$nodePath];
-			$currentStyleAttributes = $this->parseCssDeclarationBlock($node->getAttribute('style'));
-			$node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($currentStyleAttributes, $styleAttributesForNode));
-		}
-
-		// This removes styles from your email that contain display:none.
-		// We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only supports XPath 1.0,
-		// lower-case() isn't available to us. We've thus far only set attributes to lowercase, not attribute values. Consequently, we need
-		// to translate() the letters that would be in 'NONE' ("NOE") to lowercase.
-		$nodesWithStyleDisplayNone = $xpath->query('//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]');
-		// The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
-		// we don't try to call removeChild on a nonexistent child node
-		if ($nodesWithStyleDisplayNone->length > 0) {
-			/** @var $node \DOMNode */
-			foreach ($nodesWithStyleDisplayNone as $node) {
-				if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
-					$node->parentNode->removeChild($node);
-				}
-			}
-		}
-
-		$this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
-
-		if ($this->preserveEncoding) {
-			if ( function_exists( 'mb_convert_encoding' ) ) {
-				return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
-			} else {
-				return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
-			}
-		} else {
-			return $xmlDocument->saveHTML();
-		}
-	}
-
-	public function strtolower(array $m) {
-		return strtolower($m[0]);
-	}
-
-
-	/**
-	 * This method merges old or existing name/value array with new name/value array.
-	 * and then generates a string of the combined style suitable for placing inline.
-	 * This becomes the single point for CSS string generation allowing for consistent.
-	 * CSS output no matter where the CSS originally came from.
-	 * @param array $oldStyles
-	 * @param array $newStyles
-	 * @return string
-	 */
-	private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles) {
-		$combinedStyles = array_merge($oldStyles, $newStyles);
-		$style = '';
-		foreach ($combinedStyles as $attributeName => $attributeValue) {
-			$style .= (strtolower(trim($attributeName)) . ': ' . trim($attributeValue) . '; ');
-		}
-		return trim($style);
-	}
-
-
-	/**
-	 * Copies the media part from CSS array parts to $xmlDocument.
-	 *
-	 * @param array $cssParts
-	 * @param DOMDocument $xmlDocument
-	 */
-	public function copyCssWithMediaToStyleNode(array $cssParts, DOMDocument $xmlDocument) {
-		if (isset($cssParts['media']) && $cssParts['media'] !== '') {
-			$this->addStyleElementToDocument($xmlDocument, $cssParts['media']);
-		}
-	}
-
-	/**
-	 * Returns CSS content.
-	 *
-	 * @param DOMXPath $xpath
-	 * @return string
-	 */
-	private function getCssFromAllStyleNodes(DOMXPath $xpath) {
-		$styleNodes = $xpath->query('//style');
-
-		if ($styleNodes === false) {
-			return '';
-		}
-
-		$css = '';
-		/** @var $styleNode DOMNode */
-		foreach ($styleNodes as $styleNode) {
-			$css .= "\n\n" . $styleNode->nodeValue;
-			$styleNode->parentNode->removeChild($styleNode);
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Adds a style element with $css to $document.
-	 *
-	 * @param DOMDocument $document
-	 * @param string $css
-	 */
-	private function addStyleElementToDocument(DOMDocument $document, $css) {
-		$styleElement = $document->createElement('style', $css);
-		$styleAttribute = $document->createAttribute('type');
-		$styleAttribute->value = 'text/css';
-		$styleElement->appendChild($styleAttribute);
-
-		$head = $this->getOrCreateHeadElement($document);
-		$head->appendChild($styleElement);
-	}
-
-	/**
-	 * Returns the existing or creates a new head element in $document.
-	 *
-	 * @param DOMDocument $document
-	 * @return DOMNode the head element
-	 */
-	private function getOrCreateHeadElement(DOMDocument $document) {
-		$head = $document->getElementsByTagName('head')->item(0);
-
-		if ($head === null) {
-			$head = $document->createElement('head');
-			$html = $document->getElementsByTagName('html')->item(0);
-			$html->insertBefore($head, $document->getElementsByTagName('body')->item(0));
-		}
-
-		return $head;
-	}
-
-	/**
-	 * Splits input CSS code to an array where:
-	 *
-	 * - key "css" will be contains clean CSS code.
-	 * - key "media" will be contains all valuable media queries.
-	 *
-	 * Example:
-	 *
-	 * The CSS code.
-	 *
-	 *   "@import "file.css"; h1 { color:red; } @media { h1 {}} @media tv { h1 {}}"
-	 *
-	 * will be parsed into the following array:
-	 *
-	 *   "css" => "h1 { color:red; }"
-	 *   "media" => "@media { h1 {}}"
-	 *
-	 * @param string $css
-	 * @return array
-	 */
-	private function splitCssAndMediaQuery($css) {
-		$css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
-
-		// filter the CSS
-		$search = array(
-			// get rid of css comment code
-			'/\\/\\*.*\\*\\//sU',
-			// strip out any import directives
-			'/^\\s*@import\\s[^;]+;/misU',
-			// strip remains media enclosures
-			'/^\\s*@media\\s[^{]+{(.*)}\\s*}\\s/misU',
-		);
-
-		$replace = array(
-			'',
-			'',
-			'',
-		);
-
-		// clean CSS before output
-		$css = preg_replace($search, $replace, $css);
-
-		return array('css' => $css, 'media' => self::$_media);
-	}
-
-	private function _media_concat( $matches ) {
-		self::$_media .= $matches[0];
-	}
-
-	/**
-	 * Creates a DOMDocument instance with the current HTML.
-	 *
-	 * @return DOMDocument
-	 */
-	private function createXmlDocument() {
-		$xmlDocument = new DOMDocument;
-		$xmlDocument->encoding = self::ENCODING;
-		$xmlDocument->strictErrorChecking = false;
-		$xmlDocument->formatOutput = true;
-		$libXmlState = libxml_use_internal_errors(true);
-		$xmlDocument->loadHTML($this->getUnifiedHtml());
-		libxml_clear_errors();
-		libxml_use_internal_errors($libXmlState);
-		$xmlDocument->normalizeDocument();
-
-		return $xmlDocument;
-	}
-
-	/**
-	 * Returns the HTML with the non-ASCII characters converts into HTML entities and the unprocessable HTML tags removed.
-	 *
-	 * @return string the unified HTML
-	 *
-	 * @throws BadMethodCallException
-	 */
-	private function getUnifiedHtml() {
-		if (!empty($this->unprocessableHtmlTags)) {
-			$unprocessableHtmlTags = implode('|', $this->unprocessableHtmlTags);
-			$bodyWithoutUnprocessableTags = preg_replace('/<\\/?(' . $unprocessableHtmlTags . ')[^>]*>/i', '', $this->html);
-		} else {
-			$bodyWithoutUnprocessableTags = $this->html;
-		}
-
-		if ( function_exists( 'mb_convert_encoding' ) ) {
-			return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
-		} else {
-			return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
-		}
-	}
-
-	/**
-	 * @param array $a
-	 * @param array $b
-	 *
-	 * @return integer
-	 */
-	private function sortBySelectorPrecedence(array $a, array $b) {
-		$precedenceA = $this->getCssSelectorPrecedence($a['selector']);
-		$precedenceB = $this->getCssSelectorPrecedence($b['selector']);
-
-		// We want these sorted in ascending order so selectors with lesser precedence get processed first and
-		// selectors with greater precedence get sorted last.
-		// The parenthesis around the -1 are necessary to avoid a PHP_CodeSniffer warning about missing spaces around
-		// arithmetic operators.
-		// @see http://forge.typo3.org/issues/55605
-		$precedenceForEquals = ($a['line'] < $b['line'] ? (-1) : 1);
-		$precedenceForNotEquals = ($precedenceA < $precedenceB ? (-1) : 1);
-		return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
-	}
-
-	/**
-	 * @param string $selector
-	 *
-	 * @return integer
-	 */
-	private function getCssSelectorPrecedence($selector) {
-		$selectorKey = md5($selector);
-		if (!isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
-			$precedence = 0;
-			$value = 100;
-			// ids: worth 100, classes: worth 10, elements: worth 1
-			$search = array('\\#','\\.','');
-
-			foreach ($search as $s) {
-				if (trim($selector == '')) {
-					break;
-				}
-				$number = 0;
-				$selector = preg_replace('/' . $s . '\\w+/', '', $selector, -1, $number);
-				$precedence += ($value * $number);
-				$value /= 10;
-			}
-			$this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
-		}
-
-		return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
-	}
-
-	/**
-	 * Right now, we support all CSS 1 selectors and most CSS2/3 selectors.
-	 *
-	 * @see http://plasmasturm.org/log/444/
-	 *
-	 * @param string $paramCssSelector
-	 *
-	 * @return string
-	 */
-	private function translateCssToXpath($paramCssSelector) {
-		$cssSelector = ' ' . $paramCssSelector . ' ';
-		$cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
-		$cssSelector = trim($cssSelector);
-		$xpathKey = md5($cssSelector);
-		if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
-			// returns an Xpath selector
-			$search = array(
-				// Matches any element that is a child of parent.
-				'/\\s+>\\s+/',
-				// Matches any element that is an adjacent sibling.
-				'/\\s+\\+\\s+/',
-				// Matches any element that is a descendant of an parent element element.
-				'/\\s+/',
-				// first-child pseudo-selector
-				'/([^\\/]+):first-child/i',
-				// last-child pseudo-selector
-				'/([^\\/]+):last-child/i',
-				// Matches attribute only selector
-				'/^\\[(\\w+)\\]/',
-				// Matches element with attribute
-				'/(\\w)\\[(\\w+)\\]/',
-				// Matches element with EXACT attribute
-				'/(\\w)\\[(\\w+)\\=[\'"]?(\\w+)[\'"]?\\]/',
-			);
-			$replace = array(
-				'/',
-				'/following-sibling::*[1]/self::',
-				'//',
-				'*[1]/self::\\1',
-				'*[last()]/self::\\1',
-				'*[@\\1]',
-				'\\1[@\\2]',
-				'\\1[@\\2="\\3"]',
-			);
-
-			$cssSelector = '//' . preg_replace($search, $replace, $cssSelector);
-
-			$cssSelector = preg_replace_callback(self::ID_ATTRIBUTE_MATCHER, array($this, 'matchIdAttributes'), $cssSelector);
-			$cssSelector = preg_replace_callback(self::CLASS_ATTRIBUTE_MATCHER, array($this, 'matchClassAttributes'), $cssSelector);
-
-			// Advanced selectors are going to require a bit more advanced emogrification.
-			// When we required PHP 5.3, we could do this with closures.
-			$cssSelector = preg_replace_callback(
-				'/([^\\/]+):nth-child\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
-				array($this, 'translateNthChild'), $cssSelector
-			);
-			$cssSelector = preg_replace_callback(
-				'/([^\\/]+):nth-of-type\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
-				array($this, 'translateNthOfType'), $cssSelector
-			);
-
-			$this->caches[self::CACHE_KEY_SELECTOR][$xpathKey] = $cssSelector;
-		}
-		return $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey];
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function matchIdAttributes(array $match) {
-		return (strlen($match[1]) ? $match[1] : '*') . '[@id="' . $match[2] . '"]';
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function matchClassAttributes(array $match) {
-		return (strlen($match[1]) ? $match[1] : '*') . '[contains(concat(" ",@class," "),concat(" ","' .
-			implode(
-				'"," "))][contains(concat(" ",@class," "),concat(" ","',
-				explode('.', substr($match[2], 1))
-			) . '"," "))]';
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function translateNthChild(array $match) {
-		$result = $this->parseNth($match);
-
-		if (isset($result[self::MULTIPLIER])) {
-			if ($result[self::MULTIPLIER] < 0) {
-				$result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
-				return sprintf('*[(last() - position()) mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
-			} else {
-				return sprintf('*[position() mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
-			}
-		} else {
-			return sprintf('*[%u]/self::%s', $result[self::INDEX], $match[1]);
-		}
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function translateNthOfType(array $match) {
-		$result = $this->parseNth($match);
-
-		if (isset($result[self::MULTIPLIER])) {
-			if ($result[self::MULTIPLIER] < 0) {
-				$result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
-				return sprintf('%s[(last() - position()) mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
-			} else {
-				return sprintf('%s[position() mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
-			}
-		} else {
-			return sprintf('%s[%u]', $match[1], $result[self::INDEX]);
-		}
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return array
-	 */
-	private function parseNth(array $match) {
-		if (in_array(strtolower($match[2]), array('even','odd'))) {
-			$index = strtolower($match[2]) == 'even' ? 0 : 1;
-			return array(self::MULTIPLIER => 2, self::INDEX => $index);
-		} elseif (stripos($match[2], 'n') === false) {
-			// if there is a multiplier
-			$index = intval(str_replace(' ', '', $match[2]));
-			return array(self::INDEX => $index);
-		} else {
-			if (isset($match[3])) {
-				$multipleTerm = str_replace($match[3], '', $match[2]);
-				$index = intval(str_replace(' ', '', $match[3]));
-			} else {
-				$multipleTerm = $match[2];
-				$index = 0;
-			}
-
-			$multiplier = str_ireplace('n', '', $multipleTerm);
-
-			if (!strlen($multiplier)) {
-				$multiplier = 1;
-			} elseif ($multiplier == 0) {
-				return array(self::INDEX => $index);
-			} else {
-				$multiplier = intval($multiplier);
-			}
-
-			while ($index < 0) {
-				$index += abs($multiplier);
-			}
-
-			return array(self::MULTIPLIER => $multiplier, self::INDEX => $index);
-		}
-	}
-
-	/**
-	 * Parses a CSS declaration block into property name/value pairs.
-	 *
-	 * Example:
-	 *
-	 * The declaration block.
-	 *
-	 *   "color: #000; font-weight: bold;".
-	 *
-	 * will be parsed into the following array:
-	 *
-	 *   "color" => "#000"
-	 *   "font-weight" => "bold"
-	 *
-	 * @param string $cssDeclarationBlock the CSS declaration block without the curly braces, may be empty
-	 *
-	 * @return array the CSS declarations with the property names as array keys and the property values as array values
-	 */
-	private function parseCssDeclarationBlock($cssDeclarationBlock) {
-		if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock])) {
-			return $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock];
-		}
-
-		$properties = array();
-		$declarations = explode(';', $cssDeclarationBlock);
-		foreach ($declarations as $declaration) {
-			$matches = array();
-			if (!preg_match('/ *([A-Za-z\\-]+) *: *([^;]+) */', $declaration, $matches)) {
-				continue;
-			}
-			$propertyName = strtolower($matches[1]);
-			$propertyValue = $matches[2];
-			$properties[$propertyName] = $propertyValue;
-		}
-		$this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock] = $properties;
-
-		return $properties;
-	}
+    /**
+     * @var string
+     */
+    const ENCODING = 'UTF-8';
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_CSS = 0;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_SELECTOR = 1;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_XPATH = 2;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_CSS_DECLARATION_BLOCK = 3;
+
+    /**
+     * for calculating nth-of-type and nth-child selectors.
+     *
+     * @var integer
+     */
+    const INDEX = 0;
+
+    /**
+     * for calculating nth-of-type and nth-child selectors.
+     *
+     * @var integer
+     */
+    const MULTIPLIER = 1;
+
+    /**
+     * @var string
+     */
+    const ID_ATTRIBUTE_MATCHER = '/(\\w+)?\\#([\\w\\-]+)/';
+
+    /**
+     * @var string
+     */
+    const CLASS_ATTRIBUTE_MATCHER = '/(\\w+|[\\*\\]])?((\\.[\\w\\-]+)+)/';
+
+    /**
+     * @var string
+     */
+    private $html = '';
+
+    /**
+     * @var string
+     */
+    private $css = '';
+
+    /**
+     * @var array<string>
+     */
+    private $unprocessableHtmlTags = array('wbr');
+
+    /**
+     * @var array<array>
+     */
+    private $caches = array(
+        self::CACHE_KEY_CSS => array(),
+        self::CACHE_KEY_SELECTOR => array(),
+        self::CACHE_KEY_XPATH => array(),
+        self::CACHE_KEY_CSS_DECLARATION_BLOCK => array(),
+    );
+
+    /**
+     * the visited nodes with the XPath paths as array keys.
+     *
+     * @var array<\DOMNode>
+     */
+    private $visitedNodes = array();
+
+    /**
+     * the styles to apply to the nodes with the XPath paths as array keys for the outer array and the attribute names/values.
+     * as key/value pairs for the inner array.
+     *
+     * @var array<array><string>
+     */
+    private $styleAttributesForNodes = array();
+
+    /**
+     * This attribute applies to the case where you want to preserve your original text encoding.
+     *
+     * By default, emogrifier translates your text into HTML entities for two reasons:
+     *
+     * 1. Because of client incompatibilities, it is better practice to send out HTML entities rather than unicode over email.
+     *
+     * 2. It translates any illegal XML characters that DOMDocument cannot work with.
+     *
+     * If you would like to preserve your original encoding, set this attribute to TRUE.
+     *
+     * @var boolean
+     */
+    public $preserveEncoding = false;
+
+    public static $_media = '';
+
+    /**
+     * The constructor.
+     *
+     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     * @param string $css the CSS to merge, must be UTF-8-encoded
+     */
+    public function __construct($html = '', $css = '') {
+        $this->setHtml($html);
+        $this->setCss($css);
+    }
+
+    /**
+     * The destructor.
+     */
+    public function __destruct() {
+        $this->purgeVisitedNodes();
+    }
+
+    /**
+     * Sets the HTML to emogrify.
+     *
+     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     */
+    public function setHtml($html = '') {
+        $this->html = $html;
+    }
+
+    /**
+     * Sets the CSS to merge with the HTML.
+     *
+     * @param string $css the CSS to merge, must be UTF-8-encoded
+     */
+    public function setCss($css = '') {
+        $this->css = $css;
+    }
+
+    /**
+     * Clears all caches.
+     */
+    private function clearAllCaches() {
+        $this->clearCache(self::CACHE_KEY_CSS);
+        $this->clearCache(self::CACHE_KEY_SELECTOR);
+        $this->clearCache(self::CACHE_KEY_XPATH);
+        $this->clearCache(self::CACHE_KEY_CSS_DECLARATION_BLOCK);
+    }
+
+    /**
+     * Clears a single cache by key.
+     *
+     * @param integer $key the cache key, must be CACHE_KEY_CSS, CACHE_KEY_SELECTOR, CACHE_KEY_XPATH or CACHE_KEY_CSS_DECLARATION_BLOCK
+     *
+     * @throws InvalidArgumentException
+     */
+    private function clearCache($key) {
+        $allowedCacheKeys = array(self::CACHE_KEY_CSS, self::CACHE_KEY_SELECTOR, self::CACHE_KEY_XPATH, self::CACHE_KEY_CSS_DECLARATION_BLOCK);
+        if (!in_array($key, $allowedCacheKeys, true)) {
+            throw new InvalidArgumentException('Invalid cache key: ' . $key, 1391822035);
+        }
+
+        $this->caches[$key] = array();
+    }
+
+    /**
+     * Purges the visited nodes.
+     */
+    private function purgeVisitedNodes() {
+        $this->visitedNodes = array();
+        $this->styleAttributesForNodes = array();
+    }
+
+    /**
+     * Marks a tag for removal.
+     *
+     * There are some HTML tags that DOMDocument cannot process, and it will throw an error if it encounters them.
+     * In particular, DOMDocument will complain if you try to use HTML5 tags in an XHTML document.
+     *
+     * Note: The tags will not be removed if they have any content.
+     *
+     * @param string $tagName the tag name, e.g., "p"
+     */
+    public function addUnprocessableHtmlTag($tagName) {
+        $this->unprocessableHtmlTags[] = $tagName;
+    }
+
+    /**
+     * Drops a tag from the removal list.
+     *
+     * @param string $tagName the tag name, e.g., "p"
+     */
+    public function removeUnprocessableHtmlTag($tagName) {
+        $key = array_search($tagName, $this->unprocessableHtmlTags, true);
+        if ($key !== false) {
+            unset($this->unprocessableHtmlTags[$key]);
+        }
+    }
+
+    /**
+     * Applies the CSS you submit to the HTML you submit.
+     *
+     * This method places the CSS inline.
+     *
+     * @return string
+     *
+     * @throws BadMethodCallException
+     */
+    public function emogrify() {
+        if ($this->html === '') {
+            throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
+        }
+
+        $xmlDocument = $this->createXmlDocument();
+        $xpath = new DOMXPath($xmlDocument);
+        $this->clearAllCaches();
+
+        // before be begin processing the CSS file, parse the document and normalize all existing CSS attributes (changes 'DISPLAY: none' to 'display: none');
+        // we wouldn't have to do this if DOMXPath supported XPath 2.0.
+        // also store a reference of nodes with existing inline styles so we don't overwrite them
+        $this->purgeVisitedNodes();
+
+        $nodesWithStyleAttributes = $xpath->query('//*[@style]');
+        if ($nodesWithStyleAttributes !== false) {
+            /** @var $nodeWithStyleAttribute DOMNode */
+            foreach ($nodesWithStyleAttributes as $node) {
+                $normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
+
+                // in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
+                $nodePath = $node->getNodePath();
+                if (!isset($this->styleAttributesForNodes[$nodePath])) {
+                    $this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationBlock($normalizedOriginalStyle);
+                    $this->visitedNodes[$nodePath] = $node;
+                }
+
+                $node->setAttribute('style', $normalizedOriginalStyle);
+            }
+        }
+
+        // grab any existing style blocks from the html and append them to the existing CSS
+        // (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
+        $allCss = $this->css;
+
+        $allCss .= $this->getCssFromAllStyleNodes($xpath);
+
+        $cssParts = $this->splitCssAndMediaQuery($allCss);
+        self::$_media = ''; // reset
+
+        $cssKey = md5($cssParts['css']);
+        if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
+            // process the CSS file for selectors and definitions
+            preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mis', $cssParts['css'], $matches, PREG_SET_ORDER);
+
+            $allSelectors = array();
+            foreach ($matches as $key => $selectorString) {
+                // if there is a blank definition, skip
+                if (!strlen(trim($selectorString[2]))) {
+                    continue;
+                }
+
+                // else split by commas and duplicate attributes so we can sort by selector precedence
+                $selectors = explode(',', $selectorString[1]);
+                foreach ($selectors as $selector) {
+                    // don't process pseudo-elements and behavioral (dynamic) pseudo-classes; ONLY allow structural pseudo-classes
+                    if (strpos($selector, ':') !== false && !preg_match('/:\\S+\\-(child|type)\\(/i', $selector)) {
+                        continue;
+                    }
+
+                    $allSelectors[] = array('selector' => trim($selector),
+                                                'attributes' => trim($selectorString[2]),
+                                                // keep track of where it appears in the file, since order is important
+                                                'line' => $key,
+                    );
+                }
+            }
+
+            // now sort the selectors by precedence
+            usort($allSelectors, array($this,'sortBySelectorPrecedence'));
+
+            $this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
+        }
+
+        foreach ($this->caches[self::CACHE_KEY_CSS][$cssKey] as $value) {
+            // query the body for the xpath selector
+            $nodesMatchingCssSelectors = $xpath->query($this->translateCssToXpath($value['selector']));
+
+            /** @var $node \DOMNode */
+            foreach ($nodesMatchingCssSelectors as $node) {
+                // if it has a style attribute, get it, process it, and append (overwrite) new stuff
+                if ($node->hasAttribute('style')) {
+                    // break it up into an associative array
+                    $oldStyleDeclarations = $this->parseCssDeclarationBlock($node->getAttribute('style'));
+                } else {
+                    $oldStyleDeclarations = array();
+                }
+                $newStyleDeclarations = $this->parseCssDeclarationBlock($value['attributes']);
+                $node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations));
+            }
+        }
+
+        // now iterate through the nodes that contained inline styles in the original HTML
+        foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
+            $node = $this->visitedNodes[$nodePath];
+            $currentStyleAttributes = $this->parseCssDeclarationBlock($node->getAttribute('style'));
+            $node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($currentStyleAttributes, $styleAttributesForNode));
+        }
+
+        // This removes styles from your email that contain display:none.
+        // We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only supports XPath 1.0,
+        // lower-case() isn't available to us. We've thus far only set attributes to lowercase, not attribute values. Consequently, we need
+        // to translate() the letters that would be in 'NONE' ("NOE") to lowercase.
+        $nodesWithStyleDisplayNone = $xpath->query('//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]');
+        // The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
+        // we don't try to call removeChild on a nonexistent child node
+        if ($nodesWithStyleDisplayNone->length > 0) {
+            /** @var $node \DOMNode */
+            foreach ($nodesWithStyleDisplayNone as $node) {
+                if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
+                    $node->parentNode->removeChild($node);
+                }
+            }
+        }
+
+        $this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
+
+        if ($this->preserveEncoding) {
+            if ( function_exists( 'mb_convert_encoding' ) ) {
+                return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
+            } else {
+                return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
+            }
+        } else {
+            return $xmlDocument->saveHTML();
+        }
+    }
+
+    public function strtolower(array $m) {
+        return strtolower($m[0]);
+    }
+
+
+    /**
+     * This method merges old or existing name/value array with new name/value array.
+     * and then generates a string of the combined style suitable for placing inline.
+     * This becomes the single point for CSS string generation allowing for consistent.
+     * CSS output no matter where the CSS originally came from.
+     * @param array $oldStyles
+     * @param array $newStyles
+     * @return string
+     */
+    private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles) {
+        $combinedStyles = array_merge($oldStyles, $newStyles);
+        $style = '';
+        foreach ($combinedStyles as $attributeName => $attributeValue) {
+            $style .= (strtolower(trim($attributeName)) . ': ' . trim($attributeValue) . '; ');
+        }
+        return trim($style);
+    }
+
+
+    /**
+     * Copies the media part from CSS array parts to $xmlDocument.
+     *
+     * @param array $cssParts
+     * @param DOMDocument $xmlDocument
+     */
+    public function copyCssWithMediaToStyleNode(array $cssParts, DOMDocument $xmlDocument) {
+        if (isset($cssParts['media']) && $cssParts['media'] !== '') {
+            $this->addStyleElementToDocument($xmlDocument, $cssParts['media']);
+        }
+    }
+
+    /**
+     * Returns CSS content.
+     *
+     * @param DOMXPath $xpath
+     * @return string
+     */
+    private function getCssFromAllStyleNodes(DOMXPath $xpath) {
+        $styleNodes = $xpath->query('//style');
+
+        if ($styleNodes === false) {
+            return '';
+        }
+
+        $css = '';
+        /** @var $styleNode DOMNode */
+        foreach ($styleNodes as $styleNode) {
+            $css .= "\n\n" . $styleNode->nodeValue;
+            $styleNode->parentNode->removeChild($styleNode);
+        }
+
+        return $css;
+    }
+
+    /**
+     * Adds a style element with $css to $document.
+     *
+     * @param DOMDocument $document
+     * @param string $css
+     */
+    private function addStyleElementToDocument(DOMDocument $document, $css) {
+        $styleElement = $document->createElement('style', $css);
+        $styleAttribute = $document->createAttribute('type');
+        $styleAttribute->value = 'text/css';
+        $styleElement->appendChild($styleAttribute);
+
+        $head = $this->getOrCreateHeadElement($document);
+        $head->appendChild($styleElement);
+    }
+
+    /**
+     * Returns the existing or creates a new head element in $document.
+     *
+     * @param DOMDocument $document
+     * @return DOMNode the head element
+     */
+    private function getOrCreateHeadElement(DOMDocument $document) {
+        $head = $document->getElementsByTagName('head')->item(0);
+
+        if ($head === null) {
+            $head = $document->createElement('head');
+            $html = $document->getElementsByTagName('html')->item(0);
+            $html->insertBefore($head, $document->getElementsByTagName('body')->item(0));
+        }
+
+        return $head;
+    }
+
+    /**
+     * Splits input CSS code to an array where:
+     *
+     * - key "css" will be contains clean CSS code.
+     * - key "media" will be contains all valuable media queries.
+     *
+     * Example:
+     *
+     * The CSS code.
+     *
+     *   "@import "file.css"; h1 { color:red; } @media { h1 {}} @media tv { h1 {}}"
+     *
+     * will be parsed into the following array:
+     *
+     *   "css" => "h1 { color:red; }"
+     *   "media" => "@media { h1 {}}"
+     *
+     * @param string $css
+     * @return array
+     */
+    private function splitCssAndMediaQuery($css) {
+        $css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
+
+        // filter the CSS
+        $search = array(
+            // get rid of css comment code
+            '/\\/\\*.*\\*\\//sU',
+            // strip out any import directives
+            '/^\\s*@import\\s[^;]+;/misU',
+            // strip remains media enclosures
+            '/^\\s*@media\\s[^{]+{(.*)}\\s*}\\s/misU',
+        );
+
+        $replace = array(
+            '',
+            '',
+            '',
+        );
+
+        // clean CSS before output
+        $css = preg_replace($search, $replace, $css);
+
+        return array('css' => $css, 'media' => self::$_media);
+    }
+
+    private function _media_concat( $matches ) {
+        self::$_media .= $matches[0];
+    }
+
+    /**
+     * Creates a DOMDocument instance with the current HTML.
+     *
+     * @return DOMDocument
+     */
+    private function createXmlDocument() {
+        $xmlDocument = new DOMDocument;
+        $xmlDocument->encoding = self::ENCODING;
+        $xmlDocument->strictErrorChecking = false;
+        $xmlDocument->formatOutput = true;
+        $libXmlState = libxml_use_internal_errors(true);
+        $xmlDocument->loadHTML($this->getUnifiedHtml());
+        libxml_clear_errors();
+        libxml_use_internal_errors($libXmlState);
+        $xmlDocument->normalizeDocument();
+
+        return $xmlDocument;
+    }
+
+    /**
+     * Returns the HTML with the non-ASCII characters converts into HTML entities and the unprocessable HTML tags removed.
+     *
+     * @return string the unified HTML
+     *
+     * @throws BadMethodCallException
+     */
+    private function getUnifiedHtml() {
+        if (!empty($this->unprocessableHtmlTags)) {
+            $unprocessableHtmlTags = implode('|', $this->unprocessableHtmlTags);
+            $bodyWithoutUnprocessableTags = preg_replace('/<\\/?(' . $unprocessableHtmlTags . ')[^>]*>/i', '', $this->html);
+        } else {
+            $bodyWithoutUnprocessableTags = $this->html;
+        }
+
+        if ( function_exists( 'mb_convert_encoding' ) ) {
+            return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
+        } else {
+            return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
+        }
+    }
+
+    /**
+     * @param array $a
+     * @param array $b
+     *
+     * @return integer
+     */
+    private function sortBySelectorPrecedence(array $a, array $b) {
+        $precedenceA = $this->getCssSelectorPrecedence($a['selector']);
+        $precedenceB = $this->getCssSelectorPrecedence($b['selector']);
+
+        // We want these sorted in ascending order so selectors with lesser precedence get processed first and
+        // selectors with greater precedence get sorted last.
+        // The parenthesis around the -1 are necessary to avoid a PHP_CodeSniffer warning about missing spaces around
+        // arithmetic operators.
+        // @see http://forge.typo3.org/issues/55605
+        $precedenceForEquals = ($a['line'] < $b['line'] ? (-1) : 1);
+        $precedenceForNotEquals = ($precedenceA < $precedenceB ? (-1) : 1);
+        return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
+    }
+
+    /**
+     * @param string $selector
+     *
+     * @return integer
+     */
+    private function getCssSelectorPrecedence($selector) {
+        $selectorKey = md5($selector);
+        if (!isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
+            $precedence = 0;
+            $value = 100;
+            // ids: worth 100, classes: worth 10, elements: worth 1
+            $search = array('\\#','\\.','');
+
+            foreach ($search as $s) {
+                if (trim($selector == '')) {
+                    break;
+                }
+                $number = 0;
+                $selector = preg_replace('/' . $s . '\\w+/', '', $selector, -1, $number);
+                $precedence += ($value * $number);
+                $value /= 10;
+            }
+            $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
+        }
+
+        return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
+    }
+
+    /**
+     * Right now, we support all CSS 1 selectors and most CSS2/3 selectors.
+     *
+     * @see http://plasmasturm.org/log/444/
+     *
+     * @param string $paramCssSelector
+     *
+     * @return string
+     */
+    private function translateCssToXpath($paramCssSelector) {
+        $cssSelector = ' ' . $paramCssSelector . ' ';
+        $cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
+        $cssSelector = trim($cssSelector);
+        $xpathKey = md5($cssSelector);
+        if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
+            // returns an Xpath selector
+            $search = array(
+                // Matches any element that is a child of parent.
+                '/\\s+>\\s+/',
+                // Matches any element that is an adjacent sibling.
+                '/\\s+\\+\\s+/',
+                // Matches any element that is a descendant of an parent element element.
+                '/\\s+/',
+                // first-child pseudo-selector
+                '/([^\\/]+):first-child/i',
+                // last-child pseudo-selector
+                '/([^\\/]+):last-child/i',
+                // Matches attribute only selector
+                '/^\\[(\\w+)\\]/',
+                // Matches element with attribute
+                '/(\\w)\\[(\\w+)\\]/',
+                // Matches element with EXACT attribute
+                '/(\\w)\\[(\\w+)\\=[\'"]?(\\w+)[\'"]?\\]/',
+            );
+            $replace = array(
+                '/',
+                '/following-sibling::*[1]/self::',
+                '//',
+                '*[1]/self::\\1',
+                '*[last()]/self::\\1',
+                '*[@\\1]',
+                '\\1[@\\2]',
+                '\\1[@\\2="\\3"]',
+            );
+
+            $cssSelector = '//' . preg_replace($search, $replace, $cssSelector);
+
+            $cssSelector = preg_replace_callback(self::ID_ATTRIBUTE_MATCHER, array($this, 'matchIdAttributes'), $cssSelector);
+            $cssSelector = preg_replace_callback(self::CLASS_ATTRIBUTE_MATCHER, array($this, 'matchClassAttributes'), $cssSelector);
+
+            // Advanced selectors are going to require a bit more advanced emogrification.
+            // When we required PHP 5.3, we could do this with closures.
+            $cssSelector = preg_replace_callback(
+                '/([^\\/]+):nth-child\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
+                array($this, 'translateNthChild'), $cssSelector
+            );
+            $cssSelector = preg_replace_callback(
+                '/([^\\/]+):nth-of-type\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
+                array($this, 'translateNthOfType'), $cssSelector
+            );
+
+            $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey] = $cssSelector;
+        }
+        return $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey];
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function matchIdAttributes(array $match) {
+        return (strlen($match[1]) ? $match[1] : '*') . '[@id="' . $match[2] . '"]';
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function matchClassAttributes(array $match) {
+        return (strlen($match[1]) ? $match[1] : '*') . '[contains(concat(" ",@class," "),concat(" ","' .
+            implode(
+                '"," "))][contains(concat(" ",@class," "),concat(" ","',
+                explode('.', substr($match[2], 1))
+            ) . '"," "))]';
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function translateNthChild(array $match) {
+        $result = $this->parseNth($match);
+
+        if (isset($result[self::MULTIPLIER])) {
+            if ($result[self::MULTIPLIER] < 0) {
+                $result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
+                return sprintf('*[(last() - position()) mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
+            } else {
+                return sprintf('*[position() mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
+            }
+        } else {
+            return sprintf('*[%u]/self::%s', $result[self::INDEX], $match[1]);
+        }
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function translateNthOfType(array $match) {
+        $result = $this->parseNth($match);
+
+        if (isset($result[self::MULTIPLIER])) {
+            if ($result[self::MULTIPLIER] < 0) {
+                $result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
+                return sprintf('%s[(last() - position()) mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
+            } else {
+                return sprintf('%s[position() mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
+            }
+        } else {
+            return sprintf('%s[%u]', $match[1], $result[self::INDEX]);
+        }
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return array
+     */
+    private function parseNth(array $match) {
+        if (in_array(strtolower($match[2]), array('even','odd'))) {
+            $index = strtolower($match[2]) == 'even' ? 0 : 1;
+            return array(self::MULTIPLIER => 2, self::INDEX => $index);
+        } elseif (stripos($match[2], 'n') === false) {
+            // if there is a multiplier
+            $index = intval(str_replace(' ', '', $match[2]));
+            return array(self::INDEX => $index);
+        } else {
+            if (isset($match[3])) {
+                $multipleTerm = str_replace($match[3], '', $match[2]);
+                $index = intval(str_replace(' ', '', $match[3]));
+            } else {
+                $multipleTerm = $match[2];
+                $index = 0;
+            }
+
+            $multiplier = str_ireplace('n', '', $multipleTerm);
+
+            if (!strlen($multiplier)) {
+                $multiplier = 1;
+            } elseif ($multiplier == 0) {
+                return array(self::INDEX => $index);
+            } else {
+                $multiplier = intval($multiplier);
+            }
+
+            while ($index < 0) {
+                $index += abs($multiplier);
+            }
+
+            return array(self::MULTIPLIER => $multiplier, self::INDEX => $index);
+        }
+    }
+
+    /**
+     * Parses a CSS declaration block into property name/value pairs.
+     *
+     * Example:
+     *
+     * The declaration block.
+     *
+     *   "color: #000; font-weight: bold;".
+     *
+     * will be parsed into the following array:
+     *
+     *   "color" => "#000"
+     *   "font-weight" => "bold"
+     *
+     * @param string $cssDeclarationBlock the CSS declaration block without the curly braces, may be empty
+     *
+     * @return array the CSS declarations with the property names as array keys and the property values as array values
+     */
+    private function parseCssDeclarationBlock($cssDeclarationBlock) {
+        if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock])) {
+            return $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock];
+        }
+
+        $properties = array();
+        $declarations = explode(';', $cssDeclarationBlock);
+        foreach ($declarations as $declaration) {
+            $matches = array();
+            if (!preg_match('/ *([A-Za-z\\-]+) *: *([^;]+) */', $declaration, $matches)) {
+                continue;
+            }
+            $propertyName = strtolower($matches[1]);
+            $propertyValue = $matches[2];
+            $properties[$propertyName] = $propertyValue;
+        }
+        $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock] = $properties;
+
+        return $properties;
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -238,7 +238,7 @@ 
 		if ($nodesWithStyleAttributes !== false) {
 			/** @var $nodeWithStyleAttribute DOMNode */
 			foreach ($nodesWithStyleAttributes as $node) {
-				$normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
+				$normalizedOriginalStyle = preg_replace_callback('/[A-z\\-]+(?=\\:)/S', array($this, 'strtolower'), $node->getAttribute('style'));
 
 				// in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
 				$nodePath = $node->getNodePath();
@@ -289,7 +289,7 @@ 
 			}
 
 			// now sort the selectors by precedence
-			usort($allSelectors, array($this,'sortBySelectorPrecedence'));
+			usort($allSelectors, array($this, 'sortBySelectorPrecedence'));
 
 			$this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
 		}
@@ -329,7 +329,7 @@ 
 		if ($nodesWithStyleDisplayNone->length > 0) {
 			/** @var $node \DOMNode */
 			foreach ($nodesWithStyleDisplayNone as $node) {
-				if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
+				if ($node->parentNode && is_callable(array($node->parentNode, 'removeChild'))) {
 					$node->parentNode->removeChild($node);
 				}
 			}
@@ -338,10 +338,10 @@ 
 		$this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
 
 		if ($this->preserveEncoding) {
-			if ( function_exists( 'mb_convert_encoding' ) ) {
-				return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
+			if (function_exists('mb_convert_encoding')) {
+				return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES');
 			} else {
-				return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
+				return htmlspecialchars_decode(utf8_encode(html_entity_decode($xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING)));
 			}
 		} else {
 			return $xmlDocument->saveHTML();
@@ -462,7 +462,7 @@ 
 	 * @return array
 	 */
 	private function splitCssAndMediaQuery($css) {
-		$css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
+		$css = preg_replace_callback('#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array($this, '_media_concat'), $css);
 
 		// filter the CSS
 		$search = array(
@@ -486,7 +486,7 @@ 
 		return array('css' => $css, 'media' => self::$_media);
 	}
 
-	private function _media_concat( $matches ) {
+	private function _media_concat($matches) {
 		self::$_media .= $matches[0];
 	}
 
@@ -524,10 +524,10 @@ 
 			$bodyWithoutUnprocessableTags = $this->html;
 		}
 
-		if ( function_exists( 'mb_convert_encoding' ) ) {
-			return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING);
 		} else {
-			return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
+			return htmlspecialchars_decode(utf8_decode(htmlentities($bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false)));
 		}
 	}
 
@@ -562,7 +562,7 @@ 
 			$precedence = 0;
 			$value = 100;
 			// ids: worth 100, classes: worth 10, elements: worth 1
-			$search = array('\\#','\\.','');
+			$search = array('\\#', '\\.', '');
 
 			foreach ($search as $s) {
 				if (trim($selector == '')) {
@@ -590,7 +590,7 @@ 
 	 */
 	private function translateCssToXpath($paramCssSelector) {
 		$cssSelector = ' ' . $paramCssSelector . ' ';
-		$cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
+		$cssSelector = preg_replace_callback('/\s+\w+\s+/', array($this, 'strtolower'), $cssSelector);
 		$cssSelector = trim($cssSelector);
 		$xpathKey = md5($cssSelector);
 		if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
@@ -713,7 +713,7 @@ 
 	 * @return array
 	 */
 	private function parseNth(array $match) {
-		if (in_array(strtolower($match[2]), array('even','odd'))) {
+		if (in_array(strtolower($match[2]), array('even', 'odd'))) {
 			$index = strtolower($match[2]) == 'even' ? 0 : 1;
 			return array(self::MULTIPLIER => 2, self::INDEX => $index);
 		} elseif (stripos($match[2], 'n') === false) {