AyeCode / invoicing

widgets/buy-item.php

Spacing +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,40 +23,40 @@ 
             'block-keywords'=> "['invoicing','buy', 'buy item']",
             'class_name'     => __CLASS__,
             'base_id'       => 'wpinv_buy',
-            'name'          => __('Invoicing > Buy Item Button','invoicing'),
+            'name'          => __('Invoicing > Buy Item Button', 'invoicing'),
             'widget_ops'    => array(
                 'classname'   => 'wpinv-buy-item-class  wpi-g',
-                'description' => esc_html__('Displays buy invoicing item button.','invoicing'),
+                'description' => esc_html__('Displays buy invoicing item button.', 'invoicing'),
             ),
             'arguments'     => array(
                 'title'  => array(
-                    'title'       => __( 'Widget title', 'invoicing' ),
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'title'       => __('Widget title', 'invoicing'),
+                    'desc'        => __('Enter widget title.', 'invoicing'),
                     'type'        => 'text',
                     'desc_tip'    => true,
                     'default'     => '',
                     'advanced'    => false
                 ),
                 'items'  => array(
-	                'title'       => __( 'Items to buy', 'invoicing' ),
-	                'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
+	                'title'       => __('Items to buy', 'invoicing'),
+	                'desc'        => __('Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing'),
 	                'type'        => 'text',
 	                'desc_tip'    => true,
 	                'default'     => '',
-	                'placeholder' => __('Items to buy','invoicing'),
+	                'placeholder' => __('Items to buy', 'invoicing'),
 	                'advanced'    => false
                 ),
                 'label'  => array(
-	                'title'       => __( 'Button Label', 'invoicing' ),
-	                'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
+	                'title'       => __('Button Label', 'invoicing'),
+	                'desc'        => __('Enter button label. Default "Buy Now".', 'invoicing'),
 	                'type'        => 'text',
 	                'desc_tip'    => true,
-	                'default'     => __( 'Buy Now', 'invoicing' ),
+	                'default'     => __('Buy Now', 'invoicing'),
 	                'advanced'    => false
                 ),
                 'post_id'  => array(
-	                'title'       => __( 'Post ID', 'invoicing' ),
-	                'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
+	                'title'       => __('Post ID', 'invoicing'),
+	                'desc'        => __('Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing'),
 	                'type'        => 'number',
 	                'desc_tip'    => true,
 	                'default'     => '',
@@ -67,7 +67,7 @@ 
         );
 
 
-        parent::__construct( $options );
+        parent::__construct($options);
     }
 
 	/**
@@ -79,31 +79,31 @@ 
 	 *
 	 * @return string
 	 */
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+    public function output($args = array(), $widget_args = array(), $content = '') {
 
 	    $defaults = array(
 		    'items'     	=> '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
-		    'label'  	    => __( 'Buy Now', 'invoicing' ), // the button title
+		    'label'  	    => __('Buy Now', 'invoicing'), // the button title
 		    'post_id'   	=> '', // any related post_id
 	    );
 
 	    /**
 	     * Parse incoming $args into an array and merge it with $defaults
 	     */
-	    $args = wp_parse_args( $args, $defaults );
+	    $args = wp_parse_args($args, $defaults);
 
 		$html = '<div class="wpi-buy-button-wrapper wpi-g">';
 		
-		if ( empty( $args['items'] ) ) {
-			$html .= __( 'No items selected', 'invoicing' );
+		if (empty($args['items'])) {
+			$html .= __('No items selected', 'invoicing');
 		} else {
-			$post_id = isset( $args['post_id'] ) && is_numeric( $args['post_id'] ) ? sanitize_text_field( $args['post_id'] ) : 0;
-			$label   = isset( $args['label'] ) ? sanitize_text_field( $args['label'] ) : __( 'Buy Now', 'invoicing' );
-			$items   = esc_attr( $args['items'] );
+			$post_id = isset($args['post_id']) && is_numeric($args['post_id']) ? sanitize_text_field($args['post_id']) : 0;
+			$label   = isset($args['label']) ? sanitize_text_field($args['label']) : __('Buy Now', 'invoicing');
+			$items   = esc_attr($args['items']);
 			$html   .= "<button class='button button-primary wpi-buy-button' type='button' onclick=\"wpi_buy(this, '$items','$post_id');\">$label</button>";
 		}
 	
-	    $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
+	    $html .= wp_nonce_field('wpinv_buy_items', 'wpinv_buy_nonce', true, false);
 	    $html .= '</div>';
 
 	    return $html;

includes/gateways/paypal.php

Spacing +283 added lines, -283 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_paypal_cc_form', '__return_false' );
-add_filter( 'wpinv_paypal_support_subscription', '__return_true' );
+add_action('wpinv_paypal_cc_form', '__return_false');
+add_filter('wpinv_paypal_support_subscription', '__return_true');
 
-function wpinv_process_paypal_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_paypal_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     // Collect payment data
@@ -25,30 +25,30 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
 
     // Check payment
-    if ( ! $invoice ) {
+    if (!$invoice) {
         // Record the error
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // Problems? send back
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     } else {
         // Only send to PayPal if the pending payment is created successfully
-        $listener_url = wpinv_get_ipn_url( 'paypal' );
+        $listener_url = wpinv_get_ipn_url('paypal');
 
         // Get the success url
-        $return_url = add_query_arg( array(
+        $return_url = add_query_arg(array(
                 'payment-confirm' => 'paypal',
                 'invoice-id' => $invoice->ID
-            ), get_permalink( wpinv_get_option( 'success_page', false ) ) );
+            ), get_permalink(wpinv_get_option('success_page', false)));
 
         // Get the PayPal redirect uri
-        $paypal_redirect = trailingslashit( wpinv_get_paypal_redirect() ) . '?';
+        $paypal_redirect = trailingslashit(wpinv_get_paypal_redirect()) . '?';
 
         // Setup PayPal arguments
         $paypal_args = array(
-            'business'      => wpinv_get_option( 'paypal_email', false ),
+            'business'      => wpinv_get_option('paypal_email', false),
             'email'         => $invoice->get_email(),
             'first_name'    => $invoice->get_first_name(),
             'last_name'     => $invoice->get_last_name(),
@@ -57,16 +57,16 @@ 
             'shipping'      => '0',
             'no_note'       => '1',
             'currency_code' => wpinv_get_currency(),
-            'charset'       => get_bloginfo( 'charset' ),
+            'charset'       => get_bloginfo('charset'),
             'custom'        => $invoice->ID,
             'rm'            => '2',
             'return'        => $return_url,
             'cancel_return' => $invoice->get_checkout_payment_url(),
             'notify_url'    => $listener_url,
-            'cbt'           => get_bloginfo( 'name' ),
+            'cbt'           => get_bloginfo('name'),
             'bn'            => 'WPInvoicing_SP',
             'lc'            => 'US', // this will force paypal site to english
-            'landing_page'  => apply_filters( 'wpinv_paypal_standard_landing_page', 'billing', $invoice ), // 'login' or 'billing'. login - PayPal account login, billing - Non-PayPal account.
+            'landing_page'  => apply_filters('wpinv_paypal_standard_landing_page', 'billing', $invoice), // 'login' or 'billing'. login - PayPal account login, billing - Non-PayPal account.
         );
 
         $paypal_args['address1'] = $invoice->get_address();
@@ -80,83 +80,83 @@ 
             'upload' => '1'
         );
 
-        $paypal_args = array_merge( $paypal_extra_args, $paypal_args );
+        $paypal_args = array_merge($paypal_extra_args, $paypal_args);
 
         // Add cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {
                 $item['quantity'] = $item['quantity'] > 0 ? $item['quantity'] : 1;
-                $item_amount = wpinv_sanitize_amount( $item['subtotal'] / $item['quantity'], 2 );
+                $item_amount = wpinv_sanitize_amount($item['subtotal'] / $item['quantity'], 2);
 
-                if ( $item_amount <= 0 ) {
+                if ($item_amount <= 0) {
                     $item_amount = 0;
                 }
 
-                $paypal_args['item_number_' . $i ]      = $item['id'];
-                $paypal_args['item_name_' . $i ]        = stripslashes_deep( html_entity_decode( wpinv_get_cart_item_name( $item ), ENT_COMPAT, 'UTF-8' ) );
-                $paypal_args['quantity_' . $i ]         = $item['quantity'];
-                $paypal_args['amount_' . $i ]           = $item_amount;
-                $paypal_args['discount_amount_' . $i ]  = wpinv_sanitize_amount( $item['discount'], 2 );
+                $paypal_args['item_number_' . $i]      = $item['id'];
+                $paypal_args['item_name_' . $i]        = stripslashes_deep(html_entity_decode(wpinv_get_cart_item_name($item), ENT_COMPAT, 'UTF-8'));
+                $paypal_args['quantity_' . $i]         = $item['quantity'];
+                $paypal_args['amount_' . $i]           = $item_amount;
+                $paypal_args['discount_amount_' . $i]  = wpinv_sanitize_amount($item['discount'], 2);
 
                 $i++;
             }
         }
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() ) {
-            $paypal_args['tax_cart'] = wpinv_sanitize_amount( (float)$invoice->get_tax(), 2 );
+        if (wpinv_use_taxes()) {
+            $paypal_args['tax_cart'] = wpinv_sanitize_amount((float) $invoice->get_tax(), 2);
         }
 
-        $paypal_args = apply_filters( 'wpinv_paypal_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_args', $paypal_args, $purchase_data, $invoice);
 
         // Build query
-        $paypal_redirect .= http_build_query( $paypal_args );
+        $paypal_redirect .= http_build_query($paypal_args);
 
         // Fix for some sites that encode the entities
-        $paypal_redirect = str_replace( '&amp;', '&', $paypal_redirect );
+        $paypal_redirect = str_replace('&amp;', '&', $paypal_redirect);
 
         // Get rid of cart contents
         wpinv_empty_cart();
         
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
     }
 }
-add_action( 'wpinv_gateway_paypal', 'wpinv_process_paypal_payment' );
+add_action('wpinv_gateway_paypal', 'wpinv_process_paypal_payment');
 
-function wpinv_get_paypal_recurring_args( $paypal_args, $purchase_data, $invoice ) {
-    if ( $invoice->is_recurring() && $item_id = $invoice->get_recurring() ) {
-        $item   = new WPInv_Item( $item_id );
+function wpinv_get_paypal_recurring_args($paypal_args, $purchase_data, $invoice) {
+    if ($invoice->is_recurring() && $item_id = $invoice->get_recurring()) {
+        $item = new WPInv_Item($item_id);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return $paypal_args;
         }
 
         $period             = $item->get_recurring_period();
         $interval           = $item->get_recurring_interval();
-        $bill_times         = (int)$item->get_recurring_limit();
+        $bill_times         = (int) $item->get_recurring_limit();
         
-        $initial_amount     = wpinv_sanitize_amount( $invoice->get_total(), 2 );
-        $recurring_amount   = wpinv_sanitize_amount( $invoice->get_recurring_details( 'total' ), 2 );
+        $initial_amount     = wpinv_sanitize_amount($invoice->get_total(), 2);
+        $recurring_amount   = wpinv_sanitize_amount($invoice->get_recurring_details('total'), 2);
         
         $paypal_args['cmd'] = '_xclick-subscriptions';
         $paypal_args['sra'] = '1';
         $paypal_args['src'] = '1';
         
         // Set item description
-        $item_name                  = sprintf( '[%s] %s', $invoice->get_number(), wpinv_get_cart_item_name( array( 'id' => $item->ID ) ) );
-        $paypal_args['item_name']   = stripslashes_deep( html_entity_decode( $item_name, ENT_COMPAT, 'UTF-8' ) );
+        $item_name                  = sprintf('[%s] %s', $invoice->get_number(), wpinv_get_cart_item_name(array('id' => $item->ID)));
+        $paypal_args['item_name']   = stripslashes_deep(html_entity_decode($item_name, ENT_COMPAT, 'UTF-8'));
         
-        if ( $invoice->is_free_trial() && $item->has_free_trial() ) {
+        if ($invoice->is_free_trial() && $item->has_free_trial()) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $item->get_trial_interval();
             $paypal_args['t1']  = $item->get_trial_period();
             
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
-        } else if ( $initial_amount != $recurring_amount && $bill_times != 1 ) {
+        } else if ($initial_amount != $recurring_amount && $bill_times != 1) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $interval;
             $paypal_args['t1']  = $period;
@@ -164,63 +164,63 @@ 
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
             
-            if ( $bill_times > 1 ) {
+            if ($bill_times > 1) {
                 $bill_times--;
             }
         } else {
-            $paypal_args['a3']  = $initial_amount;
+            $paypal_args['a3'] = $initial_amount;
         }
         
         $paypal_args['p3']  = $interval;
         $paypal_args['t3']  = $period;
         
-        if ( $bill_times > 1 ) {
+        if ($bill_times > 1) {
             // Make sure it's not over the max of 52
-            $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+            $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
         }
                 
         // Remove cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {                
-                if ( isset( $paypal_args['item_number_' . $i] ) ) {
-                    unset( $paypal_args['item_number_' . $i] );
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {                
+                if (isset($paypal_args['item_number_' . $i])) {
+                    unset($paypal_args['item_number_' . $i]);
                 }
-                if ( isset( $paypal_args['item_name_' . $i] ) ) {
-                    unset( $paypal_args['item_name_' . $i] );
+                if (isset($paypal_args['item_name_' . $i])) {
+                    unset($paypal_args['item_name_' . $i]);
                 }
-                if ( isset( $paypal_args['quantity_' . $i] ) ) {
-                    unset( $paypal_args['quantity_' . $i] );
+                if (isset($paypal_args['quantity_' . $i])) {
+                    unset($paypal_args['quantity_' . $i]);
                 }
-                if ( isset( $paypal_args['amount_' . $i] ) ) {
-                    unset( $paypal_args['amount_' . $i] );
+                if (isset($paypal_args['amount_' . $i])) {
+                    unset($paypal_args['amount_' . $i]);
                 }
-                if ( isset( $paypal_args['discount_amount_' . $i] ) ) {
-                    unset( $paypal_args['discount_amount_' . $i] );
+                if (isset($paypal_args['discount_amount_' . $i])) {
+                    unset($paypal_args['discount_amount_' . $i]);
                 }
 
                 $i++;
             }
         }
         
-        if ( isset( $paypal_args['tax_cart'] ) ) {
-            unset( $paypal_args['tax_cart'] );
+        if (isset($paypal_args['tax_cart'])) {
+            unset($paypal_args['tax_cart']);
         }
                 
-        if ( isset( $paypal_args['upload'] ) ) {
-            unset( $paypal_args['upload'] );
+        if (isset($paypal_args['upload'])) {
+            unset($paypal_args['upload']);
         }
         
-        $paypal_args = apply_filters( 'wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice);
     }
     
     return $paypal_args;
 }
-add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
+add_filter('wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3);
 
 function wpinv_process_paypal_ipn() {
 	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
 		return;
 	}
 
@@ -228,11 +228,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';
@@ -241,43 +241,43 @@ 
 	$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;
+		$encoded_data .= $arg_separator . $post_data;
 	} else {
 		// Check if POST is empty
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			// Nothing to do
 			return;
 		} else {
 			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
+			foreach ($_POST 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
-	wp_parse_str( $encoded_data, $encoded_data_array );
+	wp_parse_str($encoded_data, $encoded_data_array);
 
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&amp;', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
+	foreach ($encoded_data_array as $key => $value) {
+		if (false !== strpos($key, 'amp;')) {
+			$new_key = str_replace('&amp;', '&', $key);
+			$new_key = str_replace('amp;', '&', $new_key);
 
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
+			unset($encoded_data_array[$key]);
+			$encoded_data_array[$new_key] = $value;
 		}
 	}
 
 	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
+	$paypal_redirect = wpinv_get_paypal_redirect(true);
 
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+	if (!wpinv_get_option('disable_paypal_verification', false)) {
 		// Validate the IPN
 
-		$remote_post_vars      = array(
+		$remote_post_vars = array(
 			'method'           => 'POST',
 			'timeout'          => 45,
 			'redirection'      => 5,
@@ -295,21 +295,21 @@ 
 		);
 
 		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+		$api_response = wp_remote_post(wpinv_get_paypal_redirect(), $remote_post_vars);
 
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if (is_wp_error($api_response)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Something went wrong
 		}
 
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if ($api_response['body'] !== 'VERIFIED' && wpinv_get_option('disable_paypal_verification', false)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Response not okay
 		}
 	}
 
 	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+	if (!is_array($encoded_data_array) && !empty($encoded_data_array))
 		return;
 
 	$defaults = array(
@@ -317,265 +317,265 @@ 
 		'payment_status' => ''
 	);
 
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+	$encoded_data_array = wp_parse_args($encoded_data_array, $defaults);
 
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+	$invoice_id = isset($encoded_data_array['custom']) ? absint($encoded_data_array['custom']) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-	wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
+	wpinv_error_log($encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__);
+	wpinv_error_log($encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__);
 
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+	if (has_action('wpinv_paypal_' . $encoded_data_array['txn_type'])) {
 		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id);
 	} else {
 		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_web_accept', $encoded_data_array, $invoice_id);
 	}
 	exit;
 }
-add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
+add_action('wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn');
 
-function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+function wpinv_process_paypal_web_accept_and_cart($data, $invoice_id) {
+	if ($data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded') {
 		return;
 	}
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
 	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+	$purchase_key   = isset($data['invoice']) ? $data['invoice'] : $data['item_number'];
 	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+	$payment_status = strtolower($data['payment_status']);
+	$currency_code  = strtolower($data['mc_currency']);
+	$business_email = isset($data['business']) && is_email($data['business']) ? trim($data['business']) : trim($data['receiver_email']);
+	$payment_meta   = wpinv_get_invoice_meta($invoice_id);
 
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+	if (wpinv_get_payment_gateway($invoice_id) != 'paypal') {
 		return; // this isn't a PayPal standard IPN
 	}
 
 	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
+	if (strcasecmp($business_email, trim(wpinv_get_option('paypal_email', false))) != 0) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid business email in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid PayPal business email.', 'invoicing'), '', '', true);
 		return;
 	}
 
 	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
+	if ($currency_code != strtolower($payment_meta['currency'])) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid currency in PayPal IPN.', 'invoicing'), '', '', true);
 		return;
 	}
 
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+	if (!wpinv_get_payment_user_email($invoice_id)) {
 		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
 		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_email', $data['payer_email']);
 
 		// Setup and store the customer's details
 		$user_info = array(
 			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
+			'email'      => sanitize_text_field($data['payer_email']),
+			'first_name' => sanitize_text_field($data['first_name']),
+			'last_name'  => sanitize_text_field($data['last_name']),
 			'discount'   => '',
 		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+		$user_info['address'] = !empty($data['address_street']) ? sanitize_text_field($data['address_street']) : false;
+		$user_info['city']    = !empty($data['address_city']) ? sanitize_text_field($data['address_city']) : false;
+		$user_info['state']   = !empty($data['address_state']) ? sanitize_text_field($data['address_state']) : false;
+		$user_info['country'] = !empty($data['address_country_code']) ? sanitize_text_field($data['address_country_code']) : false;
+		$user_info['zip']     = !empty($data['address_zip']) ? sanitize_text_field($data['address_zip']) : false;
 
 		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_payment_meta', $payment_meta);
 	}
 
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+	if ($payment_status == 'refunded' || $payment_status == 'reversed') {
 		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
+		wpinv_process_paypal_refund($data, $invoice_id);
 	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
+		if (get_post_status($invoice_id) == 'publish') {
 			return; // Only paid payments once
 		}
 
 		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
+		$payment_amount = wpinv_payment_total($invoice_id);
 
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+		if (number_format((float) $paypal_amount, 2) < number_format((float) $payment_amount, 2)) {
 			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid payment amount in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid amount in PayPal IPN.', 'invoicing'), '', '', true);
 			return;
 		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+		if ($purchase_key != wpinv_get_payment_key($invoice_id)) {
 			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid purchase key in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing'), '', '', true);
 			return;
 		}
 
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+		if ('complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode('paypal')) {
+			wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $data['txn_id']), '', '', true);
+			wpinv_set_payment_transaction_id($invoice_id, $data['txn_id']);
+			wpinv_update_payment_status($invoice_id, 'publish');
+		} else if ('pending' == $payment_status && isset($data['pending_reason'])) {
 			// Look for possible pending reasons, such as an echeck
 			$note = '';
 
-			switch( strtolower( $data['pending_reason'] ) ) {
+			switch (strtolower($data['pending_reason'])) {
 				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+					$note = __('Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing');
 					break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+					$note = __('Payment must be accepted manually through PayPal due to international account regulations', 'invoicing');
 					break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+					$note = __('Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing');
 					break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+					$note = __('Payment was sent to non-confirmed or non-registered email address.', 'invoicing');
 					break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+					$note = __('PayPal account must be upgraded before this payment can be accepted', 'invoicing');
 					break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+					$note = __('PayPal account is not verified. Verify account in order to accept this payment', 'invoicing');
 					break;
 
 				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+					$note = __('Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing');
 					break;
 			}
 
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
+			if (!empty($note)) {
+				wpinv_insert_payment_note($invoice_id, $note, '', '', true);
 			}
 		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
+			wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal IPN has been received with invalid payment status: %s', 'invoicing'), $payment_status), '', '', true);
 		}
 	}
 }
-add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
+add_action('wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2);
 
 // Process PayPal subscription sign ups
-add_action( 'wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup' );
+add_action('wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup');
 
 // Process PayPal subscription payments
-add_action( 'wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment' );
+add_action('wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment');
 
 // Process PayPal subscription cancellations
-add_action( 'wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel' );
+add_action('wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel');
 
 // Process PayPal subscription end of term notices
-add_action( 'wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot' );
+add_action('wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot');
 
 // Process PayPal payment failed
-add_action( 'wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed' );
+add_action('wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed');
 
 
 /**
  * Process the subscription started IPN.
  */
-function wpinv_process_paypal_subscr_signup( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
-    if( empty( $parent_invoice_id ) ) {
+function wpinv_process_paypal_subscr_signup($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
+    if (empty($parent_invoice_id)) {
         return;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
-    if ( $invoice->is_free_trial() && !empty( $ipn_data['invoice'] ) ) {
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Invoice ID: %s', 'invoicing' ) , $ipn_data['invoice'] ), '', '', true);
-        if ( !empty( $ipn_data['txn_id'] ) ) {
-            wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['txn_id'] );
+    if ($invoice->is_free_trial() && !empty($ipn_data['invoice'])) {
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Invoice ID: %s', 'invoicing'), $ipn_data['invoice']), '', '', true);
+        if (!empty($ipn_data['txn_id'])) {
+            wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['txn_id']);
         }
     }
 
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
     
-    wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    wpinv_update_payment_status($parent_invoice_id, 'publish');
     sleep(1);
-    wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $ipn_data['subscr_id'] ), '', '', true );
-    update_post_meta($parent_invoice_id,'_wpinv_subscr_profile_id', $ipn_data['subscr_id']);
+    wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']), '', '', true);
+    update_post_meta($parent_invoice_id, '_wpinv_subscr_profile_id', $ipn_data['subscr_id']);
 
     $status     = 'trialling' == $subscription->status ? 'trialling' : 'active';
-    $diff_days  = absint( ( ( strtotime( $subscription->expiration ) - strtotime( $subscription->created ) ) / DAY_IN_SECONDS ) );
-    $created    = date_i18n( 'Y-m-d H:i:s' );
-    $expiration = date_i18n( 'Y-m-d 23:59:59', ( strtotime( $created ) + ( $diff_days * DAY_IN_SECONDS ) ) );
+    $diff_days  = absint(((strtotime($subscription->expiration) - strtotime($subscription->created)) / DAY_IN_SECONDS));
+    $created    = date_i18n('Y-m-d H:i:s');
+    $expiration = date_i18n('Y-m-d 23:59:59', (strtotime($created) + ($diff_days * DAY_IN_SECONDS)));
 
     // Retrieve pending subscription from database and update it's status to active and set proper profile ID
-    $subscription->update( array( 'profile_id' => $ipn_data['subscr_id'], 'status' => $status, 'created' => $created, 'expiration' => $expiration ) );
+    $subscription->update(array('profile_id' => $ipn_data['subscr_id'], 'status' => $status, 'created' => $created, 'expiration' => $expiration));
 }
 
 /**
  * Process the subscription payment received IPN.
  */
-function wpinv_process_paypal_subscr_payment( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_process_paypal_subscr_payment($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
 
-    $parent_invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $parent_invoice ) ) {
+    $parent_invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($parent_invoice)) {
         return;
     }
 
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
 
-    $transaction_id = wpinv_get_payment_transaction_id( $parent_invoice_id );
+    $transaction_id = wpinv_get_payment_transaction_id($parent_invoice_id);
     $times_billed   = $subscription->get_times_billed();
-    $signup_date    = strtotime( $subscription->created );
-    $today          = date( 'Ynd', $signup_date ) == date( 'Ynd', strtotime( $ipn_data['payment_date'] ) );
+    $signup_date    = strtotime($subscription->created);
+    $today          = date('Ynd', $signup_date) == date('Ynd', strtotime($ipn_data['payment_date']));
 
     // Look to see if payment is same day as signup and we have set the transaction ID on the parent payment yet.
-    if ( (empty($times_billed) || $today) && ( !$transaction_id || $transaction_id == $parent_invoice_id ) ) {
-        wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    if ((empty($times_billed) || $today) && (!$transaction_id || $transaction_id == $parent_invoice_id)) {
+        wpinv_update_payment_status($parent_invoice_id, 'publish');
         sleep(1);
         
         // This is the very first payment
-        wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['txn_id'] );
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ), '', '', true );
+        wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['txn_id']);
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']), '', '', true);
         return;
     }
 
-    if ( wpinv_get_id_by_transaction_id( $ipn_data['txn_id'] ) ) {
+    if (wpinv_get_id_by_transaction_id($ipn_data['txn_id'])) {
         return; // Payment already recorded
     }
 
-    $currency_code = strtolower( $ipn_data['mc_currency'] );
+    $currency_code = strtolower($ipn_data['mc_currency']);
 
     // verify details
-    if ( $currency_code != strtolower( wpinv_get_currency() ) ) {
+    if ($currency_code != strtolower(wpinv_get_currency())) {
         // the currency code is invalid
-        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: ', 'invoicing' ), json_encode( $ipn_data ) ) );
+        wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: ', 'invoicing'), json_encode($ipn_data)));
         return;
     }
 
@@ -585,11 +585,11 @@ 
         'gateway'        => 'paypal'
     );
     
-    $invoice_id = $subscription->add_payment( $args );
+    $invoice_id = $subscription->add_payment($args);
 
-    if ( $invoice_id > 0 ) {
-        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ), '', '', true );
-        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $ipn_data['subscr_id'] ), '', '', true );
+    if ($invoice_id > 0) {
+        wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']), '', '', true);
+        wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']), '', '', true);
 
         $subscription->renew();
     }
@@ -598,10 +598,10 @@ 
 /**
  * Process the subscription canceled IPN.
  */
-function wpinv_process_paypal_subscr_cancel( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_cancel($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -611,10 +611,10 @@ 
 /**
  * Process the subscription expired IPN.
  */
-function wpinv_process_paypal_subscr_eot( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_eot($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -624,40 +624,40 @@ 
 /**
  * Process the subscription payment failed IPN.
  */
-function wpinv_process_paypal_subscr_failed( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_failed($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
     $subscription->failing();
 
-    do_action( 'wpinv_recurring_payment_failed', $subscription );
+    do_action('wpinv_recurring_payment_failed', $subscription);
 }
 
 /**
  * Retrieve the subscription this IPN notice is for.
  */
-function wpinv_get_paypal_subscription( $ipn_data = array() ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_get_paypal_subscription($ipn_data = array()) {
+    $parent_invoice_id = absint($ipn_data['custom']);
 
-    if( empty( $parent_invoice_id ) ) {
+    if (empty($parent_invoice_id)) {
         return false;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    $subscription = new WPInv_Subscription( $ipn_data['subscr_id'], true );
+    $subscription = new WPInv_Subscription($ipn_data['subscr_id'], true);
 
-    if ( ! ( ! empty( $subscription ) && $subscription->id > 0 ) ) {
-        $subscription = wpinv_get_subscription( $parent_invoice_id );
+    if (!(!empty($subscription) && $subscription->id > 0)) {
+        $subscription = wpinv_get_subscription($parent_invoice_id);
 
-        if ( ! empty( $subscription ) && $subscription->id > 0 ) {
-            $subscription->update( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+        if (!empty($subscription) && $subscription->id > 0) {
+            $subscription->update(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
         } else {
             return false;
         }
@@ -667,46 +667,46 @@ 
 
 }
 
-function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
+function wpinv_process_paypal_refund($data, $invoice_id = 0) {
 	// Collect payment details
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+	if (get_post_status($invoice_id) == 'wpi-refunded') {
 		return; // Only refund payments once
 	}
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
+	$payment_amount = wpinv_payment_total($invoice_id);
 	$refund_amount  = $data['mc_gross'] * -1;
 
-	do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
+	do_action('wpinv_paypal_refund_request', $data, $invoice_id);
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+	if (number_format((float) $refund_amount, 2) < number_format((float) $payment_amount, 2)) {
+		wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing'), (float) $refund_amount . ' ' . $data['mc_currency'], $data['parent_txn_id'], $data['reason_code']), '', '', true);
 
-		do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
+		do_action('wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount);
 
 		return; // This is a partial refund
 	}
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Payment #%s Refunded for reason: %s', 'invoicing'), $data['parent_txn_id'], $data['reason_code']), '', '', true);
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Refund Transaction ID: %s', 'invoicing'), $data['txn_id']), '', '', true);
+	wpinv_update_payment_status($invoice_id, 'wpi-refunded');
 
-	do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
+	do_action('wpinv_paypal_invoice_fully_refunded', $data, $invoice_id);
 }
 
-function wpinv_get_paypal_redirect( $ssl_check = false ) {
-    if ( is_ssl() || ! $ssl_check ) {
+function wpinv_get_paypal_redirect($ssl_check = false) {
+    if (is_ssl() || !$ssl_check) {
         $protocol = 'https://';
     } else {
         $protocol = 'http://';
     }
 
     // Check the current payment mode
-    if ( wpinv_is_test_mode( 'paypal' ) ) {
+    if (wpinv_is_test_mode('paypal')) {
         // Test mode
         $paypal_uri = $protocol . 'www.sandbox.paypal.com/cgi-bin/webscr';
     } else {
@@ -714,120 +714,120 @@ 
         $paypal_uri = $protocol . 'www.paypal.com/cgi-bin/webscr';
     }
 
-    return apply_filters( 'wpinv_paypal_uri', $paypal_uri );
+    return apply_filters('wpinv_paypal_uri', $paypal_uri);
 }
 
-function wpinv_paypal_success_page_content( $content ) {
+function wpinv_paypal_success_page_content($content) {
     global $wpi_invoice;
     
     $session = wpinv_get_checkout_session();
 
-    if ( empty( $_GET['invoice-id'] ) && empty( $session['invoice_key'] )  ) {
+    if (empty($_GET['invoice-id']) && empty($session['invoice_key'])) {
         return $content;
     }
 
-    $invoice_id = !empty( $_GET['invoice-id'] ) ? absint( $_GET['invoice-id'] ) : wpinv_get_invoice_id_by_key( $session['invoice_key'] );
+    $invoice_id = !empty($_GET['invoice-id']) ? absint($_GET['invoice-id']) : wpinv_get_invoice_id_by_key($session['invoice_key']);
 
-    if ( empty(  $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return $content;
     }
 
-    $wpi_invoice = wpinv_get_invoice( $invoice_id );
+    $wpi_invoice = wpinv_get_invoice($invoice_id);
     
-    if ( !empty( $wpi_invoice ) && 'wpi-pending' == $wpi_invoice->status ) {
+    if (!empty($wpi_invoice) && 'wpi-pending' == $wpi_invoice->status) {
         // Payment is still pending so show processing indicator to fix the Race Condition, issue #
         ob_start();
-        wpinv_get_template_part( 'wpinv-payment-processing' );
+        wpinv_get_template_part('wpinv-payment-processing');
         $content = ob_get_clean();
     }
 
     return $content;
 }
-add_filter( 'wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content' );
+add_filter('wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content');
 
-function wpinv_paypal_get_transaction_id( $invoice_id ) {
+function wpinv_paypal_get_transaction_id($invoice_id) {
     $transaction_id = '';
-    $notes = wpinv_get_invoice_notes( $invoice_id );
+    $notes = wpinv_get_invoice_notes($invoice_id);
 
-    foreach ( $notes as $note ) {
-        if ( preg_match( '/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match ) ) {
+    foreach ($notes as $note) {
+        if (preg_match('/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match)) {
             $transaction_id = $match[1];
             continue;
         }
     }
 
-    return apply_filters( 'wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id );
+    return apply_filters('wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id);
 }
-add_filter( 'wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1 );
+add_filter('wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1);
 
-function wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice ) {
-    if ( $transaction_id == $invoice_id ) {
+function wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice) {
+    if ($transaction_id == $invoice_id) {
         $transaction_link = $transaction_id;
     } else {
-        if ( ! empty( $invoice ) && ! empty( $invoice->mode ) ) {
+        if (!empty($invoice) && !empty($invoice->mode)) {
             $mode = $invoice->mode;
         } else {
-            $mode = wpinv_is_test_mode( 'paypal' ) ? 'test' : 'live';
+            $mode = wpinv_is_test_mode('paypal') ? 'test' : 'live';
         }
 
         $sandbox = $mode == 'test' ? '.sandbox' : '';
         $transaction_url = 'https://www' . $sandbox . '.paypal.com/webscr?cmd=_history-details-from-hub&id=' . $transaction_id;
 
-        $transaction_link = '<a href="' . esc_url( $transaction_url ) . '" target="_blank">' . $transaction_id . '</a>';
+        $transaction_link = '<a href="' . esc_url($transaction_url) . '" target="_blank">' . $transaction_id . '</a>';
     }
 
-    return apply_filters( 'wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $transaction_id, $invoice );
+    return apply_filters('wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $transaction_id, $invoice);
 }
-add_filter( 'wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3 );
+add_filter('wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3);
 
-function wpinv_paypal_profile_id_link( $profile_id, $subscription ) {
+function wpinv_paypal_profile_id_link($profile_id, $subscription) {
     $link = $profile_id;
 
-    if ( ! empty( $profile_id ) && ! empty( $subscription ) && ( $invoice_id = $subscription->get_original_payment_id() ) ) {
-        $invoice = wpinv_get_invoice( $invoice_id );
+    if (!empty($profile_id) && !empty($subscription) && ($invoice_id = $subscription->get_original_payment_id())) {
+        $invoice = wpinv_get_invoice($invoice_id);
 
-        if ( ! empty( $invoice ) && ! empty( $invoice->mode ) ) {
+        if (!empty($invoice) && !empty($invoice->mode)) {
             $mode = $invoice->mode;
         } else {
-            $mode = wpinv_is_test_mode( 'paypal' ) ? 'test' : 'live';
+            $mode = wpinv_is_test_mode('paypal') ? 'test' : 'live';
         }
 
         $sandbox = $mode == 'test' ? '.sandbox' : '';
         $url = 'https://www' . $sandbox . '.paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=' . $profile_id;
 
-        $link = '<a href="' . esc_url( $url ) . '" target="_blank">' . $profile_id . '</a>';
+        $link = '<a href="' . esc_url($url) . '" target="_blank">' . $profile_id . '</a>';
     }
     
-    return apply_filters( 'wpinv_paypal_profile_id_link', $link, $profile_id, $subscription );
+    return apply_filters('wpinv_paypal_profile_id_link', $link, $profile_id, $subscription);
 }
-add_filter( 'wpinv_subscription_profile_link_paypal', 'wpinv_paypal_profile_id_link', 10, 2 );
+add_filter('wpinv_subscription_profile_link_paypal', 'wpinv_paypal_profile_id_link', 10, 2);
 
-function wpinv_paypal_transaction_id_link( $transaction_id, $subscription ) {
-    if ( ! empty( $transaction_id ) && ! empty( $subscription ) && ( $invoice_id = $subscription->get_original_payment_id() ) ) {
-        $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_paypal_transaction_id_link($transaction_id, $subscription) {
+    if (!empty($transaction_id) && !empty($subscription) && ($invoice_id = $subscription->get_original_payment_id())) {
+        $invoice = wpinv_get_invoice($invoice_id);
 
-        if ( ! empty( $invoice ) ) {
-            return wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice );
+        if (!empty($invoice)) {
+            return wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice);
         }        
     }
     
     return $transaction_id;
 }
-add_filter( 'wpinv_subscription_transaction_link_paypal', 'wpinv_paypal_transaction_id_link', 10, 2 );
+add_filter('wpinv_subscription_transaction_link_paypal', 'wpinv_paypal_transaction_id_link', 10, 2);
 
 function wpinv_is_paypal_valid_for_use() {
-    return in_array( wpinv_get_currency(), apply_filters( 'wpinv_paypal_supported_currencies', array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' ) ) );
+    return in_array(wpinv_get_currency(), apply_filters('wpinv_paypal_supported_currencies', array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR')));
 }
 
-function wpinv_check_paypal_currency_support( $gateway_list ) {
-    if ( isset( $gateway_list['paypal'] ) && ! wpinv_is_paypal_valid_for_use() ) {
-        unset( $gateway_list['paypal'] );
+function wpinv_check_paypal_currency_support($gateway_list) {
+    if (isset($gateway_list['paypal']) && !wpinv_is_paypal_valid_for_use()) {
+        unset($gateway_list['paypal']);
     }
     return $gateway_list;
 }
-add_filter( 'wpinv_enabled_payment_gateways', 'wpinv_check_paypal_currency_support', 10, 1 );
+add_filter('wpinv_enabled_payment_gateways', 'wpinv_check_paypal_currency_support', 10, 1);
 
-function wpinv_gateway_paypal_button_label( $label ) {
-    return __( 'Proceed to PayPal', 'invoicing' );
+function wpinv_gateway_paypal_button_label($label) {
+    return __('Proceed to PayPal', 'invoicing');
 }
-add_filter( 'wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1 );
\ No newline at end of file
+add_filter('wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1);
\ No newline at end of file

includes/api/class-wpinv-rest-invoice-controller.php

Spacing +325 added lines, -325 removed lines

@@ -8,7 +8,7 @@ 
  * @since    1.0.13
  */
 
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -41,7 +41,7 @@ 
 	 *
 	 * @param string $namespace Api Namespace
 	 */
-	public function __construct( $namespace ) {
+	public function __construct($namespace) {
         
         // Set api namespace...
 		$this->namespace = $namespace;
@@ -60,16 +60,16 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
 	 */
-	public function get_items_permissions_check( $request ) {
+	public function get_items_permissions_check($request) {
 	
-        $post_type = get_post_type_object( $this->post_type );
+        $post_type = get_post_type_object($this->post_type);
 
-		if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
-			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		if ('edit' === $request['context'] && !current_user_can($post_type->cap->edit_posts)) {
+			return new WP_Error('rest_forbidden_context', __('Sorry, you are not allowed to edit items.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
-		if ( ! is_user_logged_in() ) {
-			return new WP_Error( 'rest_forbidden', __( 'Sorry, you must be logged in to view items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		if (!is_user_logged_in()) {
+			return new WP_Error('rest_forbidden', __('Sorry, you must be logged in to view items.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		// Read checks will be evaluated on a per invoice basis
@@ -86,33 +86,33 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 		
 		// Retrieve request query parameters.
-		$args          = $this->get_request_collection_params( $request );
+		$args          = $this->get_request_collection_params($request);
 		
 		// WP_Query Args.
-		$wp_query_args = $this->get_collection_wp_query_params( $args, $request );
+		$wp_query_args = $this->get_collection_wp_query_params($args, $request);
 		
 		// Get invoice ids...
-		$query         = new WP_Query( $wp_query_args );
+		$query         = new WP_Query($wp_query_args);
 
 		// ... and map them into invoice objects.
-		$_invoices     = array_map( array( $this, 'get_post' ), $query->posts );
+		$_invoices     = array_map(array($this, 'get_post'), $query->posts);
 
 		// Prepare the retrieved invoices
 		$invoices      = array();
 
-		foreach( $_invoices as $invoice ) {
-			if ( $this->check_read_permission( $invoice ) ) {
-				$invoices[] = $this->prepare_response_for_collection( $this->prepare_item_for_response( $invoice, $request ) );
+		foreach ($_invoices as $invoice) {
+			if ($this->check_read_permission($invoice)) {
+				$invoices[] = $this->prepare_response_for_collection($this->prepare_item_for_response($invoice, $request));
 			}
 		}
 
 		// Prepare the response.
-		$response = rest_ensure_response( $invoices );
-		$response->header( 'X-WP-Total', (int) $query->found_posts );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+		$response = rest_ensure_response($invoices);
+		$response->header('X-WP-Total', (int) $query->found_posts);
+		$response->header('X-WP-TotalPages', (int) $query->max_num_pages);
 
 		/**
 		 * Filters the responses for invoices requests.
@@ -125,9 +125,9 @@ 
 		 * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the invoices
 		 */
-        $response       = apply_filters( "wpinv_rest_invoices_response", $response, $request, $args );
+        $response = apply_filters("wpinv_rest_invoices_response", $response, $request, $args);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
         
     }
 
@@ -139,17 +139,17 @@ 
 	 * @param int $invoice_id Supplied ID.
 	 * @return WPInv_Invoice|WP_Error Invoice object if ID is valid, WP_Error otherwise.
 	 */
-	protected function get_post( $invoice_id ) {
+	protected function get_post($invoice_id) {
 		
-		$error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid item ID.', 'invoicing' ), array( 'status' => 404 ) );
+		$error = new WP_Error('rest_invoice_invalid_id', __('Invalid item ID.', 'invoicing'), array('status' => 404));
 
         // Ids start from 1
-        if ( (int) $invoice_id <= 0 ) {
+        if ((int) $invoice_id <= 0) {
 			return $error;
 		}
 
-		$invoice = wpinv_get_invoice( (int) $invoice_id );
-		if ( empty( $invoice ) || $this->post_type !== $invoice->post_type ) {
+		$invoice = wpinv_get_invoice((int) $invoice_id);
+		if (empty($invoice) || $this->post_type !== $invoice->post_type) {
 			return $error;
         }
 
@@ -165,18 +165,18 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has read access for the invoice, WP_Error object otherwise.
 	 */
-	public function get_item_permissions_check( $request ) {
+	public function get_item_permissions_check($request) {
 
         // Retrieve the invoice object.
-        $invoice = $this->get_post( $request['id'] );
+        $invoice = $this->get_post($request['id']);
         
         // Ensure it is valid.
-		if ( is_wp_error( $invoice ) ) {
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
-		if ( $invoice ) {
-			return $this->check_read_permission( $invoice );
+		if ($invoice) {
+			return $this->check_read_permission($invoice);
 		}
 
 		return true;
@@ -193,8 +193,8 @@ 
 	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
 	 * @return bool Whether the post can be read.
 	 */
-	public function check_read_permission( $invoice ) {
-		return wpinv_user_can_view_invoice( $invoice->ID );
+	public function check_read_permission($invoice) {
+		return wpinv_user_can_view_invoice($invoice->ID);
     }
     
     /**
@@ -205,19 +205,19 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function get_item( $request ) {
+	public function get_item($request) {
 
         // Fetch the invoice.
-        $invoice = $this->get_post( $request['id'] );
+        $invoice = $this->get_post($request['id']);
         
         // Abort early if it does not exist
-		if ( is_wp_error( $invoice ) ) {
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
-		$response->link_header( 'alternate', esc_url( $invoice->get_view_url() ), array( 'type' => 'text/html' ) );
+		$response = $this->prepare_item_for_response($invoice, $request);
+		$response->link_header('alternate', esc_url($invoice->get_view_url()), array('type' => 'text/html'));
 
 		/**
 		 * Filters the responses for single invoice requests.
@@ -229,9 +229,9 @@ 
 		 * @param WP_HTTP_Response $response Response.
 		 * @param WP_REST_Request  $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_get_invoice_response", $response, $request );
+        $response = apply_filters("wpinv_rest_get_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 
     }
     
@@ -243,18 +243,18 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
 	 */
-	public function create_item_permissions_check( $request ) {
+	public function create_item_permissions_check($request) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_invoice_exists', __('Cannot create existing item.', 'invoicing'), array('status' => 400));
 		}
 
-		$post_type = get_post_type_object( $this->post_type );
+		$post_type = get_post_type_object($this->post_type);
 
-		if ( ! current_user_can( $post_type->cap->create_posts ) && ! wpinv_current_user_can_manage_invoicing() ) {
+		if (!current_user_can($post_type->cap->create_posts) && !wpinv_current_user_can_manage_invoicing()) {
 			return new WP_Error( 
                 'rest_cannot_create',
-                __( 'Sorry, you are not allowed to create items as this user.', 'invoicing' ), 
+                __('Sorry, you are not allowed to create items as this user.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -272,32 +272,32 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function create_item( $request ) {
+	public function create_item($request) {
 
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_invoice_exists', __('Cannot create existing item.', 'invoicing'), array('status' => 400));
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the updated data.
-		$invoice_data = $this->prepare_item_for_database( $request );
+		$invoice_data = $this->prepare_item_for_database($request);
 
-		if ( is_wp_error( $invoice_data ) ) {
+		if (is_wp_error($invoice_data)) {
 			return $invoice_data;
 		}
 
 		// Try creating the invoice
 		$invoice_data['post_type']    = $this->post_type;
-		$invoice_data['private_note'] = __( 'Created via API.', 'invoicing' );
-        $invoice = wpinv_insert_invoice( $invoice_data, true );
+		$invoice_data['private_note'] = __('Created via API.', 'invoicing');
+        $invoice = wpinv_insert_invoice($invoice_data, true);
 
-		if ( is_wp_error( $invoice ) ) {
+		if (is_wp_error($invoice)) {
             return $invoice;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
+		$response = $this->prepare_item_for_response($invoice, $request);
 
 		/**
 		 * Fires after a single invoice is created or updated via the REST API.
@@ -308,7 +308,7 @@ 
 		 * @param WP_REST_Request $request  Request object.
 		 * @param bool            $creating True when creating a post, false when updating.
 		 */
-		do_action( "wpinv_rest_insert_invoice", $invoice, $request, true );
+		do_action("wpinv_rest_insert_invoice", $invoice, $request, true);
 
 		/**
 		 * Filters the responses for creating single invoice requests.
@@ -320,9 +320,9 @@ 
 		 * @param array           $invoice_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_create_invoice_response", $response, $request );
+        $response = apply_filters("wpinv_rest_create_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 	}
 
 	/**
@@ -333,20 +333,20 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
 	 */
-	public function update_item_permissions_check( $request ) {
+	public function update_item_permissions_check($request) {
 
 		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
+		$invoice = $this->get_post($request['id']);
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
-		$post_type = get_post_type_object( $this->post_type );
+		$post_type = get_post_type_object($this->post_type);
 
-		if ( ! current_user_can(  $post_type->cap->edit_post, $invoice->ID  ) ) {
+		if (!current_user_can($post_type->cap->edit_post, $invoice->ID)) {
 			return new WP_Error( 
                 'rest_cannot_edit', 
-                __( 'Sorry, you are not allowed to update this item.', 'invoicing' ), 
+                __('Sorry, you are not allowed to update this item.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -364,46 +364,46 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function update_item( $request ) {
+	public function update_item($request) {
 		
 		// Ensure the invoice exists.
-        $valid_check = $this->get_post( $request['id'] );
+        $valid_check = $this->get_post($request['id']);
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
+		if (is_wp_error($valid_check)) {
 			return $valid_check;
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+		$data_to_update = $this->prepare_item_for_database($request);
 
-		if ( is_wp_error( $data_to_update ) ) {
+		if (is_wp_error($data_to_update)) {
 			return $data_to_update;
 		}
 
 		// Abort if no invoice data is provided
-        if( empty( $data_to_update ) ) {
-            return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
+        if (empty($data_to_update)) {
+            return new WP_Error('missing_data', __('An update request cannot be empty.', 'invoicing'));
         }
 
 		// Include the invoice ID
 		$data_to_update['ID'] = $request['id'];
 
 		// Update the invoice
-		$updated_invoice = wpinv_update_invoice( $data_to_update, true );
+		$updated_invoice = wpinv_update_invoice($data_to_update, true);
 
 		// Incase the update operation failed...
-		if ( is_wp_error( $updated_invoice ) ) {
+		if (is_wp_error($updated_invoice)) {
 			return $updated_invoice;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_invoice, $request );
+		$response = $this->prepare_item_for_response($updated_invoice, $request);
 
 		/** This action is documented in includes/class-wpinv-rest-invoice-controller.php */
-		do_action( "wpinv_rest_insert_invoice", $updated_invoice, $request, false );
+		do_action("wpinv_rest_insert_invoice", $updated_invoice, $request, false);
 
 		/**
 		 * Filters the responses for updating single invoice requests.
@@ -415,9 +415,9 @@ 
 		 * @param array           $invoice_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_update_invoice_response", $response, $request );
+        $response = apply_filters("wpinv_rest_update_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 	}
 
 	/**
@@ -428,22 +428,22 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to delete the invoice, WP_Error object otherwise.
 	 */
-	public function delete_item_permissions_check( $request ) {
+	public function delete_item_permissions_check($request) {
 
 		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
+		$invoice = $this->get_post($request['id']);
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
 		// Ensure the current user can delete invoices
-		if ( wpinv_current_user_can_manage_invoicing() ||  current_user_can( 'delete_invoices', $request['id'] ) ) {
+		if (wpinv_current_user_can_manage_invoicing() || current_user_can('delete_invoices', $request['id'])) {
 			return true;
 		}
 
 		return new WP_Error( 
 			'rest_cannot_delete', 
-			__( 'Sorry, you are not allowed to delete this item.', 'invoicing' ), 
+			__('Sorry, you are not allowed to delete this item.', 'invoicing'), 
 			array( 
 				'status' => rest_authorization_required_code(),
 			)
@@ -458,31 +458,31 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function delete_item( $request ) {
+	public function delete_item($request) {
 		
 		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
+		$invoice = $this->get_post($request['id']);
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the invoice id
-		$id    = $invoice->ID;
+		$id = $invoice->ID;
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
+		$response = $this->prepare_item_for_response($invoice, $request);
 
 		// Check if the user wants to bypass the trash...
 		$force_delete = (bool) $request['force'];
 
 		// Try deleting the invoice.
-		$deleted = wp_delete_post( $id, $force_delete );
+		$deleted = wp_delete_post($id, $force_delete);
 
 		// Abort early if we can't delete the invoice.
-		if ( ! $deleted ) {
-			return new WP_Error( 'rest_cannot_delete', __( 'The item cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+		if (!$deleted) {
+			return new WP_Error('rest_cannot_delete', __('The item cannot be deleted.', 'invoicing'), array('status' => 500));
 		}
 
 		/**
@@ -494,7 +494,7 @@ 
 		 * @param WPInv_Invoice    $invoice  The deleted or trashed invoice.
 		 * @param WP_REST_Request  $request  The request sent to the API.
 		 */
-		do_action( "wpinv_rest_delete_invoice", $invoice, $request );
+		do_action("wpinv_rest_delete_invoice", $invoice, $request);
 
 		return $response;
 
@@ -510,29 +510,29 @@ 
 	 */
 	public function get_collection_params() {
         
-        $query_params               = array(
+        $query_params = array(
 
             // item status.
             'status'                => array(
                 'default'           => $this->get_post_statuses(),
-                'description'       => __( 'Limit result set to items assigned one or more statuses.', 'invoicing' ),
+                'description'       => __('Limit result set to items assigned one or more statuses.', 'invoicing'),
                 'type'              => 'array',
                 'items'             => array(
                     'enum'          => $this->get_post_statuses(),
                     'type'          => 'string',
                 ),
-                'sanitize_callback' => array( $this, 'sanitize_post_statuses' ),
+                'sanitize_callback' => array($this, 'sanitize_post_statuses'),
             ),
 
             // User.
             'user'                  => array(
-				'description'       => __( 'Limit result set to items for a specif user. Accepts a user ID, or comma-separated list of IDs', 'invoicing' ),
+				'description'       => __('Limit result set to items for a specif user. Accepts a user ID, or comma-separated list of IDs', 'invoicing'),
 				'type'              => 'string',
 			),
 
 			// Exclude certain users
             'exclude_users'  	    => array(
-                'description' 		=> __( 'Exclude items from specific users.', 'invoicing' ),
+                'description' 		=> __('Exclude items from specific users.', 'invoicing'),
                 'type'        		=> 'array',
                 'items'       		=> array(
                     'type' => 'integer',
@@ -542,62 +542,62 @@ 
 			
 			// Items before.
             'before_date'           => array(
-				'description'       => __( 'Limit result set to items created before a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
+				'description'       => __('Limit result set to items created before a specific date. Accepts strtotime()-compatible string.', 'invoicing'),
 				'type'              => 'string',
 			),
 
             'meta_key'           => array(
-				'description'       => __( 'Filter items by custom field key.', 'invoicing' ),
+				'description'       => __('Filter items by custom field key.', 'invoicing'),
 				'type'              => 'string',
 			),
 
             'meta_compare_key'           => array(
-				'description'       => __( 'Comparison operator to test the `meta_key`.', 'invoicing' ),
+				'description'       => __('Comparison operator to test the `meta_key`.', 'invoicing'),
 				'type'              => 'string',
 				'default'              => '=',
-				'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
+				'enum'        		=> array_map('trim', explode(',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE')),
 			),
 
             'meta_value'           => array(
-				'description'       => __( 'Filter items by custom field value.', 'invoicing' ),
+				'description'       => __('Filter items by custom field value.', 'invoicing'),
 				'type'              => 'string',
 			),
 
             'meta_compare'           => array(
-				'description'       => __( 'Comparison operator to test the `meta_value`.', 'invoicing' ),
+				'description'       => __('Comparison operator to test the `meta_value`.', 'invoicing'),
 				'type'              => 'string',
 				'default'              => '=',
-				'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
+				'enum'        		=> array_map('trim', explode(',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE')),
 			),
 
 			'meta_value_num'           => array(
-				'description'       => __( 'Filter items by a numeric custom field value.', 'invoicing' ),
+				'description'       => __('Filter items by a numeric custom field value.', 'invoicing'),
 				'type'              => 'integer',
 			),
 
 			// items after.
             'after_date'            => array(
-				'description'       => __( 'Limit result set to items created after a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
+				'description'       => __('Limit result set to items created after a specific date. Accepts strtotime()-compatible string.', 'invoicing'),
 				'type'              => 'string',
             ),
             
             // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of items to fetch.', 'invoicing' ),
+				'description'       => __('Number of items to fetch.', 'invoicing'),
 				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+				'default'           => (int) get_option('posts_per_page'),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
+				'description'       => __('Current page to fetch.', 'invoicing'),
 				'type'              => 'integer',
 				'default'           => 1,
             ),
 
             // limit to certain items
             'include'  => array(
-                'description' => __( 'Limit result set to specific IDs.', 'invoicing' ),
+                'description' => __('Limit result set to specific IDs.', 'invoicing'),
                 'type'        => 'array',
                 'items'       => array(
                     'type' => 'integer',
@@ -607,7 +607,7 @@ 
 			
 			// Exclude certain items
             'exclude'  => array(
-                'description' => __( 'Ensure result set excludes specific IDs.', 'invoicing' ),
+                'description' => __('Ensure result set excludes specific IDs.', 'invoicing'),
                 'type'        => 'array',
                 'items'       => array(
                     'type' => 'integer',
@@ -617,7 +617,7 @@ 
 
             // Order items by
             'orderby'  		  => array(
-                'description' => __( 'Sort retrieved items by parameter.', 'invoicing' ),
+                'description' => __('Sort retrieved items by parameter.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'date',
                 'enum'        => array(
@@ -632,10 +632,10 @@ 
 
             // How to order
             'order'    => array(
-                'description' => __( 'Designates ascending or descending order of ítems.', 'invoicing' ),
+                'description' => __('Designates ascending or descending order of ítems.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'DESC',
-                'enum'        => array( 'ASC', 'DESC' ),
+                'enum'        => array('ASC', 'DESC'),
             ),
         );
 
@@ -647,7 +647,7 @@ 
 		 *
 		 * @param array        $query_params JSON Schema-formatted collection parameters.
 		 */
-		return apply_filters( "wpinv_rest_invoices_collection_params", $query_params );
+		return apply_filters("wpinv_rest_invoices_collection_params", $query_params);
 	}
 	
 	/**
@@ -657,7 +657,7 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array Request collection parameters.
 	 */
-	public function get_request_collection_params( $request ) {
+	public function get_request_collection_params($request) {
 		
 		// Retrieve the list of registered invoice query parameters.
 		$registered = $this->get_collection_params();
@@ -674,7 +674,7 @@ 
             'meta_compare'          => '=',
 			'meta_value_num'        => null,
             'after_date'            => null,
-            'limit'                 => (int) get_option( 'posts_per_page' ),
+            'limit'                 => (int) get_option('posts_per_page'),
 			'page'     				=> 1,
 			'include'				=> array(),
             'exclude'  				=> array(),
@@ -683,9 +683,9 @@ 
 		);
 
 		// Add any params from the requests.
-		foreach ( array_keys( $registered ) as $key ) {
-            if ( isset( $request[ $key] ) ) {
-                $args[ $key ] = $request[ $key];
+		foreach (array_keys($registered) as $key) {
+            if (isset($request[$key])) {
+                $args[$key] = $request[$key];
             }
         }
 		
@@ -698,7 +698,7 @@ 
 		 * @param array           $args    Request query args.
 		 * @param WP_REST_Request $request Full details about the request.
 		 */
-		return apply_filters( "wpinv_rest_invoices_collection_request_params", $args, $request );
+		return apply_filters("wpinv_rest_invoices_collection_request_params", $args, $request);
 	}
 	
 	/**
@@ -709,7 +709,7 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array WP_Query parameters.
 	 */
-	public function get_collection_wp_query_params( $args, $request ) {
+	public function get_collection_wp_query_params($args, $request) {
 		
 		// Prepare the parameters.
 		$wp_query_args = array(
@@ -726,35 +726,35 @@ 
 			'meta_value_num'   => $args['meta_value_num'],
 			'post__in'         => $args['include'],
 			'post__in'         => $args['exclude'],
-			'date_query'       => array( array() ),
+			'date_query'       => array(array()),
 			'fields'           => 'ids',
 			'orderby'          => $args['orderby'],
 			'order'            => $args['order'],
 		);
 
 		// Only admins can view other user's invoices.
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
+		if (!wpinv_current_user_can_manage_invoicing()) {
 			$wp_query_args['author'] = get_current_user_id();
 		}
 
 		// No date specific params provided.
-		if ( empty( $args['before_date'] ) && empty( $args['after_date'] ) ) {
-			unset( $wp_query_args['date_query'] );
+		if (empty($args['before_date']) && empty($args['after_date'])) {
+			unset($wp_query_args['date_query']);
 		}
 
-		if ( ! empty( $args['before_date'] ) ) {
+		if (!empty($args['before_date'])) {
 			$wp_query_args['date_query'][0]['before'] = $args['before_date'];
 		}
 
-		if ( ! empty( $args['after_date'] ) ) {
+		if (!empty($args['after_date'])) {
 			$wp_query_args['date_query'][0]['after'] = $args['after_date'];
 		}
 
 		// Remove empty variables.
-		$wp_query_args = array_filter( $wp_query_args );
+		$wp_query_args = array_filter($wp_query_args);
 
 		// This can be zero.
-		if ( ! is_null( $args['meta_value_num'] ) ) {
+		if (!is_null($args['meta_value_num'])) {
 			$wp_query_args['meta_value_num'] = $args['meta_value_num'];
 		}
 		
@@ -768,7 +768,7 @@ 
 		 * @param array           $wp_query_args Generated WP_Query args args.
 		 * @param WP_REST_Request $request       Full details about the request.
 		 */
-		return apply_filters( "wpinv_rest_invoices_collection_wp_query_params", $wp_query_args, $args, $request );
+		return apply_filters("wpinv_rest_invoices_collection_wp_query_params", $wp_query_args, $args, $request);
     }
     
     /**
@@ -779,7 +779,7 @@ 
 	 * @param object|string $post_type Post type name or object.
 	 * @return bool Whether the post type is allowed in REST.
 	 */
-	protected function check_is_post_type_allowed( $post_type ) {
+	protected function check_is_post_type_allowed($post_type) {
 		return true;
 	}
 
@@ -791,49 +791,49 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array|WP_Error Invoice Properties or WP_Error.
 	 */
-	protected function prepare_item_for_database( $request ) {
+	protected function prepare_item_for_database($request) {
 		$prepared_invoice = new stdClass();
 
 		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_invoice = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_invoice ) ) {
+		if (isset($request['id'])) {
+			$existing_invoice = $this->get_post($request['id']);
+			if (is_wp_error($existing_invoice)) {
 				return $existing_invoice;
 			}
 
-			$prepared_invoice->ID 		  = $existing_invoice->ID;
+			$prepared_invoice->ID = $existing_invoice->ID;
 			$prepared_invoice->invoice_id = $existing_invoice->ID;
 		}
 
 		$schema = $this->get_item_schema();
 
 		// Invoice owner.
-		if ( ! empty( $schema['properties']['user_id'] ) && isset( $request['user_id'] ) ) {
+		if (!empty($schema['properties']['user_id']) && isset($request['user_id'])) {
 			$prepared_invoice->user_id = (int) $request['user_id'];
 		}
 
 		// Cart details.
-		if ( ! empty( $schema['properties']['cart_details'] ) && isset( $request['cart_details'] ) ) {
+		if (!empty($schema['properties']['cart_details']) && isset($request['cart_details'])) {
 			$prepared_invoice->cart_details = (array) $request['cart_details'];
 		}
 
 		// Invoice status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
+		if (!empty($schema['properties']['status']) && isset($request['status'])) {
 
-			if ( in_array( $request['status'], $this->get_post_statuses(), true ) ) {
+			if (in_array($request['status'], $this->get_post_statuses(), true)) {
 				$prepared_invoice->status = $request['status'];
 			}
 
 		}
 
 		// User info
-		if ( ! empty( $schema['properties']['user_info'] ) && isset( $request['user_info'] ) ) {
+		if (!empty($schema['properties']['user_info']) && isset($request['user_info'])) {
 			$prepared_invoice->user_info = array();
 			$user_info = (array) $request['user_info'];
 
-			foreach( $user_info as $prop => $value ) {
+			foreach ($user_info as $prop => $value) {
 
-				if ( ! empty( $schema['properties']['user_info']['properties'][$prop] ) ) {
+				if (!empty($schema['properties']['user_info']['properties'][$prop])) {
 
 					$prepared_invoice->user_info[$prop] = $value;
 		
@@ -844,59 +844,59 @@ 
 		}
 
 		// IP
-		if ( ! empty( $schema['properties']['ip'] ) && isset( $request['ip'] ) ) {
+		if (!empty($schema['properties']['ip']) && isset($request['ip'])) {
 			$prepared_invoice->ip = $request['ip'];
 		}
 
 		// Payment details
 		$prepared_invoice->payment_details = array();
 
-		if ( ! empty( $schema['properties']['gateway'] ) && isset( $request['gateway'] ) ) {
+		if (!empty($schema['properties']['gateway']) && isset($request['gateway'])) {
 			$prepared_invoice->payment_details['gateway'] = $request['gateway'];
 		}
 
-		if ( ! empty( $schema['properties']['gateway_title'] ) && isset( $request['gateway_title'] ) ) {
+		if (!empty($schema['properties']['gateway_title']) && isset($request['gateway_title'])) {
 			$prepared_invoice->payment_details['gateway_title'] = $request['gateway_title'];
 		}
 
-		if ( ! empty( $schema['properties']['currency'] ) && isset( $request['currency'] ) ) {
+		if (!empty($schema['properties']['currency']) && isset($request['currency'])) {
 			$prepared_invoice->payment_details['currency'] = $request['currency'];
 		}
 
-		if ( ! empty( $schema['properties']['transaction_id'] ) && isset( $request['transaction_id'] ) ) {
+		if (!empty($schema['properties']['transaction_id']) && isset($request['transaction_id'])) {
 			$prepared_invoice->payment_details['transaction_id'] = $request['transaction_id'];
 		}
 
 		// Dates
-		if ( ! empty( $schema['properties']['date'] ) && isset( $request['date'] ) ) {
-			$post_date = rest_get_date_with_gmt( $request['date'] );
+		if (!empty($schema['properties']['date']) && isset($request['date'])) {
+			$post_date = rest_get_date_with_gmt($request['date']);
 
-			if ( ! empty( $post_date ) ) {
+			if (!empty($post_date)) {
 				$prepared_invoice->post_date = $post_date[0];
 			}
 			
 		}
 
-		if ( ! empty( $schema['properties']['due_date'] ) && isset( $request['due_date'] ) ) {
-			$due_date = rest_get_date_with_gmt( $request['due_date'] );
+		if (!empty($schema['properties']['due_date']) && isset($request['due_date'])) {
+			$due_date = rest_get_date_with_gmt($request['due_date']);
 
-			if ( ! empty( $due_date ) ) {
+			if (!empty($due_date)) {
 				$prepared_invoice->due_date = $due_date[0];
 			}
 
 		}
 
-		if ( ! empty( $schema['properties']['valid_until'] ) && isset( $request['valid_until'] ) ) {
+		if (!empty($schema['properties']['valid_until']) && isset($request['valid_until'])) {
 
-			if ( ! empty( $request['valid_until'] ) ) {
-				$prepared_invoice->valid_until = gmdate( 'Y-m-d', strtotime( $request['valid_until'] ) );
+			if (!empty($request['valid_until'])) {
+				$prepared_invoice->valid_until = gmdate('Y-m-d', strtotime($request['valid_until']));
 			} else {
 				$prepared_invoice->valid_until = '';
 			}
 
 		}
 
-		$invoice_data = (array) wp_unslash( $prepared_invoice );
+		$invoice_data = (array) wp_unslash($prepared_invoice);
 
 		/**
 		 * Filters an invoice before it is inserted via the REST API.
@@ -906,7 +906,7 @@ 
 		 * @param array        $invoice_data An array of invoice data
 		 * @param WP_REST_Request $request       Request object.
 		 */
-		return apply_filters( "wpinv_rest_pre_insert_invoice", $invoice_data, $request );
+		return apply_filters("wpinv_rest_pre_insert_invoice", $invoice_data, $request);
 
 	}
 
@@ -919,20 +919,20 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $invoice, $request ) {
+	public function prepare_item_for_response($invoice, $request) {
 
-		$GLOBALS['post'] = get_post( $invoice->ID );
+		$GLOBALS['post'] = get_post($invoice->ID);
 
-		setup_postdata( $invoice->ID );
+		setup_postdata($invoice->ID);
 
 		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
+		$fields = $this->get_fields_for_response($request);
 
 		// Base fields for every invoice.
 		$data = array();
 
 		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
+		if (rest_is_field_included('id', $fields)) {
 			$data['id'] = $invoice->ID;
 		}
 
@@ -947,79 +947,79 @@ 
 			'status', 'status_nicename', 'post_type'
 		);
 
-		foreach( $invoice_properties as $property ) {
+		foreach ($invoice_properties as $property) {
 
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $invoice->get( $property );
+			if (rest_is_field_included($property, $fields)) {
+				$data[$property] = $invoice->get($property);
 			}
 
 		}
 
 		// Valid until
-		if ( rest_is_field_included( 'valid_until', $fields ) && $this->post_type === 'wpi_quote' ) {
-			$data['valid_until'] = get_post_meta( $invoice->ID, 'wpinv_quote_valid_until', true );
+		if (rest_is_field_included('valid_until', $fields) && $this->post_type === 'wpi_quote') {
+			$data['valid_until'] = get_post_meta($invoice->ID, 'wpinv_quote_valid_until', true);
 		}
 
 		// Cart details
-		if ( rest_is_field_included( 'cart_details', $fields ) ) {
-			$data['cart_details'] = $invoice->get( 'cart_details' );
+		if (rest_is_field_included('cart_details', $fields)) {
+			$data['cart_details'] = $invoice->get('cart_details');
 		}
 
 		//Dates
-		$invoice_properties = array( 'date', 'due_date', 'completed_date' );
+		$invoice_properties = array('date', 'due_date', 'completed_date');
 
-		foreach( $invoice_properties as $property ) {
+		foreach ($invoice_properties as $property) {
 
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $this->prepare_date_response( '0000-00-00 00:00:00', $invoice->get( $property ) );
+			if (rest_is_field_included($property, $fields)) {
+				$data[$property] = $this->prepare_date_response('0000-00-00 00:00:00', $invoice->get($property));
 			}
 
 		}
 
 		// User id
-		if ( rest_is_field_included( 'user_id', $fields ) ) {
-			$data['user_id'] = (int) $invoice->get( 'user_id' );
+		if (rest_is_field_included('user_id', $fields)) {
+			$data['user_id'] = (int) $invoice->get('user_id');
 		}
 
 		// User info
-		$user_info = array( 'first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone' );
+		$user_info = array('first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone');
 
-		foreach( $user_info as $property ) {
+		foreach ($user_info as $property) {
 
-			if ( rest_is_field_included( "user_info.$property", $fields ) ) {
-				$data['user_info'][$property] = $invoice->get( $property );
+			if (rest_is_field_included("user_info.$property", $fields)) {
+				$data['user_info'][$property] = $invoice->get($property);
 			}
 
 		}
 
 		// Slug
-		if ( rest_is_field_included( 'slug', $fields ) ) {
-			$data['slug'] = $invoice->get( 'post_name' );
+		if (rest_is_field_included('slug', $fields)) {
+			$data['slug'] = $invoice->get('post_name');
 		}
 
 		// View invoice link
-		if ( rest_is_field_included( 'link', $fields ) ) {
-			$data['link'] = esc_url( $invoice->get_view_url() );
+		if (rest_is_field_included('link', $fields)) {
+			$data['link'] = esc_url($invoice->get_view_url());
 		}
 
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		$context = !empty($request['context']) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object($data, $request);
+		$data    = $this->filter_response_by_context($data, $context);
 
 		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 
-		$links = $this->prepare_links( $invoice );
-		$response->add_links( $links );
+		$links = $this->prepare_links($invoice);
+		$response->add_links($links);
 
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $invoice, $request );
+		if (!empty($links['self']['href'])) {
+			$actions = $this->get_available_actions($invoice, $request);
 
 			$self = $links['self']['href'];
 
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
+			foreach ($actions as $rel) {
+				$response->add_link($rel, $self);
 			}
 		}
 
@@ -1032,7 +1032,7 @@ 
 		 * @param WPInv_Invoice    $invoice  The invoice object.
 		 * @param WP_REST_Request  $request  Request object.
 		 */
-		return apply_filters( "wpinv_rest_prepare_invoice", $response, $invoice, $request );
+		return apply_filters("wpinv_rest_prepare_invoice", $response, $invoice, $request);
 	}
 
 	/**
@@ -1045,57 +1045,57 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array Fields to be included in the response.
 	 */
-	public function get_fields_for_response( $request ) {
+	public function get_fields_for_response($request) {
 		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+		$properties = isset($schema['properties']) ? $schema['properties'] : array();
 
 		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
+		foreach ($additional_fields as $field_name => $field_options) {
 			// For back-compat, include any field with an empty schema
 			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
+			if (is_null($field_options['schema'])) {
+				$properties[$field_name] = $field_options;
 			}
 		}
 
 		// Exclude fields that specify a different context than the request context.
 		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
+		if ($context) {
+			foreach ($properties as $name => $options) {
+				if (!empty($options['context']) && !in_array($context, $options['context'], true)) {
+					unset($properties[$name]);
 				}
 			}
 		}
 
-		$fields = array_keys( $properties );
+		$fields = array_keys($properties);
 
-		if ( ! isset( $request['_fields'] ) ) {
+		if (!isset($request['_fields'])) {
 			return $fields;
 		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
+		$requested_fields = wpinv_parse_list($request['_fields']);
+		if (0 === count($requested_fields)) {
 			return $fields;
 		}
 		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
+		$requested_fields = array_map('trim', $requested_fields);
 		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
+		if (in_array('id', $fields, true)) {
 			$requested_fields[] = 'id';
 		}
 		// Return the list of all requested fields which appear in the schema.
 		return array_reduce(
 			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
+			function($response_fields, $field) use ($fields) {
+				if (in_array($field, $fields, true)) {
 					$response_fields[] = $field;
 					return $response_fields;
 				}
 				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
+				$nested_fields = explode('.', $field);
 				// A nested field is included so long as its top-level property is
 				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
+				if (in_array($nested_fields[0], $fields, true)) {
 					$response_fields[] = $field;
 				}
 				return $response_fields;
@@ -1114,8 +1114,8 @@ 
 	public function get_item_schema() {
 
 		// Maybe retrieve the schema from cache.
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
+		if ($this->schema) {
+			return $this->add_additional_fields_schema($this->schema);
 		}
 
 		$schema = array(
@@ -1127,266 +1127,266 @@ 
 			'properties' 		  => array(
 
 				'title'			  => array(
-					'description' => __( 'The title for the invoice.', 'invoicing' ),
+					'description' => __('The title for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'user_id'		  => array(
-					'description' => __( 'The ID of the owner of the invoice.', 'invoicing' ),
+					'description' => __('The ID of the owner of the invoice.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'email'		  	  => array(
-					'description' => __( 'The email of the owner of the invoice.', 'invoicing' ),
+					'description' => __('The email of the owner of the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'ip'			  => array(
-					'description' => __( 'The IP of the owner of the invoice.', 'invoicing' ),
+					'description' => __('The IP of the owner of the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'user_info'       => array(
-					'description' => __( 'Information about the owner of the invoice.', 'invoicing' ),
+					'description' => __('Information about the owner of the invoice.', 'invoicing'),
 					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'properties'  => array(
 
 						'first_name'      => array(
-							'description' => __( 'The first name of the owner of the invoice.', 'invoicing' ),
+							'description' => __('The first name of the owner of the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'last_name'       => array(
-							'description' => __( 'The last name of the owner of the invoice.', 'invoicing' ),
+							'description' => __('The last name of the owner of the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'company'         => array(
-							'description' => __( 'The company of the owner of the invoice.', 'invoicing' ),
+							'description' => __('The company of the owner of the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'vat_number'      => array(
-							'description' => __( 'The VAT number of the owner of the invoice.', 'invoicing' ),
+							'description' => __('The VAT number of the owner of the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'vat_rate'        => array(
-							'description' => __( 'The VAT rate applied on the invoice.', 'invoicing' ),
+							'description' => __('The VAT rate applied on the invoice.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'address'        => array(
-							'description' => __( 'The address of the invoice owner.', 'invoicing' ),
+							'description' => __('The address of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'city'            => array(
-							'description' => __( 'The city of the invoice owner.', 'invoicing' ),
+							'description' => __('The city of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'country'         => array(
-							'description' => __( 'The country of the invoice owner.', 'invoicing' ),
+							'description' => __('The country of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'state'           => array(
-							'description' => __( 'The state of the invoice owner.', 'invoicing' ),
+							'description' => __('The state of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'zip'             => array(
-							'description' => __( 'The zip code of the invoice owner.', 'invoicing' ),
+							'description' => __('The zip code of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 
 						'phone'             => array(
-							'description' => __( 'The phone number of the invoice owner.', 'invoicing' ),
+							'description' => __('The phone number of the invoice owner.', 'invoicing'),
 							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
+							'context'     => array('view', 'edit', 'embed'),
 						),
 					),
 				),
 
 				'id'           => array(
-					'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+					'description' => __('Unique identifier for the invoice.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'key'			  => array(
-					'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+					'description' => __('A unique key for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'number'		  => array(
-					'description' => __( 'The invoice number.', 'invoicing' ),
+					'description' => __('The invoice number.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'transaction_id'  => array(
-					'description' => __( 'The transaction id of the invoice.', 'invoicing' ),
+					'description' => __('The transaction id of the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'gateway'		  => array(
-					'description' => __( 'The gateway used to process the invoice.', 'invoicing' ),
+					'description' => __('The gateway used to process the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'gateway_title'	  => array(
-					'description' => __( 'The title of the gateway used to process the invoice.', 'invoicing' ),
+					'description' => __('The title of the gateway used to process the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'total'	  		  => array(
-					'description' => __( 'The total amount of the invoice.', 'invoicing' ),
+					'description' => __('The total amount of the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'discount'		  => array(
-					'description' => __( 'The discount applied to the invoice.', 'invoicing' ),
+					'description' => __('The discount applied to the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'discount_code'	  => array(
-					'description' => __( 'The discount code applied to the invoice.', 'invoicing' ),
+					'description' => __('The discount code applied to the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'tax'	  		  => array(
-					'description' => __( 'The tax applied to the invoice.', 'invoicing' ),
+					'description' => __('The tax applied to the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'fees_total'	  => array(
-					'description' => __( 'The total fees applied to the invoice.', 'invoicing' ),
+					'description' => __('The total fees applied to the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'subtotal'	  	  => array(
-					'description' => __( 'The sub-total for the invoice.', 'invoicing' ),
+					'description' => __('The sub-total for the invoice.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'currency'	  	  => array(
-					'description' => __( 'The currency used to process the invoice.', 'invoicing' ),
+					'description' => __('The currency used to process the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'cart_details'	  => array(
-					'description' => __( 'The cart details for invoice.', 'invoicing' ),
+					'description' => __('The cart details for invoice.', 'invoicing'),
 					'type'        => 'array',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'required'	  => true,
 				),
 
 				'date'         => array(
-					'description' => __( "The date the invoice was published, in the site's timezone.", 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
+					'description' => __("The date the invoice was published, in the site's timezone.", 'invoicing'),
+					'type'        => array('string', 'null'),
 					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'due_date'     => array(
-					'description' => __( 'The due date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
+					'description' => __('The due date for the invoice.', 'invoicing'),
+					'type'        => array('string', 'null'),
 					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 				),
 
 				'completed_date'  => array(
-					'description' => __( 'The completed date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
+					'description' => __('The completed date for the invoice.', 'invoicing'),
+					'type'        => array('string', 'null'),
 					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 				
 				'link'         => array(
-					'description' => __( 'URL to the invoice.', 'invoicing' ),
+					'description' => __('URL to the invoice.', 'invoicing'),
 					'type'        => 'string',
 					'format'      => 'uri',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'mode'       	  => array(
-					'description' => __( 'The mode used to process the invoice.', 'invoicing' ),
+					'description' => __('The mode used to process the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'enum'        => array( 'live', 'test' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'enum'        => array('live', 'test'),
+					'context'     => array('view', 'edit', 'embed'),
 					'readonly'    => true,
 				),
 
 				'slug'       	  => array(
-					'description' => __( 'An alphanumeric identifier for the invoice.', 'invoicing' ),
+					'description' => __('An alphanumeric identifier for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
+					'context'     => array('view', 'edit', 'embed'),
 					'arg_options' => array(
-						'sanitize_callback' => array( $this, 'sanitize_slug' ),
+						'sanitize_callback' => array($this, 'sanitize_slug'),
 					),
 					'readonly'    => true,
 				),
 
 				'status'       	  => array(
-					'description' => __( 'A named status for the invoice.', 'invoicing' ),
+					'description' => __('A named status for the invoice.', 'invoicing'),
 					'type'        => 'string',
 					'enum'        => $this->get_post_statuses(),
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'default'	  => 'wpi-pending',
 				),
 
 				'status_nicename' => array(
-					'description' => __( 'A human-readable status name for the invoice.', 'invoicing' ),
+					'description' => __('A human-readable status name for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'embed' ),
+					'context'     => array('view', 'embed'),
 					'readonly'    => true,
 				),
 
 				'post_type'       => array(
-					'description' => __( 'The post type for the invoice.', 'invoicing' ),
+					'description' => __('The post type for the invoice.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
@@ -1404,12 +1404,12 @@ 
 		 *
 		 * @param array   $schema    The invoice schema.
 		 */
-        $schema = apply_filters( "wpinv_rest_invoice_schema", $schema );
+        $schema = apply_filters("wpinv_rest_invoice_schema", $schema);
 
 		// Cache the invoice schema.
 		$this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
+		return $this->add_additional_fields_schema($this->schema);
 	}
 
 	/**
@@ -1421,20 +1421,20 @@ 
 	 */
 	protected function get_schema_links() {
 
-		$href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
+		$href = rest_url("{$this->namespace}/{$this->rest_base}/{id}");
 
 		$links = array();
 
 		$links[] = array(
 			'rel'          => 'https://api.w.org/action-publish',
-			'title'        => __( 'The current user can mark this invoice as completed.', 'invoicing' ),
+			'title'        => __('The current user can mark this invoice as completed.', 'invoicing'),
 			'href'         => $href,
 			'targetSchema' => array(
 				'type'       => 'object',
 				'properties' => array(
 					'status' => array(
 						'type' => 'string',
-						'enum' => array( 'publish', 'wpi-renewal' ),
+						'enum' => array('publish', 'wpi-renewal'),
 					),
 				),
 			),
@@ -1442,7 +1442,7 @@ 
 
 		$links[] = array(
 			'rel'          => 'https://api.w.org/action-assign-author',
-			'title'        => __( 'The current user can change the owner of this invoice.', 'invoicing' ),
+			'title'        => __('The current user can change the owner of this invoice.', 'invoicing'),
 			'href'         => $href,
 			'targetSchema' => array(
 				'type'       => 'object',
@@ -1465,24 +1465,24 @@ 
 	 * @param WPInv_Invoice $invoice Invoice Object.
 	 * @return array Links for the given invoice.
 	 */
-	protected function prepare_links( $invoice ) {
+	protected function prepare_links($invoice) {
 
 		// Prepare the base REST API endpoint for invoices.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+		$base = sprintf('%s/%s', $this->namespace, $this->rest_base);
 
 		// Entity meta.
 		$links = array(
 			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $invoice->ID ),
+				'href' => rest_url(trailingslashit($base) . $invoice->ID),
 			),
 			'collection' => array(
-				'href' => rest_url( $base ),
+				'href' => rest_url($base),
 			),
 		);
 
-		if ( ! empty( $invoice->user_id ) ) {
+		if (!empty($invoice->user_id)) {
 			$links['user'] = array(
-				'href'       => rest_url( 'wp/v2/users/' . $invoice->user_id ),
+				'href'       => rest_url('wp/v2/users/' . $invoice->user_id),
 				'embeddable' => true,
 			);
 		}
@@ -1496,7 +1496,7 @@ 
 		 *
 		 * @param array   $links    Rest links.
 		 */
-		return apply_filters( "wpinv_rest_invoice_links", $links );
+		return apply_filters("wpinv_rest_invoice_links", $links);
 
 	}
 
@@ -1509,24 +1509,24 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array List of link relations.
 	 */
-	protected function get_available_actions( $invoice, $request ) {
+	protected function get_available_actions($invoice, $request) {
 
-		if ( 'edit' !== $request['context'] ) {
+		if ('edit' !== $request['context']) {
 			return array();
 		}
 
 		$rels = array();
 
 		// Retrieve the post type object.
-		$post_type = get_post_type_object( $invoice->post_type );
+		$post_type = get_post_type_object($invoice->post_type);
 
 		// Mark invoice as completed.
-		if ( current_user_can( $post_type->cap->publish_posts ) ) {
+		if (current_user_can($post_type->cap->publish_posts)) {
 			$rels[] = 'https://api.w.org/action-publish';
 		}
 
 		// Change the owner of the invoice.
-		if ( current_user_can( $post_type->cap->edit_others_posts ) ) {
+		if (current_user_can($post_type->cap->edit_others_posts)) {
 			$rels[] = 'https://api.w.org/action-assign-author';
 		}
 
@@ -1539,7 +1539,7 @@ 
 		 *
 		 * @param array   $rels    Available link relations.
 		 */
-		return apply_filters( "wpinv_rest_invoice_link_relations", $rels );
+		return apply_filters("wpinv_rest_invoice_link_relations", $rels);
 	}
 
 	/**
@@ -1552,8 +1552,8 @@ 
 	 * @param string          $parameter Additional parameter to pass to validation.
 	 * @return array|WP_Error A list of valid statuses, otherwise WP_Error object.
 	 */
-	public function sanitize_post_statuses( $statuses, $request, $parameter ) {
-		return array_intersect( wp_parse_slug_list( $statuses ), $this->get_post_statuses() );
+	public function sanitize_post_statuses($statuses, $request, $parameter) {
+		return array_intersect(wp_parse_slug_list($statuses), $this->get_post_statuses());
 	}
 
 	/**
@@ -1564,7 +1564,7 @@ 
 	 * @return array A list of registered item statuses.
 	 */
 	public function get_post_statuses() {
-		return array_keys( wpinv_get_invoice_statuses( true, true ) );
+		return array_keys(wpinv_get_invoice_statuses(true, true));
 	}
     
 }
\ No newline at end of file

includes/class-wpinv-api.php

Spacing +12 added lines, -12 removed lines

@@ -7,7 +7,7 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -19,7 +19,7 @@ 
     /**
      * @param string A prefix for our REST routes
      */
-    public $api_namespace    = '';
+    public $api_namespace = '';
 
     /**
      * @param WPInv_REST_Invoice_Controller Invoices controller
@@ -42,19 +42,19 @@ 
      * @since 1.0.13
      * Sets the API namespace and inits hooks
      */
-    public function __construct( $api_namespace = 'invoicing/v1' ) {
+    public function __construct($api_namespace = 'invoicing/v1') {
 
         // Include controllers and related files
         $this->includes();
 
         // Set up class variables
-        $this->api_namespace       = apply_filters( 'wpinv_rest_api_namespace', $api_namespace );
-        $this->invoices_controller = new WPInv_REST_Invoice_Controller( $this->api_namespace );
-        $this->items_controller    = new WPInv_REST_Items_Controller( $this->api_namespace );
-        $this->discounts_controller= new WPInv_REST_Discounts_Controller( $this->api_namespace );
+        $this->api_namespace       = apply_filters('wpinv_rest_api_namespace', $api_namespace);
+        $this->invoices_controller = new WPInv_REST_Invoice_Controller($this->api_namespace);
+        $this->items_controller    = new WPInv_REST_Items_Controller($this->api_namespace);
+        $this->discounts_controller = new WPInv_REST_Discounts_Controller($this->api_namespace);
 
         //Register REST routes
-        add_action( 'rest_api_init', array( $this, 'register_rest_routes' ) );
+        add_action('rest_api_init', array($this, 'register_rest_routes'));
     }
 
 
@@ -84,7 +84,7 @@ 
 		 * @param array           $invoice_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        do_action( "wpinv_register_rest_routes", $this );
+        do_action("wpinv_register_rest_routes", $this);
         
     }
 
@@ -97,13 +97,13 @@ 
     protected function includes() {
         
         // Invoices
-        require_once( WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-invoice-controller.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-invoice-controller.php');
 
         // Items
-        require_once( WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-items-controller.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-items-controller.php');
 
         // Discounts
-        require_once( WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-discounts-controller.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/api/class-wpinv-rest-discounts-controller.php');
 
     }
     

includes/wpinv-general-functions.php

Spacing +177 added lines, -177 removed lines

@@ -7,201 +7,201 @@ 
  */
  
 // 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_is_checkout() {
     global $wp_query;
 
-    $is_object_set    = isset( $wp_query->queried_object );
-    $is_object_id_set = isset( $wp_query->queried_object_id );
-    $is_checkout      = is_page( wpinv_get_option( 'checkout_page' ) );
+    $is_object_set    = isset($wp_query->queried_object);
+    $is_object_id_set = isset($wp_query->queried_object_id);
+    $is_checkout      = is_page(wpinv_get_option('checkout_page'));
 
-    if ( !$is_object_set ) {
-        unset( $wp_query->queried_object );
+    if (!$is_object_set) {
+        unset($wp_query->queried_object);
     }
 
-    if ( !$is_object_id_set ) {
-        unset( $wp_query->queried_object_id );
+    if (!$is_object_id_set) {
+        unset($wp_query->queried_object_id);
     }
 
-    return apply_filters( 'wpinv_is_checkout', $is_checkout );
+    return apply_filters('wpinv_is_checkout', $is_checkout);
 }
 
 function wpinv_can_checkout() {
 	$can_checkout = true; // Always true for now
 
-	return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
+	return (bool) apply_filters('wpinv_can_checkout', $can_checkout);
 }
 
 function wpinv_get_success_page_uri() {
-	$page_id = wpinv_get_option( 'success_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('success_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_success_page_uri', get_permalink($page_id));
 }
 
 function wpinv_get_history_page_uri() {
-	$page_id = wpinv_get_option( 'invoice_history_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('invoice_history_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_history_page_uri', get_permalink($page_id));
 }
 
 function wpinv_is_success_page() {
-	$is_success_page = wpinv_get_option( 'success_page', false );
-	$is_success_page = isset( $is_success_page ) ? is_page( $is_success_page ) : false;
+	$is_success_page = wpinv_get_option('success_page', false);
+	$is_success_page = isset($is_success_page) ? is_page($is_success_page) : false;
 
-	return apply_filters( 'wpinv_is_success_page', $is_success_page );
+	return apply_filters('wpinv_is_success_page', $is_success_page);
 }
 
 function wpinv_is_invoice_history_page() {
-	$ret = wpinv_get_option( 'invoice_history_page', false );
-	$ret = $ret ? is_page( $ret ) : false;
-	return apply_filters( 'wpinv_is_invoice_history_page', $ret );
+	$ret = wpinv_get_option('invoice_history_page', false);
+	$ret = $ret ? is_page($ret) : false;
+	return apply_filters('wpinv_is_invoice_history_page', $ret);
 }
 
 function wpinv_is_subscriptions_history_page() {
-    $ret = wpinv_get_option( 'invoice_subscription_page', false );
-    $ret = $ret ? is_page( $ret ) : false;
-    return apply_filters( 'wpinv_is_subscriptions_history_page', $ret );
+    $ret = wpinv_get_option('invoice_subscription_page', false);
+    $ret = $ret ? is_page($ret) : false;
+    return apply_filters('wpinv_is_subscriptions_history_page', $ret);
 }
 
-function wpinv_send_to_success_page( $args = null ) {
+function wpinv_send_to_success_page($args = null) {
 	$redirect = wpinv_get_success_page_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_success_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_success_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_send_to_failed_page( $args = null ) {
+function wpinv_send_to_failed_page($args = null) {
 	$redirect = wpinv_get_failed_transaction_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_failed_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_failed_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_get_checkout_uri( $args = array() ) {
-	$uri = wpinv_get_option( 'checkout_page', false );
-	$uri = isset( $uri ) ? get_permalink( $uri ) : NULL;
+function wpinv_get_checkout_uri($args = array()) {
+	$uri = wpinv_get_option('checkout_page', false);
+	$uri = isset($uri) ? get_permalink($uri) : NULL;
 
-	if ( !empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$uri = add_query_arg( $args, $uri );
+		$uri = add_query_arg($args, $uri);
 	}
 
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+	$scheme = defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
-	$ajax_url = admin_url( 'admin-ajax.php', $scheme );
+	$ajax_url = admin_url('admin-ajax.php', $scheme);
 
-	if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
-		$uri = preg_replace( '/^http:/', 'https:', $uri );
+	if ((!preg_match('/^https/', $uri) && preg_match('/^https/', $ajax_url)) || wpinv_is_ssl_enforced()) {
+		$uri = preg_replace('/^http:/', 'https:', $uri);
 	}
 
-	return apply_filters( 'wpinv_get_checkout_uri', $uri );
+	return apply_filters('wpinv_get_checkout_uri', $uri);
 }
 
-function wpinv_send_back_to_checkout( $args = array() ) {
+function wpinv_send_back_to_checkout($args = array()) {
 	$redirect = wpinv_get_checkout_uri();
 
-	if ( ! empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$redirect = add_query_arg( $args, $redirect );
+		$redirect = add_query_arg($args, $redirect);
 	}
 
-	wp_redirect( apply_filters( 'wpinv_send_back_to_checkout', $redirect, $args ) );
+	wp_redirect(apply_filters('wpinv_send_back_to_checkout', $redirect, $args));
 	exit;
 }
 
-function wpinv_get_success_page_url( $query_string = null ) {
-	$success_page = wpinv_get_option( 'success_page', 0 );
-	$success_page = get_permalink( $success_page );
+function wpinv_get_success_page_url($query_string = null) {
+	$success_page = wpinv_get_option('success_page', 0);
+	$success_page = get_permalink($success_page);
 
-	if ( $query_string )
+	if ($query_string)
 		$success_page .= $query_string;
 
-	return apply_filters( 'wpinv_success_page_url', $success_page );
+	return apply_filters('wpinv_success_page_url', $success_page);
 }
 
-function wpinv_get_failed_transaction_uri( $extras = false ) {
-	$uri = wpinv_get_option( 'failure_page', '' );
-	$uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
+function wpinv_get_failed_transaction_uri($extras = false) {
+	$uri = wpinv_get_option('failure_page', '');
+	$uri = !empty($uri) ? trailingslashit(get_permalink($uri)) : home_url();
 
-	if ( $extras )
+	if ($extras)
 		$uri .= $extras;
 
-	return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
+	return apply_filters('wpinv_get_failed_transaction_uri', $uri);
 }
 
 function wpinv_is_failed_transaction_page() {
-	$ret = wpinv_get_option( 'failure_page', false );
-	$ret = isset( $ret ) ? is_page( $ret ) : false;
+	$ret = wpinv_get_option('failure_page', false);
+	$ret = isset($ret) ? is_page($ret) : false;
 
-	return apply_filters( 'wpinv_is_failure_page', $ret );
+	return apply_filters('wpinv_is_failure_page', $ret);
 }
 
-function wpinv_transaction_query( $type = 'start' ) {
+function wpinv_transaction_query($type = 'start') {
     global $wpdb;
 
     $wpdb->hide_errors();
 
-    if ( ! defined( 'WPINV_USE_TRANSACTIONS' ) ) {
-        define( 'WPINV_USE_TRANSACTIONS', true );
+    if (!defined('WPINV_USE_TRANSACTIONS')) {
+        define('WPINV_USE_TRANSACTIONS', true);
     }
 
-    if ( WPINV_USE_TRANSACTIONS ) {
-        switch ( $type ) {
+    if (WPINV_USE_TRANSACTIONS) {
+        switch ($type) {
             case 'commit' :
-                $wpdb->query( 'COMMIT' );
+                $wpdb->query('COMMIT');
                 break;
             case 'rollback' :
-                $wpdb->query( 'ROLLBACK' );
+                $wpdb->query('ROLLBACK');
                 break;
             default :
-                $wpdb->query( 'START TRANSACTION' );
+                $wpdb->query('START TRANSACTION');
             break;
         }
     }
 }
 
-function wpinv_create_invoice( $args = array(), $data = array(), $wp_error = false ) {
+function wpinv_create_invoice($args = array(), $data = array(), $wp_error = false) {
     $default_args = array(
         'status'        => '',
         'user_id'       => null,
@@ -212,66 +212,66 @@ 
         'post_type'     => 'wpi_invoice'
     );
 
-    $args           = wp_parse_args( $args, $default_args );
+    $args           = wp_parse_args($args, $default_args);
     $invoice_data   = array();
 
-    if ( $args['invoice_id'] > 0 ) {
-        $updating           = true;
+    if ($args['invoice_id'] > 0) {
+        $updating = true;
         $invoice_data['post_type']  = $args['post_type'];
         $invoice_data['ID']         = $args['invoice_id'];
     } else {
         $updating                       = false;
         $invoice_data['post_type']      = $args['post_type'];
-        $invoice_data['post_status']    = apply_filters( 'wpinv_default_invoice_status', 'wpi-pending' );
+        $invoice_data['post_status']    = apply_filters('wpinv_default_invoice_status', 'wpi-pending');
         $invoice_data['ping_status']    = 'closed';
-        $invoice_data['post_author']    = !empty( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
-        $invoice_data['post_title']     = wpinv_format_invoice_number( '0' );
-        $invoice_data['post_parent']    = absint( $args['parent'] );
-        if ( !empty( $args['created_date'] ) ) {
+        $invoice_data['post_author']    = !empty($args['user_id']) ? $args['user_id'] : get_current_user_id();
+        $invoice_data['post_title']     = wpinv_format_invoice_number('0');
+        $invoice_data['post_parent']    = absint($args['parent']);
+        if (!empty($args['created_date'])) {
             $invoice_data['post_date']      = $args['created_date'];
-            $invoice_data['post_date_gmt']  = get_gmt_from_date( $args['created_date'] );
+            $invoice_data['post_date_gmt']  = get_gmt_from_date($args['created_date']);
         }
     }
 
-    if ( $args['status'] ) {
-        if ( ! in_array( $args['status'], array_keys( wpinv_get_invoice_statuses() ) ) && 'wpi_invoice' === $invoice_data['post_type'] ) {
-            return new WP_Error( 'wpinv_invalid_invoice_status', wp_sprintf( __( 'Invalid invoice status: %s', 'invoicing' ), $args['status'] ) );
+    if ($args['status']) {
+        if (!in_array($args['status'], array_keys(wpinv_get_invoice_statuses())) && 'wpi_invoice' === $invoice_data['post_type']) {
+            return new WP_Error('wpinv_invalid_invoice_status', wp_sprintf(__('Invalid invoice status: %s', 'invoicing'), $args['status']));
         }
-        $invoice_data['post_status']    = $args['status'];
+        $invoice_data['post_status'] = $args['status'];
     }
 
-    if ( ! is_null( $args['user_note'] ) ) {
-        $invoice_data['post_excerpt']   = $args['user_note'];
+    if (!is_null($args['user_note'])) {
+        $invoice_data['post_excerpt'] = $args['user_note'];
     }
 
-    if ( $updating ) {
-        $invoice_id = wp_update_post( $invoice_data, true );
+    if ($updating) {
+        $invoice_id = wp_update_post($invoice_data, true);
     } else {
-        $invoice_id = wp_insert_post( apply_filters( 'wpinv_new_invoice_data', $invoice_data ), true );
+        $invoice_id = wp_insert_post(apply_filters('wpinv_new_invoice_data', $invoice_data), true);
     }
 
-    if ( is_wp_error( $invoice_id ) ) {
+    if (is_wp_error($invoice_id)) {
         return $wp_error ? $invoice_id : 0;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-
-    if ( !$updating ) {
-        update_post_meta( $invoice_id, '_wpinv_key', apply_filters( 'wpinv_generate_invoice_key', uniqid( 'wpinv_' ) ) );
-        update_post_meta( $invoice_id, '_wpinv_currency', wpinv_get_currency() );
-        update_post_meta( $invoice_id, '_wpinv_include_tax', get_option( 'wpinv_prices_include_tax' ) );
-        update_post_meta( $invoice_id, '_wpinv_user_ip', wpinv_get_ip() );
-        update_post_meta( $invoice_id, '_wpinv_user_agent', wpinv_get_user_agent() );
-        update_post_meta( $invoice_id, '_wpinv_created_via', sanitize_text_field( $args['created_via'] ) );
+    $invoice = wpinv_get_invoice($invoice_id);
+
+    if (!$updating) {
+        update_post_meta($invoice_id, '_wpinv_key', apply_filters('wpinv_generate_invoice_key', uniqid('wpinv_')));
+        update_post_meta($invoice_id, '_wpinv_currency', wpinv_get_currency());
+        update_post_meta($invoice_id, '_wpinv_include_tax', get_option('wpinv_prices_include_tax'));
+        update_post_meta($invoice_id, '_wpinv_user_ip', wpinv_get_ip());
+        update_post_meta($invoice_id, '_wpinv_user_agent', wpinv_get_user_agent());
+        update_post_meta($invoice_id, '_wpinv_created_via', sanitize_text_field($args['created_via']));
         
         // Add invoice note
-        if ( ! $invoice->is_quote() ) {
-            $invoice->add_note( wp_sprintf( __( 'Invoice is created with status %s.', 'invoicing' ), wpinv_status_nicename( $invoice->status ) ) );
+        if (!$invoice->is_quote()) {
+            $invoice->add_note(wp_sprintf(__('Invoice is created with status %s.', 'invoicing'), wpinv_status_nicename($invoice->status)));
         }
         
     }
 
-    update_post_meta( $invoice_id, '_wpinv_version', WPINV_VERSION );
+    update_post_meta($invoice_id, '_wpinv_version', WPINV_VERSION);
 
     return $invoice;
 }
@@ -279,184 +279,184 @@ 
 function wpinv_get_prefix() {
     $invoice_prefix = 'INV-';
     
-    return apply_filters( 'wpinv_get_prefix', $invoice_prefix );
+    return apply_filters('wpinv_get_prefix', $invoice_prefix);
 }
 
 function wpinv_get_business_logo() {
-    $business_logo = wpinv_get_option( 'logo' );
-    return apply_filters( 'wpinv_get_business_logo', $business_logo );
+    $business_logo = wpinv_get_option('logo');
+    return apply_filters('wpinv_get_business_logo', $business_logo);
 }
 
 function wpinv_get_business_name() {
     $business_name = wpinv_get_option('store_name');
-    return apply_filters( 'wpinv_get_business_name', $business_name );
+    return apply_filters('wpinv_get_business_name', $business_name);
 }
 
 function wpinv_get_blogname() {
-    return wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    return wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 }
 
 function wpinv_get_admin_email() {
-    $admin_email = get_option( 'admin_email' );
-    return apply_filters( 'wpinv_admin_email', $admin_email );
+    $admin_email = get_option('admin_email');
+    return apply_filters('wpinv_admin_email', $admin_email);
 }
 
 function wpinv_get_business_website() {
-    $business_website = home_url( '/' );
-    return apply_filters( 'wpinv_get_business_website', $business_website );
+    $business_website = home_url('/');
+    return apply_filters('wpinv_get_business_website', $business_website);
 }
 
-function wpinv_get_terms_text( $invoice_id = 0 ) {
+function wpinv_get_terms_text($invoice_id = 0) {
     $terms_text = '';
-    return apply_filters( 'wpinv_get_terms_text', $terms_text, $invoice_id );
+    return apply_filters('wpinv_get_terms_text', $terms_text, $invoice_id);
 }
 
 function wpinv_get_business_footer() {
-    $site_link = '<a target="_blank" href="' . esc_url( wpinv_get_business_website() ) . '">' . esc_html( wpinv_get_business_name() ) . '</a>';
-    $business_footer = wp_sprintf( __( 'Thanks for using %s', 'invoicing' ), $site_link );
-    return apply_filters( 'wpinv_get_business_footer', $business_footer );
+    $site_link = '<a target="_blank" href="' . esc_url(wpinv_get_business_website()) . '">' . esc_html(wpinv_get_business_name()) . '</a>';
+    $business_footer = wp_sprintf(__('Thanks for using %s', 'invoicing'), $site_link);
+    return apply_filters('wpinv_get_business_footer', $business_footer);
 }
 
 function wpinv_checkout_required_fields() {
     $required_fields = array();
     
     // Let payment gateways and other extensions determine if address fields should be required
-    $require_billing_details = apply_filters( 'wpinv_checkout_required_billing_details', wpinv_use_taxes() );
+    $require_billing_details = apply_filters('wpinv_checkout_required_billing_details', wpinv_use_taxes());
     
-    if ( $require_billing_details ) {
-		if ( (bool)wpinv_get_option( 'fname_mandatory' ) ) {
+    if ($require_billing_details) {
+		if ((bool) wpinv_get_option('fname_mandatory')) {
 			$required_fields['first_name'] = array(
 				'error_id' => 'invalid_first_name',
-				'error_message' => __( 'Please enter your first name', 'invoicing' )
+				'error_message' => __('Please enter your first name', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'address_mandatory' ) ) {
+		if ((bool) wpinv_get_option('address_mandatory')) {
 			$required_fields['address'] = array(
 				'error_id' => 'invalid_address',
-				'error_message' => __( 'Please enter your address', 'invoicing' )
+				'error_message' => __('Please enter your address', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'city_mandatory' ) ) {
+		if ((bool) wpinv_get_option('city_mandatory')) {
 			$required_fields['city'] = array(
 				'error_id' => 'invalid_city',
-				'error_message' => __( 'Please enter your billing city', 'invoicing' )
+				'error_message' => __('Please enter your billing city', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'state_mandatory' ) ) {
+		if ((bool) wpinv_get_option('state_mandatory')) {
 			$required_fields['state'] = array(
 				'error_id' => 'invalid_state',
-				'error_message' => __( 'Please enter billing state / province', 'invoicing' )
+				'error_message' => __('Please enter billing state / province', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'country_mandatory' ) ) {
+		if ((bool) wpinv_get_option('country_mandatory')) {
 			$required_fields['country'] = array(
 				'error_id' => 'invalid_country',
-				'error_message' => __( 'Please select your billing country', 'invoicing' )
+				'error_message' => __('Please select your billing country', 'invoicing')
 			);
 		}
     }
 
-    return apply_filters( 'wpinv_checkout_required_fields', $required_fields );
+    return apply_filters('wpinv_checkout_required_fields', $required_fields);
 }
 
 function wpinv_is_ssl_enforced() {
-    $ssl_enforced = wpinv_get_option( 'enforce_ssl', false );
-    return (bool) apply_filters( 'wpinv_is_ssl_enforced', $ssl_enforced );
+    $ssl_enforced = wpinv_get_option('enforce_ssl', false);
+    return (bool) apply_filters('wpinv_is_ssl_enforced', $ssl_enforced);
 }
 
-function wpinv_user_can_view_invoice( $post ) {
+function wpinv_user_can_view_invoice($post) {
     $allow = false;
 
-    $post = get_post( $post );
+    $post = get_post($post);
 
-    if ( empty( $post->ID ) ) {
+    if (empty($post->ID)) {
         return $allow;
     }
 
-    $invoice = wpinv_get_invoice( $post->ID );
-    if ( empty( $invoice->ID ) ) {
+    $invoice = wpinv_get_invoice($post->ID);
+    if (empty($invoice->ID)) {
         return $allow;
     }
 
     // Don't allow trash, draft status
-    if ( $invoice->has_status( array_keys( wpinv_get_invoice_statuses() ) ) ) {
-        if ( wpinv_current_user_can_manage_invoicing() || current_user_can( 'view_invoices', $invoice->ID ) ) { // Admin user
+    if ($invoice->has_status(array_keys(wpinv_get_invoice_statuses()))) {
+        if (wpinv_current_user_can_manage_invoicing() || current_user_can('view_invoices', $invoice->ID)) { // Admin user
             $allow = true;
         } else {
-            if ( is_user_logged_in() ) {
-                if ( (int)$invoice->get_user_id() === (int)get_current_user_id() ) {
+            if (is_user_logged_in()) {
+                if ((int) $invoice->get_user_id() === (int) get_current_user_id()) {
                     $allow = true;
-                } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                } else if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
                     $allow = true;
                 }
             } else {
-                if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
                     $allow = true;
                 }
             }
         }
     }
     
-    return apply_filters( 'wpinv_can_print_invoice', $allow, $post, $invoice );
+    return apply_filters('wpinv_can_print_invoice', $allow, $post, $invoice);
 }
 
 function wpinv_schedule_events() {
     // hourly, daily and twicedaily
-    if ( !wp_next_scheduled( 'wpinv_register_schedule_event_twicedaily' ) ) {
-        wp_schedule_event( current_time( 'timestamp' ), 'twicedaily', 'wpinv_register_schedule_event_twicedaily' );
+    if (!wp_next_scheduled('wpinv_register_schedule_event_twicedaily')) {
+        wp_schedule_event(current_time('timestamp'), 'twicedaily', 'wpinv_register_schedule_event_twicedaily');
     }
 }
-add_action( 'wp', 'wpinv_schedule_events' );
+add_action('wp', 'wpinv_schedule_events');
 
 function wpinv_schedule_event_twicedaily() {
     wpinv_email_payment_reminders();
 }
-add_action( 'wpinv_register_schedule_event_twicedaily', 'wpinv_schedule_event_twicedaily' );
+add_action('wpinv_register_schedule_event_twicedaily', 'wpinv_schedule_event_twicedaily');
 
 function wpinv_require_login_to_checkout() {
-    $return = wpinv_get_option( 'login_to_checkout', false );
-    return (bool) apply_filters( 'wpinv_require_login_to_checkout', $return );
+    $return = wpinv_get_option('login_to_checkout', false);
+    return (bool) apply_filters('wpinv_require_login_to_checkout', $return);
 }
 
-function wpinv_sequential_number_active( $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_check_sequential_number_active', null, $type );
-    if ( null !== $check ) {
+function wpinv_sequential_number_active($type = '') {
+    $check = apply_filters('wpinv_pre_check_sequential_number_active', null, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    return wpinv_get_option( 'sequential_invoice_number' );
+    return wpinv_get_option('sequential_invoice_number');
 }
 
-function wpinv_switch_to_locale( $locale = NULL ) {
+function wpinv_switch_to_locale($locale = NULL) {
     global $invoicing, $wpi_switch_locale;
 
-    if ( ! empty( $invoicing ) && function_exists( 'switch_to_locale' ) ) {
-        $locale = empty( $locale ) ? get_locale() : $locale;
+    if (!empty($invoicing) && function_exists('switch_to_locale')) {
+        $locale = empty($locale) ? get_locale() : $locale;
 
-        switch_to_locale( $locale );
+        switch_to_locale($locale);
 
         $wpi_switch_locale = $locale;
 
-        add_filter( 'plugin_locale', 'get_locale' );
+        add_filter('plugin_locale', 'get_locale');
 
         $invoicing->load_textdomain();
 
-        do_action( 'wpinv_switch_to_locale', $locale );
+        do_action('wpinv_switch_to_locale', $locale);
     }
 }
 
 function wpinv_restore_locale() {
     global $invoicing, $wpi_switch_locale;
     
-    if ( ! empty( $invoicing ) && function_exists( 'restore_previous_locale' ) && $wpi_switch_locale ) {
+    if (!empty($invoicing) && function_exists('restore_previous_locale') && $wpi_switch_locale) {
         restore_previous_locale();
 
         $wpi_switch_locale = NULL;
 
-        remove_filter( 'plugin_locale', 'get_locale' );
+        remove_filter('plugin_locale', 'get_locale');
 
         $invoicing->load_textdomain();
 
-        do_action( 'wpinv_restore_locale' );
+        do_action('wpinv_restore_locale');
     }
 }
\ No newline at end of file

includes/wpinv-subscription.php

Spacing +168 added lines, -168 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,15 +38,15 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+	function __construct($_id_or_object = 0, $_by_profile_id = false) {
 
 		$this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+		if ($_by_profile_id) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+			$_sub = $this->subs_db->get_by('profile_id', $_id_or_object);
 
-			if( empty( $_sub ) ) {
+			if (empty($_sub)) {
 				return false;
 			}
 
@@ -54,7 +54,7 @@ 
 
 		}
 
-		return $this->setup_subscription( $_id_or_object );
+		return $this->setup_subscription($_id_or_object);
 	}
 
 	/**
@@ -63,34 +63,34 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+	private function setup_subscription($id_or_object = 0) {
 
-		if( empty( $id_or_object ) ) {
+		if (empty($id_or_object)) {
 			return false;
 		}
 
-		if( is_numeric( $id_or_object ) ) {
+		if (is_numeric($id_or_object)) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+			$sub = $this->subs_db->get($id_or_object);
 
-		} elseif( is_object( $id_or_object ) ) {
+		} elseif (is_object($id_or_object)) {
 
 			$sub = $id_or_object;
 
 		}
 
-		if( empty( $sub ) ) {
+		if (empty($sub)) {
 			return false;
 		}
 
-		foreach( $sub as $key => $value ) {
+		foreach ($sub as $key => $value) {
 			$this->$key = $value;
 		}
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+		$this->customer = get_userdata($this->customer_id);
+		$this->gateway  = wpinv_get_payment_gateway($this->parent_payment_id);
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+		do_action('wpinv_recurring_setup_subscription', $this);
 
 		return $this;
 	}
@@ -100,15 +100,15 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_' . $key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_' . $key));
 
 		} else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+			return new WP_Error('wpinv-subscription-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
 
 		}
 
@@ -121,9 +121,9 @@ 
 	 * @param  array  $data Array of attributes for a subscription
 	 * @return mixed  false if data isn't passed and class not instantiated for creation
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 ) {
+		if ($this->id != 0) {
 			return false;
 		}
 
@@ -142,11 +142,11 @@ 
 			'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 ($args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+			if ('active' == $args['status'] || 'trialling' == $args['status']) {
 
 				// Force an active subscription to expired if expiration date is in the past
 				$args['status'] = 'expired';
@@ -154,13 +154,13 @@ 
 			}
 		}
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+		do_action('wpinv_subscription_pre_create', $args);
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+		$id = $this->subs_db->insert($args, 'subscription');
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+		do_action('wpinv_subscription_post_create', $id, $args);
 
-		return $this->setup_subscription( $id );
+		return $this->setup_subscription($id);
 
 	}
 
@@ -171,11 +171,11 @@ 
 	 * @param  array $args Array of fields to update
 	 * @return bool
 	 */
-	public function update( $args = array() ) {
+	public function update($args = array()) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+		$ret = $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+		do_action('wpinv_recurring_update_subscription', $this->id, $args, $this);
 
 		return $ret;
 
@@ -188,7 +188,7 @@ 
 	 * @return bool
 	 */
 	public function delete() {
-		return $this->subs_db->delete( $this->id );
+		return $this->subs_db->delete($this->id);
 	}
 
     /**
@@ -208,14 +208,14 @@ 
      * @return array
      */
     public function get_child_payments() {
-        $payments = get_posts( array(
+        $payments = get_posts(array(
             'post_parent'    => (int) $this->parent_payment_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',
             'post_type'      => 'wpi_invoice'
-        ) );
+        ));
 
         return $payments;
     }
@@ -228,9 +228,9 @@ 
      */
     public function get_total_payments() {
         $child_payments = $this->get_child_payments();
-        $total_payments = !empty( $child_payments ) ? count( $child_payments ) : 0;
+        $total_payments = !empty($child_payments) ? count($child_payments) : 0;
 
-        if ( 'pending' != $this->status ) {
+        if ('pending' != $this->status) {
                 $total_payments++;
         }
 
@@ -244,9 +244,9 @@ 
      * @return int
      */
     public function get_times_billed() {
-        $times_billed = (int)$this->get_total_payments();
+        $times_billed = (int) $this->get_total_payments();
 
-        if ( ! empty( $this->trial_period ) && $times_billed > 0 ) {
+        if (!empty($this->trial_period) && $times_billed > 0) {
             $times_billed--;
         }
 
@@ -260,51 +260,51 @@ 
      * @param  array $args Array of values for the payment, including amount and transaction ID
      * @return bool
      */
-    public function add_payment( $args = array() ) {
-        if ( ! $this->parent_payment_id ) {
+    public function add_payment($args = array()) {
+        if (!$this->parent_payment_id) {
             return false;
         }
 
-        $args = wp_parse_args( $args, array(
+        $args = wp_parse_args($args, array(
             'amount'         => '',
             'transaction_id' => '',
             'gateway'        => ''
-        ) );
+        ));
         
-        if ( empty( $args['transaction_id'] ) || $this->payment_exists( $args['transaction_id'] ) ) {
+        if (empty($args['transaction_id']) || $this->payment_exists($args['transaction_id'])) {
             return false;
         }
         
-        $parent_invoice = wpinv_get_invoice( $this->parent_payment_id );
-        if ( empty( $parent_invoice->ID ) ) {
+        $parent_invoice = wpinv_get_invoice($this->parent_payment_id);
+        if (empty($parent_invoice->ID)) {
             return false;
         }
 
         $invoice = new WPInv_Invoice();
-        $invoice->set( 'post_type', 'wpi_invoice' );
-        $invoice->set( 'parent_invoice', $this->parent_payment_id );
-        $invoice->set( 'currency', $parent_invoice->get_currency() );
-        $invoice->set( 'transaction_id', $args['transaction_id'] );
-        $invoice->set( 'key', $parent_invoice->generate_key() );
-        $invoice->set( 'ip', $parent_invoice->ip );
-        $invoice->set( 'user_id', $parent_invoice->get_user_id() );
-        $invoice->set( 'first_name', $parent_invoice->get_first_name() );
-        $invoice->set( 'last_name', $parent_invoice->get_last_name() );
-        $invoice->set( 'phone', $parent_invoice->phone );
-        $invoice->set( 'address', $parent_invoice->address );
-        $invoice->set( 'city', $parent_invoice->city );
-        $invoice->set( 'country', $parent_invoice->country );
-        $invoice->set( 'state', $parent_invoice->state );
-        $invoice->set( 'zip', $parent_invoice->zip );
-        $invoice->set( 'company', $parent_invoice->company );
-        $invoice->set( 'vat_number', $parent_invoice->vat_number );
-        $invoice->set( 'vat_rate', $parent_invoice->vat_rate );
-        $invoice->set( 'adddress_confirmed', $parent_invoice->adddress_confirmed );
-
-        if ( empty( $args['gateway'] ) ) {
-            $invoice->set( 'gateway', $parent_invoice->get_gateway() );
+        $invoice->set('post_type', 'wpi_invoice');
+        $invoice->set('parent_invoice', $this->parent_payment_id);
+        $invoice->set('currency', $parent_invoice->get_currency());
+        $invoice->set('transaction_id', $args['transaction_id']);
+        $invoice->set('key', $parent_invoice->generate_key());
+        $invoice->set('ip', $parent_invoice->ip);
+        $invoice->set('user_id', $parent_invoice->get_user_id());
+        $invoice->set('first_name', $parent_invoice->get_first_name());
+        $invoice->set('last_name', $parent_invoice->get_last_name());
+        $invoice->set('phone', $parent_invoice->phone);
+        $invoice->set('address', $parent_invoice->address);
+        $invoice->set('city', $parent_invoice->city);
+        $invoice->set('country', $parent_invoice->country);
+        $invoice->set('state', $parent_invoice->state);
+        $invoice->set('zip', $parent_invoice->zip);
+        $invoice->set('company', $parent_invoice->company);
+        $invoice->set('vat_number', $parent_invoice->vat_number);
+        $invoice->set('vat_rate', $parent_invoice->vat_rate);
+        $invoice->set('adddress_confirmed', $parent_invoice->adddress_confirmed);
+
+        if (empty($args['gateway'])) {
+            $invoice->set('gateway', $parent_invoice->get_gateway());
         } else {
-            $invoice->set( 'gateway', $args['gateway'] );
+            $invoice->set('gateway', $args['gateway']);
         }
         
         $recurring_details = $parent_invoice->get_recurring_details();
@@ -312,11 +312,11 @@ 
         // increase the earnings for each item in the subscription
         $items = $recurring_details['cart_details'];
         
-        if ( $items ) {        
+        if ($items) {        
             $add_items      = array();
             $cart_details   = array();
             
-            foreach ( $items as $item ) {
+            foreach ($items as $item) {
                 $add_item             = array();
                 $add_item['id']       = $item['id'];
                 $add_item['quantity'] = $item['quantity'];
@@ -326,7 +326,7 @@ 
                 break;
             }
             
-            $invoice->set( 'items', $add_items );
+            $invoice->set('items', $add_items);
             $invoice->cart_details = $cart_details;
         }
         
@@ -336,32 +336,32 @@ 
         $tax                = $recurring_details['tax'];
         $discount           = $recurring_details['discount'];
         
-        if ( $discount > 0 ) {
-            $invoice->set( 'discount_code', $parent_invoice->discount_code );
+        if ($discount > 0) {
+            $invoice->set('discount_code', $parent_invoice->discount_code);
         }
         
-        $invoice->subtotal = wpinv_round_amount( $subtotal );
-        $invoice->tax      = wpinv_round_amount( $tax );
-        $invoice->discount = wpinv_round_amount( $discount );
-        $invoice->total    = wpinv_round_amount( $total );
+        $invoice->subtotal = wpinv_round_amount($subtotal);
+        $invoice->tax      = wpinv_round_amount($tax);
+        $invoice->discount = wpinv_round_amount($discount);
+        $invoice->total    = wpinv_round_amount($total);
 
-        $invoice  = apply_filters( 'wpinv_subscription_add_payment_save', $invoice, $this, $args );
+        $invoice = apply_filters('wpinv_subscription_add_payment_save', $invoice, $this, $args);
 
         $invoice->save();
-        $invoice->update_meta( '_wpinv_subscription_id', $this->id );
+        $invoice->update_meta('_wpinv_subscription_id', $this->id);
         
-        if ( !empty( $invoice->ID ) ) {
-            wpinv_update_payment_status( $invoice->ID, 'publish' );
+        if (!empty($invoice->ID)) {
+            wpinv_update_payment_status($invoice->ID, 'publish');
             sleep(1);
-            wpinv_update_payment_status( $invoice->ID, 'wpi-renewal' );
+            wpinv_update_payment_status($invoice->ID, 'wpi-renewal');
             
-            $invoice = wpinv_get_invoice( $invoice->ID );
+            $invoice = wpinv_get_invoice($invoice->ID);
 
 			// Send email notifications.
-			wpinv_completed_invoice_notification( $invoice->ID );
+			wpinv_completed_invoice_notification($invoice->ID);
 
-            do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
-            do_action( 'wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id'] );
+            do_action('wpinv_recurring_add_subscription_payment', $invoice, $this);
+            do_action('wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id']);
             
             return $invoice->ID;
         }
@@ -377,12 +377,12 @@ 
 	 */
 	public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+		if (empty($this->transaction_id)) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+			$txn_id = wpinv_get_payment_transaction_id($this->parent_payment_id);
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
+			if (!empty($txn_id) && (int) $this->parent_payment_id !== (int) $txn_id) {
+				$this->set_transaction_id($txn_id);
 			}
 
 		}
@@ -397,8 +397,8 @@ 
 	 * @since  1.0.0.4
 	 * @return bool
 	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
+	public function set_transaction_id($txn_id = '') {
+		$this->update(array('transaction_id' => $txn_id));
 		$this->transaction_id = $txn_id;
 	}
 
@@ -414,35 +414,35 @@ 
 
 
 		// Determine what date to use as the start for the new expiration calculation
-		if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
+		if ($expires > current_time('timestamp') && $this->is_active()) {
 
-			$base_date  = $expires;
+			$base_date = $expires;
 
 		} else {
 
-			$base_date  = current_time( 'timestamp' );
+			$base_date = current_time('timestamp');
 
 		}
 
-		$last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
+		$last_day = wpinv_cal_days_in_month(CAL_GREGORIAN, date('n', $base_date), date('Y', $base_date));
 
 
 		$frequency = isset($this->frequency) ? $this->frequency : 1;
-		$expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
+		$expiration = date('Y-m-d H:i:s', strtotime('+' . $frequency . ' ' . $this->period . ' 23:59:59', $base_date));
 
-		if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
-			$expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
+		if (date('j', $base_date) == $last_day && 'day' != $this->period) {
+			$expiration = date('Y-m-d H:i:s', strtotime($expiration . ' +2 days'));
 		}
 
-		$expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
+		$expiration  = apply_filters('wpinv_subscription_renewal_expiration', $expiration, $this->id, $this);
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
+		do_action('wpinv_subscription_pre_renew', $this->id, $expiration, $this);
 
 		$this->status = 'active';
 		$times_billed = $this->get_times_billed();
 
 		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+		if ($this->bill_times > 0 && $times_billed >= $this->bill_times) {
 			$this->complete();
 			$this->status = 'completed';
 		}
@@ -452,10 +452,10 @@ 
 			'status'     => $this->status,
 		);
 
-        $this->subs_db->update( $this->id, $args );
+        $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+		do_action('wpinv_subscription_post_renew', $this->id, $expiration, $this);
+		do_action('wpinv_recurring_set_subscription_status', $this->id, $this->status, $this);
 
 	}
 
@@ -470,7 +470,7 @@ 
 	public function complete() {
 
 		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
+		if ('cancelled' === $this->status) {
 			return;
 		}
 
@@ -478,11 +478,11 @@ 
 			'status' => 'completed'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+			do_action('wpinv_subscription_completed', $this->id, $this);
 
 		}
 
@@ -497,15 +497,15 @@ 
 	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
 	 * @return void
 	 */
-	public function expire( $check_expiration = false ) {
+	public function expire($check_expiration = false) {
 
 		$expiration = $this->expiration;
 
-		if( $check_expiration ) {
+		if ($check_expiration) {
 
 			// check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+			if ($expiration < $this->get_expiration() && current_time('timestamp') < $this->get_expiration_time()) {
 
 				return false; // Do not mark as expired since real expiration date is in the future
 			}
@@ -516,11 +516,11 @@ 
 			'status' => 'expired'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+			do_action('wpinv_subscription_expired', $this->id, $this);
 
 		}
 
@@ -538,11 +538,11 @@ 
 			'status' => 'failing'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
+			do_action('wpinv_subscription_failing', $this->id, $this);
 
 
 		}
@@ -556,7 +556,7 @@ 
      * @return void
      */
     public function cancel() {
-        if ( 'cancelled' === $this->status ) {
+        if ('cancelled' === $this->status) {
             return; // Already cancelled
         }
 
@@ -564,20 +564,20 @@ 
             'status' => 'cancelled'
         );
 
-        if ( $this->subs_db->update( $this->id, $args ) ) {
-            if ( is_user_logged_in() ) {
-                $userdata = get_userdata( get_current_user_id() );
+        if ($this->subs_db->update($this->id, $args)) {
+            if (is_user_logged_in()) {
+                $userdata = get_userdata(get_current_user_id());
                 $user     = $userdata->display_name;
             } else {
-                $user = __( 'gateway', 'invoicing' );
+                $user = __('gateway', 'invoicing');
             }
 
-            $note = sprintf( __( 'Subscription has been cancelled by %s', 'invoicing' ), $user );
-            wpinv_insert_payment_note( $this->parent_payment_id, $note, '', '', true );
+            $note = sprintf(__('Subscription has been cancelled by %s', 'invoicing'), $user);
+            wpinv_insert_payment_note($this->parent_payment_id, $note, '', '', true);
 
             $this->status = 'cancelled';
 
-            do_action( 'wpinv_subscription_cancelled', $this->id, $this );
+            do_action('wpinv_subscription_cancelled', $this->id, $this);
         }
     }
 
@@ -592,10 +592,10 @@ 
 	 */
 	public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+	    if ($this->gateway === 'manual' || in_array($this->status, $this->get_cancellable_statuses())) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+		return apply_filters('wpinv_subscription_can_cancel', $ret, $this);
 	}
 
     /**
@@ -606,7 +606,7 @@ 
      * @return      array
      */
     public function get_cancellable_statuses() {
-        return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
+        return apply_filters('wpinv_recurring_cancellable_statuses', array('active', 'trialling', 'failing'));
     }
 
 	/**
@@ -617,9 +617,9 @@ 
 	 */
 	public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_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);
 	}
 
 	/**
@@ -633,7 +633,7 @@ 
 	 */
 	public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+		return apply_filters('wpinv_subscription_can_renew', true, $this);
 	}
 
 	/**
@@ -644,9 +644,9 @@ 
 	 */
 	public function get_renew_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'renew_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-renew');
 
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+		return apply_filters('wpinv_subscription_renew_url', $url, $this);
 	}
 
 	/**
@@ -656,7 +656,7 @@ 
 	 * @return bool
 	 */
 	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
+		return apply_filters('wpinv_subscription_can_update', false, $this);
 	}
 
 	/**
@@ -667,9 +667,9 @@ 
 	 */
 	public function get_update_url() {
 
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+		$url = add_query_arg(array('action' => 'update', 'subscription_id' => $this->id));
 
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+		return apply_filters('wpinv_subscription_update_url', $url, $this);
 	}
 
 	/**
@@ -682,11 +682,11 @@ 
 
 		$ret = false;
 
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+		if (!$this->is_expired() && ($this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling')) {
 			$ret = true;
 		}
 
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_active', $ret, $this->id, $this);
 
 	}
 
@@ -700,26 +700,26 @@ 
 
 		$ret = false;
 
-		if ( $this->status == 'expired' ) {
+		if ($this->status == 'expired') {
 
 			$ret = true;
 
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+		} elseif ('active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling') {
 
 			$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' === $this->status || $this->status == 'trialling'  ) {
+				if ('active' === $this->status || $this->status == 'trialling') {
 					$this->expire();
 				}
 			}
 
 		}
 
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_expired', $ret, $this->id, $this);
 
 	}
 
@@ -740,7 +740,7 @@ 
 	 * @return int
 	 */
 	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
+		return strtotime($this->expiration, current_time('timestamp'));
 	}
 
 	/**
@@ -764,37 +764,37 @@ 
 	 */
 	public function get_status_label() {
 
-		switch( $this->get_status() ) {
+		switch ($this->get_status()) {
 			case 'active' :
-				$status = __( 'Active', 'invoicing' );
+				$status = __('Active', 'invoicing');
 				break;
 
 			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
+				$status = __('Cancelled', 'invoicing');
 				break;
 
 			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
+				$status = __('Expired', 'invoicing');
 				break;
 
 			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
+				$status = __('Pending', 'invoicing');
 				break;
 
 			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
+				$status = __('Failing', 'invoicing');
 				break;
 
 			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
+				$status = __('Trialling', 'invoicing');
 				break;
 
 			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
+				$status = __('Completed', 'invoicing');
 				break;
 
 			default:
-				$status = ucfirst( $this->get_status() );
+				$status = ucfirst($this->get_status());
 				break;
 		}
 
@@ -809,51 +809,51 @@ 
      */
     public function get_status_label_html() {
 
-        switch( $get_status = $this->get_status() ) {
+        switch ($get_status = $this->get_status()) {
             case 'active' :
-                $status = __( 'Active', 'invoicing' );
+                $status = __('Active', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'cancelled' :
-                $status = __( 'Cancelled', 'invoicing' );
+                $status = __('Cancelled', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'expired' :
-                $status = __( 'Expired', 'invoicing' );
+                $status = __('Expired', 'invoicing');
                 $class = 'label-default';
                 break;
 
             case 'pending' :
-                $status = __( 'Pending', 'invoicing' );
+                $status = __('Pending', 'invoicing');
                 $class = 'label-primary';
                 break;
 
             case 'failing' :
-                $status = __( 'Failing', 'invoicing' );
+                $status = __('Failing', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'trialling' :
-                $status = __( 'Trialling', 'invoicing' );
+                $status = __('Trialling', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'completed' :
-                $status = __( 'Completed', 'invoicing' );
+                $status = __('Completed', 'invoicing');
                 $class = 'label-success';
                 break;
 
             default:
-                $status = ucfirst( $this->get_status() );
+                $status = ucfirst($this->get_status());
                 $class = 'label-default';
                 break;
         }
 
         $label = '<span class="sub-status label label-sub-' . $get_status . ' ' . $class . '">' . $status . '</span>';
 
-        return apply_filters( 'wpinv_subscription_status_label_html', $label, $get_status, $status );
+        return apply_filters('wpinv_subscription_status_label_html', $label, $get_status, $status);
     }
 
     /**
@@ -863,18 +863,18 @@ 
      * @param  string $txn_id The transaction ID from the merchant processor
      * @return bool
      */
-    public function payment_exists( $txn_id = '' ) {
+    public function payment_exists($txn_id = '') {
         global $wpdb;
 
-        if ( empty( $txn_id ) ) {
+        if (empty($txn_id)) {
             return false;
         }
 
-        $txn_id = esc_sql( $txn_id );
+        $txn_id = esc_sql($txn_id);
 
-        $purchase = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1" );
+        $purchase = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1");
 
-        if ( $purchase != null ) {
+        if ($purchase != null) {
             return true;
         }
 

includes/wpinv-discount-functions.php

Spacing +396 added lines, -396 removed lines

@@ -7,110 +7,110 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_get_discount_types() {
     $discount_types = array(
-                        'percent'   => __( 'Percentage', 'invoicing' ),
-                        'flat'     => __( 'Flat Amount', 'invoicing' ),
+                        'percent'   => __('Percentage', 'invoicing'),
+                        'flat'     => __('Flat Amount', 'invoicing'),
                     );
-    return (array)apply_filters( 'wpinv_discount_types', $discount_types );
+    return (array) apply_filters('wpinv_discount_types', $discount_types);
 }
 
-function wpinv_get_discount_type_name( $type = '' ) {
+function wpinv_get_discount_type_name($type = '') {
     $types = wpinv_get_discount_types();
-    return isset( $types[ $type ] ) ? $types[ $type ] : '';
+    return isset($types[$type]) ? $types[$type] : '';
 }
 
-function wpinv_delete_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_delete_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
-        wp_die( __( 'You do not have permission to delete discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!wpinv_current_user_can_manage_invoicing()) {
+        wp_die(__('You do not have permission to delete discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     $discount_id = $data['discount'];
-    wpinv_remove_discount( $discount_id );
+    wpinv_remove_discount($discount_id);
 }
-add_action( 'wpinv_delete_discount', 'wpinv_delete_discount' );
+add_action('wpinv_delete_discount', 'wpinv_delete_discount');
 
-function wpinv_activate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_activate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
-        wp_die( __( 'You do not have permission to edit discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!wpinv_current_user_can_manage_invoicing()) {
+        wp_die(__('You do not have permission to edit discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'publish' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'publish');
 }
-add_action( 'wpinv_activate_discount', 'wpinv_activate_discount' );
+add_action('wpinv_activate_discount', 'wpinv_activate_discount');
 
-function wpinv_deactivate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_deactivate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
-        wp_die( __( 'You do not have permission to create discount codes', 'invoicing' ), array( 'response' => 403 ) );
+    if (!wpinv_current_user_can_manage_invoicing()) {
+        wp_die(__('You do not have permission to create discount codes', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'pending' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'pending');
 }
-add_action( 'wpinv_deactivate_discount', 'wpinv_deactivate_discount' );
+add_action('wpinv_deactivate_discount', 'wpinv_deactivate_discount');
 
-function wpinv_get_discounts( $args = array() ) {
+function wpinv_get_discounts($args = array()) {
     $defaults = array(
         'post_type'      => 'wpi_discount',
         'posts_per_page' => 20,
         'paged'          => null,
-        'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+        'post_status'    => array('publish', 'pending', 'draft', 'expired')
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $discounts = get_posts( $args );
+    $discounts = get_posts($args);
 
-    if ( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
-    if( ! $discounts && ! empty( $args['s'] ) ) {
+    if (!$discounts && !empty($args['s'])) {
         $args['meta_key']     = '_wpi_discount_code';
         $args['meta_value']   = $args['s'];
         $args['meta_compare'] = 'LIKE';
-        unset( $args['s'] );
-        $discounts = get_posts( $args );
+        unset($args['s']);
+        $discounts = get_posts($args);
     }
 
-    if( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
     return false;
 }
 
-function wpinv_get_all_discounts( $args = array() ) {
+function wpinv_get_all_discounts($args = array()) {
 
-    $args = wp_parse_args( $args, array(
-        'status'         => array( 'publish' ),
-        'limit'          => get_option( 'posts_per_page' ),
+    $args = wp_parse_args($args, array(
+        'status'         => array('publish'),
+        'limit'          => get_option('posts_per_page'),
         'page'           => 1,
         'exclude'        => array(),
         'orderby'        => 'date',
         'order'          => 'DESC',
-        'type'           => array_keys( wpinv_get_discount_types() ),
+        'type'           => array_keys(wpinv_get_discount_types()),
         'meta_query'     => array(),
         'return'         => 'objects',
         'paginate'       => false,
-    ) );
+    ));
 
     $wp_query_args = array(
         'post_type'      => 'wpi_discount',
@@ -120,18 +120,18 @@ 
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
-        'paged'          => absint( $args['page'] ),
+        'paged'          => absint($args['page']),
     );
 
-    if ( ! empty( $args['exclude'] ) ) {
-        $wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+    if (!empty($args['exclude'])) {
+        $wp_query_args['post__not_in'] = array_map('absint', $args['exclude']);
     }
 
-    if ( ! $args['paginate' ] ) {
+    if (!$args['paginate']) {
         $wp_query_args['no_found_rows'] = true;
     }
 
-    if ( ! empty( $args['search'] ) ) {
+    if (!empty($args['search'])) {
 
         $wp_query_args['meta_query'][] = array(
             'key'     => '_wpi_discount_code',
@@ -141,11 +141,11 @@ 
 
     }
     
-    if ( ! empty( $args['type'] ) ) {
-        $types = wpinv_parse_list( $args['type'] );
+    if (!empty($args['type'])) {
+        $types = wpinv_parse_list($args['type']);
         $wp_query_args['meta_query'][] = array(
             'key'     => '_wpi_discount_type',
-            'value'   => implode( ',', $types ),
+            'value'   => implode(',', $types),
             'compare' => 'IN',
         );
     }
@@ -153,17 +153,17 @@ 
     $wp_query_args = apply_filters('wpinv_get_discount_args', $wp_query_args, $args);
 
     // Get results.
-    $discounts = new WP_Query( $wp_query_args );
+    $discounts = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'get_post', $discounts->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('get_post', $discounts->posts);
+    } elseif ('self' === $args['return']) {
         return $discounts;
     } else {
         $return = $discounts->posts;
     }
 
-    if ( $args['paginate' ] ) {
+    if ($args['paginate']) {
         return (object) array(
             'discounts'      => $return,
             'total'         => $discounts->found_posts,
@@ -180,9 +180,9 @@ 
 
     $discounts  = wpinv_get_discounts();
 
-    if ( $discounts) {
-        foreach ( $discounts as $discount ) {
-            if ( wpinv_is_discount_active( $discount->ID ) ) {
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            if (wpinv_is_discount_active($discount->ID)) {
                 $has_active = true;
                 break;
             }
@@ -191,16 +191,16 @@ 
     return $has_active;
 }
 
-function wpinv_get_discount( $discount_id = 0 ) {
-    if( empty( $discount_id ) ) {
+function wpinv_get_discount($discount_id = 0) {
+    if (empty($discount_id)) {
         return false;
     }
     
-    if ( get_post_type( $discount_id ) != 'wpi_discount' ) {
+    if (get_post_type($discount_id) != 'wpi_discount') {
         return false;
     }
 
-    $discount = get_post( $discount_id );
+    $discount = get_post($discount_id);
 
     return $discount;
 }
@@ -212,8 +212,8 @@ 
  * @since 1.0.15
  * @return WPInv_Discount
  */
-function wpinv_get_discount_obj( $discount = 0 ) {
-    return new WPInv_Discount( $discount );
+function wpinv_get_discount_obj($discount = 0) {
+    return new WPInv_Discount($discount);
 }
 
 /**
@@ -222,8 +222,8 @@ 
  * @param string $code The discount code.
  * @return bool|WP_Post
  */
-function wpinv_get_discount_by_code( $code = '' ) {
-    return wpinv_get_discount_by( 'code', $code );
+function wpinv_get_discount_by_code($code = '') {
+    return wpinv_get_discount_by('code', $code);
 }
 
 /**
@@ -233,13 +233,13 @@ 
  * @param string|int $value The field value
  * @return bool|WP_Post
  */
-function wpinv_get_discount_by( $field = '', $value = '' ) {
-    $data = WPInv_Discount::get_data_by( $field, $value );
-    if( empty( $data ) ) {
+function wpinv_get_discount_by($field = '', $value = '') {
+    $data = WPInv_Discount::get_data_by($field, $value);
+    if (empty($data)) {
         return false;
     }
 
-    return get_post( $data['ID'] );
+    return get_post($data['ID']);
 }
 
 /**
@@ -249,68 +249,68 @@ 
  * @param array $data The discount's properties.
  * @return bool
  */
-function wpinv_store_discount( $post_id, $data, $post, $update = false ) {
+function wpinv_store_discount($post_id, $data, $post, $update = false) {
     $meta = array(
-        'code'              => isset( $data['code'] )             ? sanitize_text_field( $data['code'] )              : '',
-        'type'              => isset( $data['type'] )             ? sanitize_text_field( $data['type'] )              : 'percent',
-        'amount'            => isset( $data['amount'] )           ? wpinv_sanitize_amount( $data['amount'] )          : '',
-        'start'             => isset( $data['start'] )            ? sanitize_text_field( $data['start'] )             : '',
-        'expiration'        => isset( $data['expiration'] )       ? sanitize_text_field( $data['expiration'] )        : '',
-        'min_total'         => isset( $data['min_total'] )        ? wpinv_sanitize_amount( $data['min_total'] )       : '',
-        'max_total'         => isset( $data['max_total'] )        ? wpinv_sanitize_amount( $data['max_total'] )       : '',
-        'max_uses'          => isset( $data['max_uses'] )         ? absint( $data['max_uses'] )                       : '',
-        'items'             => isset( $data['items'] )            ? $data['items']                                    : array(),
-        'excluded_items'    => isset( $data['excluded_items'] )   ? $data['excluded_items']                           : array(),
-        'is_recurring'      => isset( $data['recurring'] )        ? (bool)$data['recurring']                          : false,
-        'is_single_use'     => isset( $data['single_use'] )       ? (bool)$data['single_use']                         : false,
-        'uses'              => isset( $data['uses'] )             ? (int)$data['uses']                                : false,
+        'code'              => isset($data['code']) ? sanitize_text_field($data['code']) : '',
+        'type'              => isset($data['type']) ? sanitize_text_field($data['type']) : 'percent',
+        'amount'            => isset($data['amount']) ? wpinv_sanitize_amount($data['amount']) : '',
+        'start'             => isset($data['start']) ? sanitize_text_field($data['start']) : '',
+        'expiration'        => isset($data['expiration']) ? sanitize_text_field($data['expiration']) : '',
+        'min_total'         => isset($data['min_total']) ? wpinv_sanitize_amount($data['min_total']) : '',
+        'max_total'         => isset($data['max_total']) ? wpinv_sanitize_amount($data['max_total']) : '',
+        'max_uses'          => isset($data['max_uses']) ? absint($data['max_uses']) : '',
+        'items'             => isset($data['items']) ? $data['items'] : array(),
+        'excluded_items'    => isset($data['excluded_items']) ? $data['excluded_items'] : array(),
+        'is_recurring'      => isset($data['recurring']) ? (bool) $data['recurring'] : false,
+        'is_single_use'     => isset($data['single_use']) ? (bool) $data['single_use'] : false,
+        'uses'              => isset($data['uses']) ? (int) $data['uses'] : false,
     );
 
-    if ( $meta['type'] == 'percent' && (float)$meta['amount'] > 100 ) {
+    if ($meta['type'] == 'percent' && (float) $meta['amount'] > 100) {
         $meta['amount'] = 100;
     }
 
-    if ( !empty( $meta['start'] ) ) {
-        $meta['start']      = date_i18n( 'Y-m-d H:i:s', strtotime( $meta['start'] ) );
+    if (!empty($meta['start'])) {
+        $meta['start'] = date_i18n('Y-m-d H:i:s', strtotime($meta['start']));
     }
 
-    if ( !empty( $meta['expiration'] ) ) {
-        $meta['expiration'] = date_i18n( 'Y-m-d H:i:s', strtotime( $meta['expiration'] ) );
+    if (!empty($meta['expiration'])) {
+        $meta['expiration'] = date_i18n('Y-m-d H:i:s', strtotime($meta['expiration']));
 
-        if ( !empty( $meta['start'] ) && strtotime( $meta['start'] ) > strtotime( $meta['expiration'] ) ) {
+        if (!empty($meta['start']) && strtotime($meta['start']) > strtotime($meta['expiration'])) {
             $meta['expiration'] = $meta['start'];
         }
     }
     
-    if ( $meta['uses'] === false ) {
-        unset( $meta['uses'] );
+    if ($meta['uses'] === false) {
+        unset($meta['uses']);
     }
     
-    if ( ! empty( $meta['items'] ) ) {
-        foreach ( $meta['items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['items'][ $key ] );
+    if (!empty($meta['items'])) {
+        foreach ($meta['items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['items'][$key]);
             }
         }
     }
     
-    if ( ! empty( $meta['excluded_items'] ) ) {
-        foreach ( $meta['excluded_items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['excluded_items'][ $key ] );
+    if (!empty($meta['excluded_items'])) {
+        foreach ($meta['excluded_items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['excluded_items'][$key]);
             }
         }
     }
     
-    $meta = apply_filters( 'wpinv_update_discount', $meta, $post_id, $post );
+    $meta = apply_filters('wpinv_update_discount', $meta, $post_id, $post);
     
-    do_action( 'wpinv_pre_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_pre_update_discount', $meta, $post_id, $post);
     
-    foreach( $meta as $key => $value ) {
-        update_post_meta( $post_id, '_wpi_discount_' . $key, $value );
+    foreach ($meta as $key => $value) {
+        update_post_meta($post_id, '_wpi_discount_' . $key, $value);
     }
     
-    do_action( 'wpinv_post_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_post_update_discount', $meta, $post_id, $post);
     
     return $post_id;
 }
@@ -321,10 +321,10 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_remove_discount( $discount = 0 ) {
+function wpinv_remove_discount($discount = 0) {
 
-    $discount = wpinv_get_discount_obj( $discount );
-    if( ! $discount->exists() ) {
+    $discount = wpinv_get_discount_obj($discount);
+    if (!$discount->exists()) {
         return false;
     }
 
@@ -339,9 +339,9 @@ 
  * @param string $new_status
  * @return bool
  */
-function wpinv_update_discount_status( $discount = 0, $new_status = 'publish' ) {
-    $discount = wpinv_get_discount_obj( $discount );
-    return $discount->update_status( $new_status );
+function wpinv_update_discount_status($discount = 0, $new_status = 'publish') {
+    $discount = wpinv_get_discount_obj($discount);
+    return $discount->update_status($new_status);
 }
 
 /**
@@ -350,48 +350,48 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_exists( $discount ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_discount_exists($discount) {
+    $discount = wpinv_get_discount_obj($discount);
     return $discount->exists();
 }
 
-function wpinv_is_discount_active( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_active($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        if ( wpinv_is_discount_expired( $code_id ) ) {
-            if( defined( 'DOING_AJAX' ) ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is expired.', 'invoicing' ) );
+    if ($discount) {
+        if (wpinv_is_discount_expired($code_id)) {
+            if (defined('DOING_AJAX')) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is expired.', 'invoicing'));
             }
-        } elseif ( $discount->post_status == 'publish' ) {
+        } elseif ($discount->post_status == 'publish') {
             $return = true;
         } else {
-            if( defined( 'DOING_AJAX' ) ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active.', 'invoicing' ) );
+            if (defined('DOING_AJAX')) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active.', 'invoicing'));
             }
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_active', $return, $code_id );
+    return apply_filters('wpinv_is_discount_active', $return, $code_id);
 }
 
-function wpinv_get_discount_code( $code_id = null ) {
-    $code = get_post_meta( $code_id, '_wpi_discount_code', true );
+function wpinv_get_discount_code($code_id = null) {
+    $code = get_post_meta($code_id, '_wpi_discount_code', true);
 
-    return apply_filters( 'wpinv_get_discount_code', $code, $code_id );
+    return apply_filters('wpinv_get_discount_code', $code, $code_id);
 }
 
-function wpinv_get_discount_start_date( $code_id = null ) {
-    $start_date = get_post_meta( $code_id, '_wpi_discount_start', true );
+function wpinv_get_discount_start_date($code_id = null) {
+    $start_date = get_post_meta($code_id, '_wpi_discount_start', true);
 
-    return apply_filters( 'wpinv_get_discount_start_date', $start_date, $code_id );
+    return apply_filters('wpinv_get_discount_start_date', $start_date, $code_id);
 }
 
-function wpinv_get_discount_expiration( $code_id = null ) {
-    $expiration = get_post_meta( $code_id, '_wpi_discount_expiration', true );
+function wpinv_get_discount_expiration($code_id = null) {
+    $expiration = get_post_meta($code_id, '_wpi_discount_expiration', true);
 
-    return apply_filters( 'wpinv_get_discount_expiration', $expiration, $code_id );
+    return apply_filters('wpinv_get_discount_expiration', $expiration, $code_id);
 }
 
 /**
@@ -400,8 +400,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return int
  */
-function wpinv_get_discount_max_uses( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_max_uses($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (int) $discount->max_uses;
 }
 
@@ -411,8 +411,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return int
  */
-function wpinv_get_discount_uses( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_uses($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (int) $discount->uses;
 }
 
@@ -422,8 +422,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return float
  */
-function wpinv_get_discount_min_total( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_min_total($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (float) $discount->min_total;
 }
 
@@ -433,8 +433,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return float
  */
-function wpinv_get_discount_max_total( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_max_total($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (float) $discount->max_total;
 }
 
@@ -444,8 +444,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return float
  */
-function wpinv_get_discount_amount( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_amount($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (float) $discount->amount;
 }
 
@@ -456,28 +456,28 @@ 
  * @param bool $name 
  * @return string
  */
-function wpinv_get_discount_type( $discount = array(), $name = false ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_type($discount = array(), $name = false) {
+    $discount = wpinv_get_discount_obj($discount);
 
     // Are we returning the name or just the type.
-    if( $name ) {
+    if ($name) {
         return $discount->type_name;
     }
 
     return $discount->type;
 }
 
-function wpinv_discount_status( $status ) {
-    switch( $status ){
+function wpinv_discount_status($status) {
+    switch ($status) {
         case 'expired' :
-            $name = __( 'Expired', 'invoicing' );
+            $name = __('Expired', 'invoicing');
             break;
         case 'publish' :
         case 'active' :
-            $name = __( 'Active', 'invoicing' );
+            $name = __('Active', 'invoicing');
             break;
         default :
-            $name = __( 'Inactive', 'invoicing' );
+            $name = __('Inactive', 'invoicing');
             break;
     }
     return $name;
@@ -489,8 +489,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return array
  */
-function wpinv_get_discount_excluded_items( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_excluded_items($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return $discount->excluded_items;
 }
 
@@ -500,17 +500,17 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return array
  */
-function wpinv_get_discount_item_reqs( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_item_reqs($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return $discount->items;
 }
 
-function wpinv_get_discount_item_condition( $code_id = 0 ) {
-    return get_post_meta( $code_id, '_wpi_discount_item_condition', true );
+function wpinv_get_discount_item_condition($code_id = 0) {
+    return get_post_meta($code_id, '_wpi_discount_item_condition', true);
 }
 
-function wpinv_is_discount_not_global( $code_id = 0 ) {
-    return (bool) get_post_meta( $code_id, '_wpi_discount_is_not_global', true );
+function wpinv_is_discount_not_global($code_id = 0) {
+    return (bool) get_post_meta($code_id, '_wpi_discount_is_not_global', true);
 }
 
 /**
@@ -519,14 +519,14 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_is_discount_expired( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_is_discount_expired($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
 
-    if ( $discount->is_expired() ) {
-        $discount->update_status( 'pending' );
+    if ($discount->is_expired()) {
+        $discount->update_status('pending');
 
-        if( empty( $started ) ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount has expired.', 'invoicing' ) );
+        if (empty($started)) {
+            wpinv_set_error('wpinv-discount-error', __('This discount has expired.', 'invoicing'));
         }
         return true;
     }
@@ -540,12 +540,12 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_is_discount_started( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_is_discount_started($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     $started  = $discount->has_started();
 
-    if( empty( $started ) ) {
-        wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active yet.', 'invoicing' ) );
+    if (empty($started)) {
+        wpinv_set_error('wpinv-discount-error', __('This discount is not active yet.', 'invoicing'));
     }
 
     return $started;
@@ -557,10 +557,10 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_check_discount_dates( $discount ) {
-    $discount = wpinv_get_discount_obj( $discount );
-    $return   = wpinv_is_discount_started( $discount ) && ! wpinv_is_discount_expired( $discount );
-    return apply_filters( 'wpinv_check_discount_dates', $return, $discount->ID, $discount, $discount->code );
+function wpinv_check_discount_dates($discount) {
+    $discount = wpinv_get_discount_obj($discount);
+    $return   = wpinv_is_discount_started($discount) && !wpinv_is_discount_expired($discount);
+    return apply_filters('wpinv_check_discount_dates', $return, $discount->ID, $discount, $discount->code);
 }
 
 /**
@@ -569,12 +569,12 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_is_discount_maxed_out( $discount ) {
-    $discount    = wpinv_get_discount_obj( $discount );
+function wpinv_is_discount_maxed_out($discount) {
+    $discount    = wpinv_get_discount_obj($discount);
     $maxed_out   = $discount->has_exceeded_limit();
 
-    if ( $maxed_out ) {
-        wpinv_set_error( 'wpinv-discount-error', __( 'This discount has reached its maximum usage.', 'invoicing' ) );
+    if ($maxed_out) {
+        wpinv_set_error('wpinv-discount-error', __('This discount has reached its maximum usage.', 'invoicing'));
     }
 
     return $maxed_out;
@@ -586,13 +586,13 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_min_met( $discount ) {
-    $discount    = wpinv_get_discount_obj( $discount );
-    $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $discount->ID );
-    $min_met     = $discount->is_minimum_amount_met( $cart_amount );
+function wpinv_discount_is_min_met($discount) {
+    $discount    = wpinv_get_discount_obj($discount);
+    $cart_amount = (float) wpinv_get_cart_discountable_subtotal($discount->ID);
+    $min_met     = $discount->is_minimum_amount_met($cart_amount);
 
-    if ( ! $min_met ) {
-        wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Minimum invoice amount should be %s', 'invoicing' ), wpinv_price( wpinv_format_amount( $discount->min_total ) ) ) );
+    if (!$min_met) {
+        wpinv_set_error('wpinv-discount-error', sprintf(__('Minimum invoice amount should be %s', 'invoicing'), wpinv_price(wpinv_format_amount($discount->min_total))));
     }
 
     return $min_met;
@@ -604,13 +604,13 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_max_met( $discount ) {
-    $discount    = wpinv_get_discount_obj( $discount );
-    $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $discount->ID );
-    $max_met     = $discount->is_maximum_amount_met( $cart_amount );
+function wpinv_discount_is_max_met($discount) {
+    $discount    = wpinv_get_discount_obj($discount);
+    $cart_amount = (float) wpinv_get_cart_discountable_subtotal($discount->ID);
+    $max_met     = $discount->is_maximum_amount_met($cart_amount);
 
-    if ( ! $max_met ) {
-        wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Maximum invoice amount should be %s', 'invoicing' ), wpinv_price( wpinv_format_amount( $discount->max_total ) ) ) );
+    if (!$max_met) {
+        wpinv_set_error('wpinv-discount-error', sprintf(__('Maximum invoice amount should be %s', 'invoicing'), wpinv_price(wpinv_format_amount($discount->max_total))));
     }
 
     return $max_met;
@@ -622,8 +622,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_single_use( $discount ) {
-    $discount    = wpinv_get_discount_obj( $discount );
+function wpinv_discount_is_single_use($discount) {
+    $discount = wpinv_get_discount_obj($discount);
     return $discount->is_single_use;
 }
 
@@ -634,53 +634,53 @@ 
  * @param int|array|string|WPInv_Discount $code discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_recurring( $discount = 0, $code = 0 ) {
+function wpinv_discount_is_recurring($discount = 0, $code = 0) {
 
-    if( ! empty( $discount ) ) {
-        $discount    = wpinv_get_discount_obj( $discount );
+    if (!empty($discount)) {
+        $discount    = wpinv_get_discount_obj($discount);
     } else {
-        $discount    = wpinv_get_discount_obj( $code );
+        $discount    = wpinv_get_discount_obj($code);
     }
     
     return $discount->is_recurring;
 }
 
-function wpinv_discount_item_reqs_met( $code_id = null ) {
-    $item_reqs    = wpinv_get_discount_item_reqs( $code_id );
-    $condition    = wpinv_get_discount_item_condition( $code_id );
-    $excluded_ps  = wpinv_get_discount_excluded_items( $code_id );
+function wpinv_discount_item_reqs_met($code_id = null) {
+    $item_reqs    = wpinv_get_discount_item_reqs($code_id);
+    $condition    = wpinv_get_discount_item_condition($code_id);
+    $excluded_ps  = wpinv_get_discount_excluded_items($code_id);
     $cart_items   = wpinv_get_cart_contents();
-    $cart_ids     = $cart_items ? wp_list_pluck( $cart_items, 'id' ) : null;
+    $cart_ids     = $cart_items ? wp_list_pluck($cart_items, 'id') : null;
     $ret          = false;
 
-    if ( empty( $item_reqs ) && empty( $excluded_ps ) ) {
+    if (empty($item_reqs) && empty($excluded_ps)) {
         $ret = true;
     }
 
     // Normalize our data for item requirements, exclusions and cart data
     // First absint the items, then sort, and reset the array keys
-    $item_reqs = array_map( 'absint', $item_reqs );
-    asort( $item_reqs );
-    $item_reqs = array_values( $item_reqs );
+    $item_reqs = array_map('absint', $item_reqs);
+    asort($item_reqs);
+    $item_reqs = array_values($item_reqs);
 
-    $excluded_ps  = array_map( 'absint', $excluded_ps );
-    asort( $excluded_ps );
-    $excluded_ps  = array_values( $excluded_ps );
+    $excluded_ps  = array_map('absint', $excluded_ps);
+    asort($excluded_ps);
+    $excluded_ps  = array_values($excluded_ps);
 
-    $cart_ids     = array_map( 'absint', $cart_ids );
-    asort( $cart_ids );
-    $cart_ids     = array_values( $cart_ids );
+    $cart_ids     = array_map('absint', $cart_ids);
+    asort($cart_ids);
+    $cart_ids     = array_values($cart_ids);
 
     // Ensure we have requirements before proceeding
-    if ( !$ret && ! empty( $item_reqs ) ) {
-        switch( $condition ) {
+    if (!$ret && !empty($item_reqs)) {
+        switch ($condition) {
             case 'all' :
                 // Default back to true
                 $ret = true;
 
-                foreach ( $item_reqs as $item_id ) {
-                    if ( !wpinv_item_in_cart( $item_id ) ) {
-                        wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                foreach ($item_reqs as $item_id) {
+                    if (!wpinv_item_in_cart($item_id)) {
+                        wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                         $ret = false;
                         break;
                     }
@@ -689,15 +689,15 @@ 
                 break;
 
             default : // Any
-                foreach ( $item_reqs as $item_id ) {
-                    if ( wpinv_item_in_cart( $item_id ) ) {
+                foreach ($item_reqs as $item_id) {
+                    if (wpinv_item_in_cart($item_id)) {
                         $ret = true;
                         break;
                     }
                 }
 
-                if( ! $ret ) {
-                    wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                if (!$ret) {
+                    wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                 }
 
                 break;
@@ -706,15 +706,15 @@ 
         $ret = true;
     }
 
-    if( ! empty( $excluded_ps ) ) {
+    if (!empty($excluded_ps)) {
         // Check that there are items other than excluded ones in the cart
-        if( $cart_ids == $excluded_ps ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not valid for the cart contents.', 'invoicing' ) );
+        if ($cart_ids == $excluded_ps) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is not valid for the cart contents.', 'invoicing'));
             $ret = false;
         }
     }
 
-    return (bool) apply_filters( 'wpinv_is_discount_item_req_met', $ret, $code_id, $condition );
+    return (bool) apply_filters('wpinv_is_discount_item_req_met', $ret, $code_id, $condition);
 }
 
 /**
@@ -725,53 +725,53 @@ 
  * @param int|array|string|WPInv_Discount $code_id discount data, object, ID or code.
  * @return bool
  */
-function wpinv_is_discount_used( $discount = array(), $user = '', $code_id = array() ) {
+function wpinv_is_discount_used($discount = array(), $user = '', $code_id = array()) {
     
-    if( ! empty( $discount ) ) {
-        $discount = wpinv_get_discount_obj( $discount );
+    if (!empty($discount)) {
+        $discount = wpinv_get_discount_obj($discount);
     } else {
-        $discount = wpinv_get_discount_obj( $code_id );
+        $discount = wpinv_get_discount_obj($code_id);
     }
 
-    $is_used = ! $discount->is_valid_for_user( $user );
-    $is_used = apply_filters( 'wpinv_is_discount_used', $is_used, $discount->code, $user, $discount->ID, $discount );
+    $is_used = !$discount->is_valid_for_user($user);
+    $is_used = apply_filters('wpinv_is_discount_used', $is_used, $discount->code, $user, $discount->ID, $discount);
 
-    if( $is_used ) {
-        wpinv_set_error( 'wpinv-discount-error', __( 'This discount has already been redeemed.', 'invoicing' ) );
+    if ($is_used) {
+        wpinv_set_error('wpinv-discount-error', __('This discount has already been redeemed.', 'invoicing'));
     }
 
     return $is_used;
 }
 
-function wpinv_is_discount_valid( $code = '', $user = '', $set_error = true ) {
+function wpinv_is_discount_valid($code = '', $user = '', $set_error = true) {
     $return      = false;
-    $discount_id = wpinv_get_discount_id_by_code( $code );
-    $user        = trim( $user );
+    $discount_id = wpinv_get_discount_id_by_code($code);
+    $user        = trim($user);
 
-    if ( wpinv_get_cart_contents() ) {
-        if ( $discount_id !== false ) {
+    if (wpinv_get_cart_contents()) {
+        if ($discount_id !== false) {
             if (
-                wpinv_is_discount_active( $discount_id ) &&
-                wpinv_check_discount_dates( $discount_id ) &&
-                !wpinv_is_discount_maxed_out( $discount_id ) &&
-                !wpinv_is_discount_used( $code, $user, $discount_id ) &&
-                wpinv_discount_is_min_met( $discount_id ) &&
-                wpinv_discount_is_max_met( $discount_id ) &&
-                wpinv_discount_item_reqs_met( $discount_id )
+                wpinv_is_discount_active($discount_id) &&
+                wpinv_check_discount_dates($discount_id) &&
+                !wpinv_is_discount_maxed_out($discount_id) &&
+                !wpinv_is_discount_used($code, $user, $discount_id) &&
+                wpinv_discount_is_min_met($discount_id) &&
+                wpinv_discount_is_max_met($discount_id) &&
+                wpinv_discount_item_reqs_met($discount_id)
             ) {
                 $return = true;
             }
-        } elseif( $set_error ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is invalid.', 'invoicing' ) );
+        } elseif ($set_error) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is invalid.', 'invoicing'));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_valid', $return, $discount_id, $code, $user );
+    return apply_filters('wpinv_is_discount_valid', $return, $discount_id, $code, $user);
 }
 
-function wpinv_get_discount_id_by_code( $code ) {
-    $discount = wpinv_get_discount_by_code( $code );
-    if( $discount ) {
+function wpinv_get_discount_id_by_code($code) {
+    $discount = wpinv_get_discount_by_code($code);
+    if ($discount) {
         return $discount->ID;
     }
     return false;
@@ -784,9 +784,9 @@ 
  * @param float $base_price The number of usages to increase by
  * @return float
  */
-function wpinv_get_discounted_amount( $discount, $base_price ) {
-    $discount = wpinv_get_discount_obj( $discount );
-    return $discount->get_discounted_amount( $base_price );
+function wpinv_get_discounted_amount($discount, $base_price) {
+    $discount = wpinv_get_discount_obj($discount);
+    return $discount->get_discounted_amount($base_price);
 }
 
 /**
@@ -796,9 +796,9 @@ 
  * @param int $by The number of usages to increase by.
  * @return int the new number of uses.
  */
-function wpinv_increase_discount_usage( $discount, $by = 1 ) {
-    $discount   = wpinv_get_discount_obj( $discount );
-    return $discount->increase_usage( $by );
+function wpinv_increase_discount_usage($discount, $by = 1) {
+    $discount = wpinv_get_discount_obj($discount);
+    return $discount->increase_usage($by);
 }
 
 /**
@@ -808,72 +808,72 @@ 
  * @param int $by The number of usages to decrease by.
  * @return int the new number of uses.
  */
-function wpinv_decrease_discount_usage( $discount, $by = 1 ) {
-    $discount   = wpinv_get_discount_obj( $discount );
-    return $discount->increase_usage( 0 - $by );
+function wpinv_decrease_discount_usage($discount, $by = 1) {
+    $discount = wpinv_get_discount_obj($discount);
+    return $discount->increase_usage(0 - $by);
 }
 
-function wpinv_format_discount_rate( $type, $amount ) {
-    if ( $type == 'flat' ) {
-        $rate = wpinv_price( wpinv_format_amount( $amount ) );
+function wpinv_format_discount_rate($type, $amount) {
+    if ($type == 'flat') {
+        $rate = wpinv_price(wpinv_format_amount($amount));
     } else {
         $rate = $amount . '%';
     }
 
-    return apply_filters( 'wpinv_format_discount_rate', $rate, $type, $amount );
+    return apply_filters('wpinv_format_discount_rate', $rate, $type, $amount);
 }
 
-function wpinv_set_cart_discount( $code = '' ) {    
-    if ( wpinv_multiple_discounts_allowed() ) {
+function wpinv_set_cart_discount($code = '') {    
+    if (wpinv_multiple_discounts_allowed()) {
         // Get all active cart discounts
         $discounts = wpinv_get_cart_discounts();
     } else {
         $discounts = false; // Only one discount allowed per purchase, so override any existing
     }
 
-    if ( $discounts ) {
-        $key = array_search( strtolower( $code ), array_map( 'strtolower', $discounts ) );
-        if( false !== $key ) {
-            unset( $discounts[ $key ] ); // Can't set the same discount more than once
+    if ($discounts) {
+        $key = array_search(strtolower($code), array_map('strtolower', $discounts));
+        if (false !== $key) {
+            unset($discounts[$key]); // Can't set the same discount more than once
         }
         $discounts[] = $code;
     } else {
         $discounts = array();
         $discounts[] = $code;
     }
-    $discounts = array_values( $discounts );
+    $discounts = array_values($discounts);
     
     $data = wpinv_get_checkout_session();
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         $data = array();
     } else {
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'] ) ) {
-            $payment_meta['user_info']['discount']  = implode( ',', $discounts );
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'])) {
+            $payment_meta['user_info']['discount'] = implode(',', $discounts);
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
     }
     $data['cart_discounts'] = $discounts;
     
-    wpinv_set_checkout_session( $data );
+    wpinv_set_checkout_session($data);
     
     return $discounts;
 }
 
-function wpinv_unset_cart_discount( $code = '' ) {    
+function wpinv_unset_cart_discount($code = '') {    
     $discounts = wpinv_get_cart_discounts();
 
-    if ( $code && !empty( $discounts ) && in_array( $code, $discounts ) ) {
-        $key = array_search( $code, $discounts );
-        unset( $discounts[ $key ] );
+    if ($code && !empty($discounts) && in_array($code, $discounts)) {
+        $key = array_search($code, $discounts);
+        unset($discounts[$key]);
             
         $data = wpinv_get_checkout_session();
         $data['cart_discounts'] = $discounts;
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'] ) ) {
-            $payment_meta['user_info']['discount']  = !empty( $discounts ) ? implode( ',', $discounts ) : '';
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'])) {
+            $payment_meta['user_info']['discount'] = !empty($discounts) ? implode(',', $discounts) : '';
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
     }
 
     return $discounts;
@@ -882,10 +882,10 @@ 
 function wpinv_unset_all_cart_discounts() {
     $data = wpinv_get_checkout_session();
     
-    if ( !empty( $data ) && isset( $data['cart_discounts'] ) ) {
-        unset( $data['cart_discounts'] );
+    if (!empty($data) && isset($data['cart_discounts'])) {
+        unset($data['cart_discounts']);
         
-         wpinv_set_checkout_session( $data );
+         wpinv_set_checkout_session($data);
          return true;
     }
     
@@ -894,13 +894,13 @@ 
 
 function wpinv_get_cart_discounts() {
     $session = wpinv_get_checkout_session();
-    return empty( $session['cart_discounts'] ) ? false : $session['cart_discounts'];
+    return empty($session['cart_discounts']) ? false : $session['cart_discounts'];
 }
 
-function wpinv_cart_has_discounts( $items = array() ) {
+function wpinv_cart_has_discounts($items = array()) {
     $ret = false;
 
-    if ( wpinv_get_cart_discounts( $items ) ) {
+    if (wpinv_get_cart_discounts($items)) {
         $ret = true;
     }
     
@@ -911,131 +911,131 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_cart_has_discounts', $ret );
+    return apply_filters('wpinv_cart_has_discounts', $ret);
 }
 
-function wpinv_get_cart_discounted_amount( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounted_amount($items = array(), $discounts = false) {
     $amount = 0.00;
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items  = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( $items ) {
-        $discounts = wp_list_pluck( $items, 'discount' );
+    if ($items) {
+        $discounts = wp_list_pluck($items, 'discount');
 
-        if ( is_array( $discounts ) ) {
-            $discounts = array_map( 'floatval', $discounts );
-            $amount    = array_sum( $discounts );
+        if (is_array($discounts)) {
+            $discounts = array_map('floatval', $discounts);
+            $amount    = array_sum($discounts);
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_discounted_amount', $amount );
+    return apply_filters('wpinv_get_cart_discounted_amount', $amount);
 }
 
-function wpinv_get_cart_items_discount_amount( $items = array(), $discount = false ) {
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+function wpinv_get_cart_items_discount_amount($items = array(), $discount = false) {
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
     
-    if ( empty( $discount ) || empty( $items ) ) {
+    if (empty($discount) || empty($items)) {
         return 0;
     }
 
     $amount = 0;
     
-    foreach ( $items as $item ) {
-        $amount += wpinv_get_cart_item_discount_amount( $item, $discount );
+    foreach ($items as $item) {
+        $amount += wpinv_get_cart_item_discount_amount($item, $discount);
     }
     
-    $amount = wpinv_round_amount( $amount );
+    $amount = wpinv_round_amount($amount);
 
     return $amount;
 }
 
-function wpinv_get_cart_item_discount_amount( $item = array(), $discount = false ) {
+function wpinv_get_cart_item_discount_amount($item = array(), $discount = false) {
     global $wpinv_is_last_cart_item, $wpinv_flat_discount_total;
     
     $amount = 0;
 
-    if ( empty( $item ) || empty( $item['id'] ) ) {
+    if (empty($item) || empty($item['id'])) {
         return $amount;
     }
 
-    if ( empty( $item['quantity'] ) ) {
+    if (empty($item['quantity'])) {
         return $amount;
     }
 
-    if ( empty( $item['options'] ) ) {
+    if (empty($item['options'])) {
         $item['options'] = array();
     }
 
-    $price            = wpinv_get_cart_item_price( $item['id'], $item, $item['options'] );
+    $price            = wpinv_get_cart_item_price($item['id'], $item, $item['options']);
     $discounted_price = $price;
 
     $discounts = false === $discount ? wpinv_get_cart_discounts() : $discount;
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return $amount;
     }
 
-    if ( $discounts ) {
-        if ( is_array( $discounts ) ) {
-            $discounts = array_values( $discounts );
+    if ($discounts) {
+        if (is_array($discounts)) {
+            $discounts = array_values($discounts);
         } else {
-            $discounts = explode( ',', $discounts );
+            $discounts = explode(',', $discounts);
         }
     }
 
-    if( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $code_id = wpinv_get_discount_id_by_code( $discount );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $code_id = wpinv_get_discount_id_by_code($discount);
 
             // Check discount exists
-            if( $code_id === false ) {
+            if ($code_id === false) {
                 continue;
             }
 
-            $reqs           = wpinv_get_discount_item_reqs( $code_id );
-            $excluded_items = wpinv_get_discount_excluded_items( $code_id );
+            $reqs           = wpinv_get_discount_item_reqs($code_id);
+            $excluded_items = wpinv_get_discount_excluded_items($code_id);
 
             // Make sure requirements are set and that this discount shouldn't apply to the whole cart
-            if ( !empty( $reqs ) && wpinv_is_discount_not_global( $code_id ) ) {
-                foreach ( $reqs as $item_id ) {
-                    if ( $item_id == $item['id'] && ! in_array( $item['id'], $excluded_items ) ) {
-                        $discounted_price -= $price - wpinv_get_discounted_amount( $discount, $price );
+            if (!empty($reqs) && wpinv_is_discount_not_global($code_id)) {
+                foreach ($reqs as $item_id) {
+                    if ($item_id == $item['id'] && !in_array($item['id'], $excluded_items)) {
+                        $discounted_price -= $price - wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             } else {
                 // This is a global cart discount
-                if ( !in_array( $item['id'], $excluded_items ) ) {
-                    if ( 'flat' === wpinv_get_discount_type( $code_id ) ) {
+                if (!in_array($item['id'], $excluded_items)) {
+                    if ('flat' === wpinv_get_discount_type($code_id)) {
                         $items_subtotal    = 0.00;
                         $cart_items        = wpinv_get_cart_contents();
                         
-                        foreach ( $cart_items as $cart_item ) {
-                            if ( ! in_array( $cart_item['id'], $excluded_items ) ) {
-                                $options = !empty( $cart_item['options'] ) ? $cart_item['options'] : array();
-                                $item_price      = wpinv_get_cart_item_price( $cart_item['id'], $cart_item, $options );
+                        foreach ($cart_items as $cart_item) {
+                            if (!in_array($cart_item['id'], $excluded_items)) {
+                                $options = !empty($cart_item['options']) ? $cart_item['options'] : array();
+                                $item_price      = wpinv_get_cart_item_price($cart_item['id'], $cart_item, $options);
                                 $items_subtotal += $item_price * $cart_item['quantity'];
                             }
                         }
 
-                        $subtotal_percent  = ( ( $price * $item['quantity'] ) / $items_subtotal );
-                        $code_amount       = wpinv_get_discount_amount( $code_id );
+                        $subtotal_percent  = (($price * $item['quantity']) / $items_subtotal);
+                        $code_amount       = wpinv_get_discount_amount($code_id);
                         $discounted_amount = $code_amount * $subtotal_percent;
                         $discounted_price -= $discounted_amount;
 
-                        $wpinv_flat_discount_total += round( $discounted_amount, wpinv_currency_decimal_filter() );
+                        $wpinv_flat_discount_total += round($discounted_amount, wpinv_currency_decimal_filter());
 
-                        if ( $wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount ) {
+                        if ($wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount) {
                             $adjustment = $code_amount - $wpinv_flat_discount_total;
                             $discounted_price -= $adjustment;
                         }
                     } else {
-                        $discounted_price -= $price - wpinv_get_discounted_amount( $discount, $price );
+                        $discounted_price -= $price - wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             }
         }
 
-        $amount = ( $price - apply_filters( 'wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price ) );
+        $amount = ($price - apply_filters('wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price));
 
-        if ( 'flat' !== wpinv_get_discount_type( $code_id ) ) {
+        if ('flat' !== wpinv_get_discount_type($code_id)) {
             $amount = $amount * $item['quantity'];
         }
     }
@@ -1043,59 +1043,59 @@ 
     return $amount;
 }
 
-function wpinv_cart_discounts_html( $items = array() ) {
-    echo wpinv_get_cart_discounts_html( $items );
+function wpinv_cart_discounts_html($items = array()) {
+    echo wpinv_get_cart_discounts_html($items);
 }
 
-function wpinv_get_cart_discounts_html( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounts_html($items = array(), $discounts = false) {
     global $wpi_cart_columns;
     
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
     
-    if ( !$discounts ) {
-        $discounts = wpinv_get_cart_discounts( $items );
+    if (!$discounts) {
+        $discounts = wpinv_get_cart_discounts($items);
     }
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
     
-    $discounts = is_array( $discounts ) ? $discounts : array( $discounts );
+    $discounts = is_array($discounts) ? $discounts : array($discounts);
     
     $html = '';
 
-    foreach ( $discounts as $discount ) {
-        $discount_id    = wpinv_get_discount_id_by_code( $discount );
-        $discount_value = wpinv_get_discount_amount( $discount_id );
-        $rate           = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), $discount_value );
-        $amount         = wpinv_get_cart_items_discount_amount( $items, $discount );
-        $remove_btn     = '<a title="' . esc_attr__( 'Remove discount', 'invoicing' ) . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
+    foreach ($discounts as $discount) {
+        $discount_id    = wpinv_get_discount_id_by_code($discount);
+        $discount_value = wpinv_get_discount_amount($discount_id);
+        $rate           = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), $discount_value);
+        $amount         = wpinv_get_cart_items_discount_amount($items, $discount);
+        $remove_btn     = '<a title="' . esc_attr__('Remove discount', 'invoicing') . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
         
         $html .= '<tr class="wpinv_cart_footer_row wpinv_cart_discount_row">';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_first', $items );
+        do_action('wpinv_checkout_table_discount_first', $items);
         $html .= ob_get_clean();
-        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label( $discount, $rate, false ) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price( wpinv_format_amount( $amount ) ) . '</span></td>';
+        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label($discount, $rate, false) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price(wpinv_format_amount($amount)) . '</span></td>';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_last', $items );
+        do_action('wpinv_checkout_table_discount_last', $items);
         $html .= ob_get_clean();
         $html .= '</tr>';
     }
 
-    return apply_filters( 'wpinv_get_cart_discounts_html', $html, $discounts, $rate );
+    return apply_filters('wpinv_get_cart_discounts_html', $html, $discounts, $rate);
 }
 
-function wpinv_display_cart_discount( /** @scrutinizer ignore-unused */ $formatted = false, $echo = false ) {
+function wpinv_display_cart_discount(/** @scrutinizer ignore-unused */ $formatted = false, $echo = false) {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return false;
     }
 
-    $discount_id  = wpinv_get_discount_id_by_code( $discounts[0] );
-    $amount       = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), wpinv_get_discount_amount( $discount_id ) );
+    $discount_id  = wpinv_get_discount_id_by_code($discounts[0]);
+    $amount       = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), wpinv_get_discount_amount($discount_id));
 
-    if ( $echo ) {
+    if ($echo) {
         echo $amount;
     }
 
@@ -1103,101 +1103,101 @@ 
 }
 
 function wpinv_remove_cart_discount() {
-    if ( !isset( $_GET['discount_id'] ) || ! isset( $_GET['discount_code'] ) ) {
+    if (!isset($_GET['discount_id']) || !isset($_GET['discount_code'])) {
         return;
     }
 
-    do_action( 'wpinv_pre_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_pre_remove_cart_discount', absint($_GET['discount_id']));
 
-    wpinv_unset_cart_discount( urldecode( $_GET['discount_code'] ) );
+    wpinv_unset_cart_discount(urldecode($_GET['discount_code']));
 
-    do_action( 'wpinv_post_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_post_remove_cart_discount', absint($_GET['discount_id']));
 
-    wp_redirect( wpinv_get_checkout_uri() ); wpinv_die();
+    wp_redirect(wpinv_get_checkout_uri()); wpinv_die();
 }
-add_action( 'wpinv_remove_cart_discount', 'wpinv_remove_cart_discount' );
+add_action('wpinv_remove_cart_discount', 'wpinv_remove_cart_discount');
 
 function wpinv_maybe_remove_cart_discount() {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
 
-    foreach ( $discounts as $discount ) {
-        if ( !wpinv_is_discount_valid( $discount ) ) {
-            wpinv_unset_cart_discount( $discount );
+    foreach ($discounts as $discount) {
+        if (!wpinv_is_discount_valid($discount)) {
+            wpinv_unset_cart_discount($discount);
         }
     }
 }
-add_action( 'wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount' );
+add_action('wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount');
 
 function wpinv_multiple_discounts_allowed() {
-    $ret = wpinv_get_option( 'allow_multiple_discounts', false );
-    return (bool) apply_filters( 'wpinv_multiple_discounts_allowed', $ret );
+    $ret = wpinv_get_option('allow_multiple_discounts', false);
+    return (bool) apply_filters('wpinv_multiple_discounts_allowed', $ret);
 }
 
-function wpinv_get_discount_label( $code, $echo = true ) {
-    $label = wp_sprintf( __( 'Discount%1$s', 'invoicing' ), ( $code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)': '' ) );
-    $label = apply_filters( 'wpinv_get_discount_label', $label, $code );
+function wpinv_get_discount_label($code, $echo = true) {
+    $label = wp_sprintf(__('Discount%1$s', 'invoicing'), ($code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)' : ''));
+    $label = apply_filters('wpinv_get_discount_label', $label, $code);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_cart_discount_label( $code, $rate, $echo = true ) {
-    $label = wp_sprintf( __( 'Discount: %s', 'invoicing' ), $code );
-    $label = apply_filters( 'wpinv_cart_discount_label', $label, $code, $rate );
+function wpinv_cart_discount_label($code, $rate, $echo = true) {
+    $label = wp_sprintf(__('Discount: %s', 'invoicing'), $code);
+    $label = apply_filters('wpinv_cart_discount_label', $label, $code, $rate);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_check_delete_discount( $check, $post ) {
-    if ( $post->post_type == 'wpi_discount' && wpinv_get_discount_uses( $post->ID ) > 0 ) {
+function wpinv_check_delete_discount($check, $post) {
+    if ($post->post_type == 'wpi_discount' && wpinv_get_discount_uses($post->ID) > 0) {
         return true;
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_discount', 10, 2 );
+add_filter('pre_delete_post', 'wpinv_check_delete_discount', 10, 2);
 
 function wpinv_checkout_form_validate_discounts() {
     global $wpi_checkout_id;
     
     $discounts = wpinv_get_cart_discounts();
     
-    if ( !empty( $discounts ) ) {
+    if (!empty($discounts)) {
         $invalid = false;
         
-        foreach ( $discounts as $key => $code ) {
-            if ( !wpinv_is_discount_valid( $code, (int)wpinv_get_user_id( $wpi_checkout_id ) ) ) {
+        foreach ($discounts as $key => $code) {
+            if (!wpinv_is_discount_valid($code, (int) wpinv_get_user_id($wpi_checkout_id))) {
                 $invalid = true;
                 
-                wpinv_unset_cart_discount( $code );
+                wpinv_unset_cart_discount($code);
             }
         }
         
-        if ( $invalid ) {
+        if ($invalid) {
             $errors = wpinv_get_errors();
-            $error  = !empty( $errors['wpinv-discount-error'] ) ? $errors['wpinv-discount-error'] . ' ' : '';
-            $error  .= __( 'The discount has been removed from cart.', 'invoicing' );
-            wpinv_set_error( 'wpinv-discount-error', $error );
+            $error  = !empty($errors['wpinv-discount-error']) ? $errors['wpinv-discount-error'] . ' ' : '';
+            $error .= __('The discount has been removed from cart.', 'invoicing');
+            wpinv_set_error('wpinv-discount-error', $error);
             
-            wpinv_recalculate_tax( true );
+            wpinv_recalculate_tax(true);
         }
     }
 }
-add_action( 'wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10 );
+add_action('wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10);
 
 function wpinv_discount_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_discount_amount', $output );
+    return apply_filters('wpinv_discount_amount', $output);
 }
\ No newline at end of file

includes/wpinv-template-functions.php

Spacing +736 added lines, -736 removed lines

@@ -7,91 +7,91 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-if ( !is_admin() ) {
-    add_filter( 'template_include', 'wpinv_template', 10, 1 );
-    add_action( 'wpinv_invoice_print_body_start', 'wpinv_display_invoice_top_bar' );
-    add_action( 'wpinv_invoice_top_bar_left', 'wpinv_invoice_display_left_actions' );
-    add_action( 'wpinv_invoice_top_bar_right', 'wpinv_invoice_display_right_actions' );
+if (!is_admin()) {
+    add_filter('template_include', 'wpinv_template', 10, 1);
+    add_action('wpinv_invoice_print_body_start', 'wpinv_display_invoice_top_bar');
+    add_action('wpinv_invoice_top_bar_left', 'wpinv_invoice_display_left_actions');
+    add_action('wpinv_invoice_top_bar_right', 'wpinv_invoice_display_right_actions');
 }
 
 function wpinv_template_path() {
-    return apply_filters( 'wpinv_template_path', wpinv_get_theme_template_dir_name() );
+    return apply_filters('wpinv_template_path', wpinv_get_theme_template_dir_name());
 }
 
-function wpinv_display_invoice_top_bar( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_display_invoice_top_bar($invoice) {
+    if (empty($invoice)) {
         return;
     }
     ?>
     <div class="row wpinv-top-bar no-print">
         <div class="container">
             <div class="col-xs-6">
-                <?php do_action( 'wpinv_invoice_top_bar_left', $invoice );?>
+                <?php do_action('wpinv_invoice_top_bar_left', $invoice); ?>
             </div>
             <div class="col-xs-6 text-right">
-                <?php do_action( 'wpinv_invoice_top_bar_right', $invoice );?>
+                <?php do_action('wpinv_invoice_top_bar_right', $invoice); ?>
             </div>
         </div>
     </div>
     <?php
 }
 
-function wpinv_invoice_display_left_actions( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_display_left_actions($invoice) {
+    if (empty($invoice)) {
         return; // Exit if invoice is not set.
     }
     
-    if ( $invoice->post_type == 'wpi_invoice' ) {
-        if ( $invoice->needs_payment() ) {
-            ?> <a class="btn btn-success btn-sm" title="<?php esc_attr_e( 'Pay This Invoice', 'invoicing' ); ?>" href="<?php echo esc_url( $invoice->get_checkout_payment_url() ); ?>"><?php _e( 'Pay For Invoice', 'invoicing' ); ?></a><?php
+    if ($invoice->post_type == 'wpi_invoice') {
+        if ($invoice->needs_payment()) {
+            ?> <a class="btn btn-success btn-sm" title="<?php esc_attr_e('Pay This Invoice', 'invoicing'); ?>" href="<?php echo esc_url($invoice->get_checkout_payment_url()); ?>"><?php _e('Pay For Invoice', 'invoicing'); ?></a><?php
         }
     }
     do_action('wpinv_invoice_display_left_actions', $invoice);
 }
 
-function wpinv_invoice_display_right_actions( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_display_right_actions($invoice) {
+    if (empty($invoice)) {
         return; // Exit if invoice is not set.
     }
 
-    if ( $invoice->post_type == 'wpi_invoice' ) { ?>
-        <a class="btn btn-primary btn-sm btn-print-invoice" onclick="window.print();" href="javascript:void(0)"><?php _e( 'Print Invoice', 'invoicing' ); ?></a>
-        <?php if ( is_user_logged_in() ) { ?>
-        &nbsp;&nbsp;<a class="btn btn-warning btn-sm btn-invoice-history" href="<?php echo esc_url( wpinv_get_history_page_uri() ); ?>"><?php _e( 'Invoice History', 'invoicing' ); ?></a>
+    if ($invoice->post_type == 'wpi_invoice') { ?>
+        <a class="btn btn-primary btn-sm btn-print-invoice" onclick="window.print();" href="javascript:void(0)"><?php _e('Print Invoice', 'invoicing'); ?></a>
+        <?php if (is_user_logged_in()) { ?>
+        &nbsp;&nbsp;<a class="btn btn-warning btn-sm btn-invoice-history" href="<?php echo esc_url(wpinv_get_history_page_uri()); ?>"><?php _e('Invoice History', 'invoicing'); ?></a>
         <?php }
     }
     do_action('wpinv_invoice_display_right_actions', $invoice);
 }
 
-function wpinv_before_invoice_content( $content ) {
+function wpinv_before_invoice_content($content) {
     global $post;
 
-    if ( !empty( $post ) && $post->post_type == 'wpi_invoice' && is_singular( 'wpi_invoice' ) && is_main_query() ) {
+    if (!empty($post) && $post->post_type == 'wpi_invoice' && is_singular('wpi_invoice') && is_main_query()) {
         ob_start();
-        do_action( 'wpinv_before_invoice_content', $post->ID );
+        do_action('wpinv_before_invoice_content', $post->ID);
         $content = ob_get_clean() . $content;
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_before_invoice_content' );
+add_filter('the_content', 'wpinv_before_invoice_content');
 
-function wpinv_after_invoice_content( $content ) {
+function wpinv_after_invoice_content($content) {
     global $post;
 
-    if ( !empty( $post ) && $post->post_type == 'wpi_invoice' && is_singular( 'wpi_invoice' ) && is_main_query() ) {
+    if (!empty($post) && $post->post_type == 'wpi_invoice' && is_singular('wpi_invoice') && is_main_query()) {
         ob_start();
-        do_action( 'wpinv_after_invoice_content', $post->ID );
+        do_action('wpinv_after_invoice_content', $post->ID);
         $content .= ob_get_clean();
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_after_invoice_content' );
+add_filter('the_content', 'wpinv_after_invoice_content');
 
 function wpinv_get_templates_dir() {
     return WPINV_PLUGIN_DIR . 'templates';
@@ -101,105 +101,105 @@ 
     return WPINV_PLUGIN_URL . 'templates';
 }
 
-function wpinv_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-    if ( ! empty( $args ) && is_array( $args ) ) {
-		extract( $args );
+function wpinv_get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
+    if (!empty($args) && is_array($args)) {
+		extract($args);
 	}
 
-	$located = wpinv_locate_template( $template_name, $template_path, $default_path );
+	$located = wpinv_locate_template($template_name, $template_path, $default_path);
 	// Allow 3rd party plugin filter template file from their plugin.
-	$located = apply_filters( 'wpinv_get_template', $located, $template_name, $args, $template_path, $default_path );
+	$located = apply_filters('wpinv_get_template', $located, $template_name, $args, $template_path, $default_path);
 
-	if ( ! file_exists( $located ) ) {
-        _doing_it_wrong( __FUNCTION__, sprintf( '<code>%s</code> does not exist.', $located ), '2.1' );
+	if (!file_exists($located)) {
+        _doing_it_wrong(__FUNCTION__, sprintf('<code>%s</code> does not exist.', $located), '2.1');
 		return;
 	}
 
-	do_action( 'wpinv_before_template_part', $template_name, $template_path, $located, $args );
+	do_action('wpinv_before_template_part', $template_name, $template_path, $located, $args);
 
-	include( $located );
+	include($located);
 
-	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
+	do_action('wpinv_after_template_part', $template_name, $template_path, $located, $args);
 }
 
-function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+function wpinv_get_template_html($template_name, $args = array(), $template_path = '', $default_path = '') {
 	ob_start();
-	wpinv_get_template( $template_name, $args, $template_path, $default_path );
+	wpinv_get_template($template_name, $args, $template_path, $default_path);
 	return ob_get_clean();
 }
 
-function wpinv_locate_template( $template_name, $template_path = '', $default_path = '' ) {
-    if ( ! $template_path ) {
+function wpinv_locate_template($template_name, $template_path = '', $default_path = '') {
+    if (!$template_path) {
         $template_path = wpinv_template_path();
     }
 
-    if ( ! $default_path ) {
+    if (!$default_path) {
         $default_path = WPINV_PLUGIN_DIR . 'templates/';
     }
 
     // Look within passed path within the theme - this is priority.
     $template = locate_template(
         array(
-            trailingslashit( $template_path ) . $template_name,
+            trailingslashit($template_path) . $template_name,
             $template_name
         )
     );
 
     // Get default templates/
-    if ( !$template && $default_path ) {
-        $template = trailingslashit( $default_path ) . $template_name;
+    if (!$template && $default_path) {
+        $template = trailingslashit($default_path) . $template_name;
     }
 
     // Return what we found.
-    return apply_filters( 'wpinv_locate_template', $template, $template_name, $template_path );
+    return apply_filters('wpinv_locate_template', $template, $template_name, $template_path);
 }
 
-function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+function wpinv_get_template_part($slug, $name = null, $load = true) {
+	do_action('get_template_part_' . $slug, $slug, $name);
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
+	if (isset($name))
 		$templates[] = $slug . '-' . $name . '.php';
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+	$templates = apply_filters('wpinv_get_template_part', $templates, $slug, $name);
 
 	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+	return wpinv_locate_tmpl($templates, $load, false);
 }
 
-function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
+function wpinv_locate_tmpl($template_names, $load = false, $require_once = true) {
 	// No file found yet
 	$located = false;
 
 	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+	foreach ((array) $template_names as $template_name) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
+		if (empty($template_name))
 			continue;
 
 		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+		$template_name = ltrim($template_name, '/');
 
 		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+		foreach (wpinv_get_theme_template_paths() as $template_path) {
 
-			if( file_exists( $template_path . $template_name ) ) {
+			if (file_exists($template_path . $template_name)) {
 				$located = $template_path . $template_name;
 				break;
 			}
 		}
 
-		if( !empty( $located ) ) {
+		if (!empty($located)) {
 			break;
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ((true == $load) && !empty($located))
+		load_template($located, $require_once);
 
 	return $located;
 }
@@ -208,159 +208,159 @@ 
 	$template_dir = wpinv_get_theme_template_dir_name();
 
 	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
+		1 => trailingslashit(get_stylesheet_directory()) . $template_dir,
+		10 => trailingslashit(get_template_directory()) . $template_dir,
 		100 => wpinv_get_templates_dir()
 	);
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+	$file_paths = apply_filters('wpinv_template_paths', $file_paths);
 
 	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+	ksort($file_paths, SORT_NUMERIC);
 
-	return array_map( 'trailingslashit', $file_paths );
+	return array_map('trailingslashit', $file_paths);
 }
 
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
+	return trailingslashit(apply_filters('wpinv_templates_dir', 'invoicing'));
 }
 
 function wpinv_checkout_meta_tags() {
 
 	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
-	$pages[] = wpinv_get_option( 'invoice_subscription_page' );
+	$pages[] = wpinv_get_option('success_page');
+	$pages[] = wpinv_get_option('failure_page');
+	$pages[] = wpinv_get_option('invoice_history_page');
+	$pages[] = wpinv_get_option('invoice_subscription_page');
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+	if (!wpinv_is_checkout() && !is_page($pages)) {
 		return;
 	}
 
 	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
-add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
+add_action('wp_head', 'wpinv_checkout_meta_tags');
 
-function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+function wpinv_add_body_classes($class) {
+	$classes = (array) $class;
 
-	if( wpinv_is_checkout() ) {
+	if (wpinv_is_checkout()) {
 		$classes[] = 'wpinv-checkout';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_success_page() ) {
+	if (wpinv_is_success_page()) {
 		$classes[] = 'wpinv-success';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_failed_transaction_page() ) {
+	if (wpinv_is_failed_transaction_page()) {
 		$classes[] = 'wpinv-failed-transaction';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_invoice_history_page() ) {
+	if (wpinv_is_invoice_history_page()) {
 		$classes[] = 'wpinv-history';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_subscriptions_history_page() ) {
+	if (wpinv_is_subscriptions_history_page()) {
 		$classes[] = 'wpinv-subscription';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_test_mode() ) {
+	if (wpinv_is_test_mode()) {
 		$classes[] = 'wpinv-test-mode';
 		$classes[] = 'wpinv-page';
 	}
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
-add_filter( 'body_class', 'wpinv_add_body_classes' );
+add_filter('body_class', 'wpinv_add_body_classes');
 
-function wpinv_html_dropdown( $name = 'wpinv_discounts', $selected = 0, $status = '' ) {
-    $args = array( 'nopaging' => true );
+function wpinv_html_dropdown($name = 'wpinv_discounts', $selected = 0, $status = '') {
+    $args = array('nopaging' => true);
 
-    if ( ! empty( $status ) )
+    if (!empty($status))
         $args['post_status'] = $status;
 
-    $discounts = wpinv_get_discounts( $args );
+    $discounts = wpinv_get_discounts($args);
     $options   = array();
 
-    if ( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $options[ absint( $discount->ID ) ] = esc_html( get_the_title( $discount->ID ) );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $options[absint($discount->ID)] = esc_html(get_the_title($discount->ID));
         }
     } else {
-        $options[0] = __( 'No discounts found', 'invoicing' );
+        $options[0] = __('No discounts found', 'invoicing');
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false,
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_year_dropdown( $name = 'year', $selected = 0, $years_before = 5, $years_after = 0 ) {
-    $current     = date( 'Y' );
-    $start_year  = $current - absint( $years_before );
-    $end_year    = $current + absint( $years_after );
-    $selected    = empty( $selected ) ? date( 'Y' ) : $selected;
+function wpinv_html_year_dropdown($name = 'year', $selected = 0, $years_before = 5, $years_after = 0) {
+    $current     = date('Y');
+    $start_year  = $current - absint($years_before);
+    $end_year    = $current + absint($years_after);
+    $selected    = empty($selected) ? date('Y') : $selected;
     $options     = array();
 
-    while ( $start_year <= $end_year ) {
-        $options[ absint( $start_year ) ] = $start_year;
+    while ($start_year <= $end_year) {
+        $options[absint($start_year)] = $start_year;
         $start_year++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_month_dropdown( $name = 'month', $selected = 0 ) {
+function wpinv_html_month_dropdown($name = 'month', $selected = 0) {
 
     $options = array(
-        '1'  => __( 'January', 'invoicing' ),
-        '2'  => __( 'February', 'invoicing' ),
-        '3'  => __( 'March', 'invoicing' ),
-        '4'  => __( 'April', 'invoicing' ),
-        '5'  => __( 'May', 'invoicing' ),
-        '6'  => __( 'June', 'invoicing' ),
-        '7'  => __( 'July', 'invoicing' ),
-        '8'  => __( 'August', 'invoicing' ),
-        '9'  => __( 'September', 'invoicing' ),
-        '10' => __( 'October', 'invoicing' ),
-        '11' => __( 'November', 'invoicing' ),
-        '12' => __( 'December', 'invoicing' ),
+        '1'  => __('January', 'invoicing'),
+        '2'  => __('February', 'invoicing'),
+        '3'  => __('March', 'invoicing'),
+        '4'  => __('April', 'invoicing'),
+        '5'  => __('May', 'invoicing'),
+        '6'  => __('June', 'invoicing'),
+        '7'  => __('July', 'invoicing'),
+        '8'  => __('August', 'invoicing'),
+        '9'  => __('September', 'invoicing'),
+        '10' => __('October', 'invoicing'),
+        '11' => __('November', 'invoicing'),
+        '12' => __('December', 'invoicing'),
     );
 
     // If no month is selected, default to the current month
-    $selected = empty( $selected ) ? date( 'n' ) : $selected;
+    $selected = empty($selected) ? date('n') : $selected;
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_select( $args = array() ) {
+function wpinv_html_select($args = array()) {
     $defaults = array(
         'options'          => array(),
         'name'             => null,
@@ -369,8 +369,8 @@ 
         'selected'         => 0,
         'placeholder'      => null,
         'multiple'         => false,
-        'show_option_all'  => _x( 'All', 'all dropdown items', 'invoicing' ),
-        'show_option_none' => _x( 'None', 'no dropdown items', 'invoicing' ),
+        'show_option_all'  => _x('All', 'all dropdown items', 'invoicing'),
+        'show_option_none' => _x('None', 'no dropdown items', 'invoicing'),
         'data'             => array(),
         'onchange'         => null,
         'required'         => false,
@@ -378,74 +378,74 @@ 
         'readonly'         => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $data_elements = '';
-    foreach ( $args['data'] as $key => $value ) {
-        $data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+    foreach ($args['data'] as $key => $value) {
+        $data_elements .= ' data-' . esc_attr($key) . '="' . esc_attr($value) . '"';
     }
 
-    if( $args['multiple'] ) {
+    if ($args['multiple']) {
         $multiple = ' MULTIPLE';
     } else {
         $multiple = '';
     }
 
-    if( $args['placeholder'] ) {
+    if ($args['placeholder']) {
         $placeholder = $args['placeholder'];
     } else {
         $placeholder = '';
     }
     
     $options = '';
-    if( !empty( $args['onchange'] ) ) {
-        $options .= ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $options .= ' onchange="' . esc_attr($args['onchange']) . '"';
     }
     
-    if( !empty( $args['required'] ) ) {
+    if (!empty($args['required'])) {
         $options .= ' required="required"';
     }
     
-    if( !empty( $args['disabled'] ) ) {
+    if (!empty($args['disabled'])) {
         $options .= ' disabled';
     }
     
-    if( !empty( $args['readonly'] ) ) {
+    if (!empty($args['readonly'])) {
         $options .= ' readonly';
     }
 
-    $class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-    $output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim( $options ) . $data_elements . '>';
+    $class  = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
+    $output = '<select name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim($options) . $data_elements . '>';
 
-    if ( $args['show_option_all'] ) {
-        if( $args['multiple'] ) {
-            $selected = selected( true, in_array( 0, $args['selected'] ), false );
+    if ($args['show_option_all']) {
+        if ($args['multiple']) {
+            $selected = selected(true, in_array(0, $args['selected']), false);
         } else {
-            $selected = selected( $args['selected'], 0, false );
+            $selected = selected($args['selected'], 0, false);
         }
-        $output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+        $output .= '<option value="all"' . $selected . '>' . esc_html($args['show_option_all']) . '</option>';
     }
 
-    if ( !empty( $args['options'] ) ) {
+    if (!empty($args['options'])) {
 
-        if ( $args['show_option_none'] ) {
-            if( $args['multiple'] ) {
-                $selected = selected( true, in_array( "", $args['selected'] ), false );
+        if ($args['show_option_none']) {
+            if ($args['multiple']) {
+                $selected = selected(true, in_array("", $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'] === "", true, false );
+                $selected = selected($args['selected'] === "", true, false);
             }
-            $output .= '<option value=""' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+            $output .= '<option value=""' . $selected . '>' . esc_html($args['show_option_none']) . '</option>';
         }
 
-        foreach( $args['options'] as $key => $option ) {
+        foreach ($args['options'] as $key => $option) {
 
-            if( $args['multiple'] && is_array( $args['selected'] ) ) {
-                $selected = selected( true, (bool)in_array( $key, $args['selected'] ), false );
+            if ($args['multiple'] && is_array($args['selected'])) {
+                $selected = selected(true, (bool) in_array($key, $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'], $key, false );
+                $selected = selected($args['selected'], $key, false);
             }
 
-            $output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+            $output .= '<option value="' . esc_attr($key) . '"' . $selected . '>' . esc_html($option) . '</option>';
         }
     }
 
@@ -454,7 +454,7 @@ 
     return $output;
 }
 
-function wpinv_item_dropdown( $args = array() ) {
+function wpinv_item_dropdown($args = array()) {
     $defaults = array(
         'name'              => 'wpi_item',
         'id'                => 'wpi_item',
@@ -462,14 +462,14 @@ 
         'multiple'          => false,
         'selected'          => 0,
         'number'            => 100,
-        'placeholder'       => __( 'Choose a item', 'invoicing' ),
-        'data'              => array( 'search-type' => 'item' ),
+        'placeholder'       => __('Choose a item', 'invoicing'),
+        'data'              => array('search-type' => 'item'),
         'show_option_all'   => false,
         'show_option_none'  => false,
         'show_recurring'    => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $item_args = array(
         'post_type'      => 'wpi_item',
@@ -478,44 +478,44 @@ 
         'posts_per_page' => $args['number']
     );
     
-    $item_args  = apply_filters( 'wpinv_item_dropdown_query_args', $item_args, $args, $defaults );
+    $item_args  = apply_filters('wpinv_item_dropdown_query_args', $item_args, $args, $defaults);
 
-    $items      = get_posts( $item_args );
+    $items      = get_posts($item_args);
     $options    = array();
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            $title = esc_html( $item->post_title );
+    if ($items) {
+        foreach ($items as $item) {
+            $title = esc_html($item->post_title);
             
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $item->ID, false );
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($item->ID, false);
             }
             
-            $options[ absint( $item->ID ) ] = $title;
+            $options[absint($item->ID)] = $title;
         }
     }
 
     // This ensures that any selected items are included in the drop down
-    if( is_array( $args['selected'] ) ) {
-        foreach( $args['selected'] as $item ) {
-            if( ! in_array( $item, $options ) ) {
-                $title = get_the_title( $item );
-                if ( !empty( $args['show_recurring'] ) ) {
-                    $title .= wpinv_get_item_suffix( $item, false );
+    if (is_array($args['selected'])) {
+        foreach ($args['selected'] as $item) {
+            if (!in_array($item, $options)) {
+                $title = get_the_title($item);
+                if (!empty($args['show_recurring'])) {
+                    $title .= wpinv_get_item_suffix($item, false);
                 }
                 $options[$item] = $title;
             }
         }
-    } elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-        if ( ! in_array( $args['selected'], $options ) ) {
-            $title = get_the_title( $args['selected'] );
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $args['selected'], false );
+    } elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+        if (!in_array($args['selected'], $options)) {
+            $title = get_the_title($args['selected']);
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($args['selected'], false);
             }
-            $options[$args['selected']] = get_the_title( $args['selected'] );
+            $options[$args['selected']] = get_the_title($args['selected']);
         }
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $args['name'],
         'selected'         => $args['selected'],
         'id'               => $args['id'],
@@ -526,12 +526,12 @@ 
         'show_option_all'  => $args['show_option_all'],
         'show_option_none' => $args['show_option_none'],
         'data'             => $args['data'],
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_checkbox( $args = array() ) {
+function wpinv_html_checkbox($args = array()) {
     $defaults = array(
         'name'     => null,
         'current'  => null,
@@ -542,38 +542,38 @@ 
         )
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if ( ! empty( $args['options']['disabled'] ) ) {
+    if (!empty($args['options']['disabled'])) {
         $options .= ' disabled="disabled"';
-    } elseif ( ! empty( $args['options']['readonly'] ) ) {
+    } elseif (!empty($args['options']['readonly'])) {
         $options .= ' readonly';
     }
 
-    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $class . ' ' . esc_attr( $args['name'] ) . '" ' . checked( 1, $args['current'], false ) . ' />';
+    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['name']) . '" class="' . $class . ' ' . esc_attr($args['name']) . '" ' . checked(1, $args['current'], false) . ' />';
 
     return $output;
 }
 
-function wpinv_html_text( $args = array() ) {
+function wpinv_html_text($args = array()) {
     // Backwards compatibility
-    if ( func_num_args() > 1 ) {
+    if (func_num_args() > 1) {
         $args = func_get_args();
 
         $name  = $args[0];
-        $value = isset( $args[1] ) ? $args[1] : '';
-        $label = isset( $args[2] ) ? $args[2] : '';
-        $desc  = isset( $args[3] ) ? $args[3] : '';
+        $value = isset($args[1]) ? $args[1] : '';
+        $label = isset($args[2]) ? $args[2] : '';
+        $desc  = isset($args[3]) ? $args[3] : '';
     }
 
     $defaults = array(
         'id'           => '',
-        'name'         => isset( $name )  ? $name  : 'text',
-        'value'        => isset( $value ) ? $value : null,
-        'label'        => isset( $label ) ? $label : null,
-        'desc'         => isset( $desc )  ? $desc  : null,
+        'name'         => isset($name) ? $name : 'text',
+        'value'        => isset($value) ? $value : null,
+        'label'        => isset($label) ? $label : null,
+        'desc'         => isset($desc) ? $desc : null,
         'placeholder'  => '',
         'class'        => 'regular-text',
         'disabled'     => false,
@@ -583,51 +583,51 @@ 
         'data'         => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if( $args['required'] ) {
+    if ($args['required']) {
         $options .= ' required="required"';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
 
     $data = '';
-    if ( !empty( $args['data'] ) ) {
-        foreach ( $args['data'] as $key => $value ) {
-            $data .= 'data-' . wpinv_sanitize_key( $key ) . '="' . esc_attr( $value ) . '" ';
+    if (!empty($args['data'])) {
+        foreach ($args['data'] as $key => $value) {
+            $data .= 'data-' . wpinv_sanitize_key($key) . '="' . esc_attr($value) . '" ';
         }
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['id'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['id']) . '">' . esc_html($args['label']) . '</label>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
 
-    $output .= '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] )  . '" autocomplete="' . esc_attr( $args['autocomplete'] )  . '" value="' . esc_attr( $args['value'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="' . $class . '" ' . $data . ' ' . trim( $options ) . '/>';
+    $output .= '<input type="text" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" autocomplete="' . esc_attr($args['autocomplete']) . '" value="' . esc_attr($args['value']) . '" placeholder="' . esc_attr($args['placeholder']) . '" class="' . $class . '" ' . $data . ' ' . trim($options) . '/>';
 
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_date_field( $args = array() ) {
-    if( empty( $args['class'] ) ) {
+function wpinv_html_date_field($args = array()) {
+    if (empty($args['class'])) {
         $args['class'] = 'wpiDatepicker';
-    } elseif( ! strpos( $args['class'], 'wpiDatepicker' ) ) {
+    } elseif (!strpos($args['class'], 'wpiDatepicker')) {
         $args['class'] .= ' wpiDatepicker';
     }
 
-    return wpinv_html_text( $args );
+    return wpinv_html_text($args);
 }
 
-function wpinv_html_textarea( $args = array() ) {
+function wpinv_html_textarea($args = array()) {
     $defaults = array(
         'name'        => 'textarea',
         'value'       => null,
@@ -637,31 +637,31 @@ 
         'disabled'    => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $disabled = '';
-    if( $args['disabled'] ) {
+    if ($args['disabled']) {
         $disabled = ' disabled="disabled"';
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    $output .= '<textarea name="' . esc_attr( $args['name'] ) . '" id="' . wpinv_sanitize_key( $args['name'] ) . '" class="' . $class . '"' . $disabled . '>' . esc_attr( $args['value'] ) . '</textarea>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['name']) . '">' . esc_html($args['label']) . '</label>';
+    $output .= '<textarea name="' . esc_attr($args['name']) . '" id="' . wpinv_sanitize_key($args['name']) . '" class="' . $class . '"' . $disabled . '>' . esc_attr($args['value']) . '</textarea>';
 
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_ajax_user_search( $args = array() ) {
+function wpinv_html_ajax_user_search($args = array()) {
     $defaults = array(
         'name'        => 'user_id',
         'value'       => null,
-        'placeholder' => __( 'Enter username', 'invoicing' ),
+        'placeholder' => __('Enter username', 'invoicing'),
         'label'       => null,
         'desc'        => null,
         'class'       => '',
@@ -670,13 +670,13 @@ 
         'data'        => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $args['class'] = 'wpinv-ajax-user-search ' . $args['class'];
 
     $output  = '<span class="wpinv_user_search_wrap">';
-        $output .= wpinv_html_text( $args );
-        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __( 'Cancel', 'invoicing' ) . '" aria-label="' . __( 'Cancel', 'invoicing' ) . '" href="#">x</a><span></span></span>';
+        $output .= wpinv_html_text($args);
+        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __('Cancel', 'invoicing') . '" aria-label="' . __('Cancel', 'invoicing') . '" href="#">x</a><span></span></span>';
     $output .= '</span>';
 
     return $output;
@@ -685,7 +685,7 @@ 
 function wpinv_ip_geolocation() {
     global $wpinv_euvat;
     
-    $ip         = !empty( $_GET['ip'] ) ? sanitize_text_field( $_GET['ip'] ) : '';    
+    $ip         = !empty($_GET['ip']) ? sanitize_text_field($_GET['ip']) : '';    
     $content    = '';
     $iso        = '';
     $country    = '';
@@ -696,69 +696,69 @@ 
     $credit     = '';
     $address    = '';
     
-    if ( wpinv_get_option( 'vat_ip_lookup' ) == 'geoip2' && $geoip2_city = $wpinv_euvat->geoip2_city_record( $ip ) ) {
+    if (wpinv_get_option('vat_ip_lookup') == 'geoip2' && $geoip2_city = $wpinv_euvat->geoip2_city_record($ip)) {
         try {
             $iso        = $geoip2_city->country->isoCode;
             $country    = $geoip2_city->country->name;
-            $region     = !empty( $geoip2_city->subdivisions ) && !empty( $geoip2_city->subdivisions[0]->name ) ? $geoip2_city->subdivisions[0]->name : '';
+            $region     = !empty($geoip2_city->subdivisions) && !empty($geoip2_city->subdivisions[0]->name) ? $geoip2_city->subdivisions[0]->name : '';
             $city       = $geoip2_city->city->name;
             $longitude  = $geoip2_city->location->longitude;
             $latitude   = $geoip2_city->location->latitude;
-            $credit     = __( 'Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing' );
-        } catch( Exception $e ) { }
+            $credit     = __('Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing');
+        } catch (Exception $e) { }
     }
     
-    if ( !( $iso && $longitude && $latitude ) && function_exists( 'simplexml_load_file' ) ) {
+    if (!($iso && $longitude && $latitude) && function_exists('simplexml_load_file')) {
         try {
-            $load_xml = simplexml_load_file( 'http://www.geoplugin.net/xml.gp?ip=' . $ip );
+            $load_xml = simplexml_load_file('http://www.geoplugin.net/xml.gp?ip=' . $ip);
             
-            if ( !empty( $load_xml ) && isset( $load_xml->geoplugin_countryCode ) && !empty( $load_xml->geoplugin_latitude ) && !empty( $load_xml->geoplugin_longitude ) ) {
+            if (!empty($load_xml) && isset($load_xml->geoplugin_countryCode) && !empty($load_xml->geoplugin_latitude) && !empty($load_xml->geoplugin_longitude)) {
                 $iso        = $load_xml->geoplugin_countryCode;
                 $country    = $load_xml->geoplugin_countryName;
-                $region     = !empty( $load_xml->geoplugin_regionName ) ? $load_xml->geoplugin_regionName : '';
-                $city       = !empty( $load_xml->geoplugin_city ) ? $load_xml->geoplugin_city : '';
+                $region     = !empty($load_xml->geoplugin_regionName) ? $load_xml->geoplugin_regionName : '';
+                $city       = !empty($load_xml->geoplugin_city) ? $load_xml->geoplugin_city : '';
                 $longitude  = $load_xml->geoplugin_longitude;
                 $latitude   = $load_xml->geoplugin_latitude;
                 $credit     = $load_xml->geoplugin_credit;
-                $credit     = __( 'Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing' ) . '<br>' . $load_xml->geoplugin_credit;
+                $credit     = __('Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing') . '<br>' . $load_xml->geoplugin_credit;
             }
-        } catch( Exception $e ) { }
+        } catch (Exception $e) { }
     }
     
-    if ( $iso && $longitude && $latitude ) {
-        if ( $city ) {
+    if ($iso && $longitude && $latitude) {
+        if ($city) {
             $address .= $city . ', ';
         }
         
-        if ( $region ) {
+        if ($region) {
             $address .= $region . ', ';
         }
         
         $address .= $country . ' (' . $iso . ')';
-        $content = '<p>'. sprintf( __( '<b>Address:</b> %s', 'invoicing' ), $address ) . '</p>';
-        $content .= '<p>'. $credit . '</p>';
+        $content = '<p>' . sprintf(__('<b>Address:</b> %s', 'invoicing'), $address) . '</p>';
+        $content .= '<p>' . $credit . '</p>';
     } else {
-        $content = '<p>'. sprintf( __( 'Unable to find geolocation for the IP address: %s', 'invoicing' ), $ip ) . '</p>';
+        $content = '<p>' . sprintf(__('Unable to find geolocation for the IP address: %s', 'invoicing'), $ip) . '</p>';
     }
     ?>
 <!DOCTYPE html>
-<html><head><title><?php echo sprintf( __( 'IP: %s', 'invoicing' ), $ip );?></title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.css" /><style>html,body{height:100%;margin:0;padding:0;width:100%}body{text-align:center;background:#fff;color:#222;font-size:small;}body,p{font-family: arial,sans-serif}#map{margin:auto;width:100%;height:calc(100% - 120px);min-height:240px}</style></head>
+<html><head><title><?php echo sprintf(__('IP: %s', 'invoicing'), $ip); ?></title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.css" /><style>html,body{height:100%;margin:0;padding:0;width:100%}body{text-align:center;background:#fff;color:#222;font-size:small;}body,p{font-family: arial,sans-serif}#map{margin:auto;width:100%;height:calc(100% - 120px);min-height:240px}</style></head>
 <body>
-    <?php if ( $latitude && $latitude ) { ?>
+    <?php if ($latitude && $latitude) { ?>
     <div id="map"></div>
         <script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.js"></script>
         <script type="text/javascript">
         var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
             osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
             osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
-            latlng = new L.LatLng(<?php echo $latitude;?>, <?php echo $longitude;?>);
+            latlng = new L.LatLng(<?php echo $latitude; ?>, <?php echo $longitude; ?>);
 
         var map = new L.Map('map', {center: latlng, zoom: 12, layers: [osm]});
 
         var marker = new L.Marker(latlng);
         map.addLayer(marker);
 
-        marker.bindPopup("<p><?php esc_attr_e( $address );?></p>");
+        marker.bindPopup("<p><?php esc_attr_e($address); ?></p>");
     </script>
     <?php } ?>
     <div style="height:100px"><?php echo $content; ?></div>
@@ -766,18 +766,18 @@ 
 <?php
     exit;
 }
-add_action( 'wp_ajax_wpinv_ip_geolocation', 'wpinv_ip_geolocation' );
-add_action( 'wp_ajax_nopriv_wpinv_ip_geolocation', 'wpinv_ip_geolocation' );
+add_action('wp_ajax_wpinv_ip_geolocation', 'wpinv_ip_geolocation');
+add_action('wp_ajax_nopriv_wpinv_ip_geolocation', 'wpinv_ip_geolocation');
 
 // Set up the template for the invoice.
-function wpinv_template( $template ) {
+function wpinv_template($template) {
     global $post, $wp_query;
     
-    if ( ( is_single() || is_404() ) && !empty( $post->ID ) && (get_post_type( $post->ID ) == 'wpi_invoice' or get_post_type( $post->ID ) == 'wpi_quote')) {
-        if ( wpinv_user_can_view_invoice( $post->ID ) ) {
-            $template = wpinv_get_template_part( 'wpinv-invoice-print', false, false );
+    if ((is_single() || is_404()) && !empty($post->ID) && (get_post_type($post->ID) == 'wpi_invoice' or get_post_type($post->ID) == 'wpi_quote')) {
+        if (wpinv_user_can_view_invoice($post->ID)) {
+            $template = wpinv_get_template_part('wpinv-invoice-print', false, false);
         } else {
-            $template = wpinv_get_template_part( 'wpinv-invalid-access', false, false );
+            $template = wpinv_get_template_part('wpinv-invalid-access', false, false);
         }
     }
 
@@ -786,7 +786,7 @@ 
 
 function wpinv_get_business_address() {
     $business_address   = wpinv_store_address();
-    $business_address   = !empty( $business_address ) ? wpautop( wp_kses_post( $business_address ) ) : '';
+    $business_address   = !empty($business_address) ? wpautop(wp_kses_post($business_address)) : '';
     
     /*
     $default_country    = wpinv_get_default_country();
@@ -810,7 +810,7 @@ 
     
     $business_address = $business_address ? '<div class="address">' . $business_address . '</div>' : '';
     
-    return apply_filters( 'wpinv_get_business_address', $business_address );
+    return apply_filters('wpinv_get_business_address', $business_address);
 }
 
 function wpinv_display_from_address() {
@@ -820,107 +820,107 @@ 
     if (empty($from_name)) {
         $from_name = wpinv_get_business_name();
     }
-    ?><div class="from col-xs-2"><strong><?php _e( 'From:', 'invoicing' ) ?></strong></div>
+    ?><div class="from col-xs-2"><strong><?php _e('From:', 'invoicing') ?></strong></div>
     <div class="wrapper col-xs-10">
-        <div class="name"><?php echo esc_html( $from_name ); ?></div>
-        <?php if ( $address = wpinv_get_business_address() ) { ?>
-        <div class="address"><?php echo wpautop( wp_kses_post( $address ) );?></div>
+        <div class="name"><?php echo esc_html($from_name); ?></div>
+        <?php if ($address = wpinv_get_business_address()) { ?>
+        <div class="address"><?php echo wpautop(wp_kses_post($address)); ?></div>
         <?php } ?>
-        <?php if ( $email_from = wpinv_mail_get_from_address() ) { ?>
-        <div class="email_from"><?php echo wp_sprintf( __( 'Email: %s', 'invoicing' ), $email_from );?></div>
+        <?php if ($email_from = wpinv_mail_get_from_address()) { ?>
+        <div class="email_from"><?php echo wp_sprintf(__('Email: %s', 'invoicing'), $email_from); ?></div>
         <?php } ?>
     </div>
     <?php
 }
 
-function wpinv_watermark( $id = 0 ) {
-    $output = wpinv_get_watermark( $id );
+function wpinv_watermark($id = 0) {
+    $output = wpinv_get_watermark($id);
     
-    return apply_filters( 'wpinv_get_watermark', $output, $id );
+    return apply_filters('wpinv_get_watermark', $output, $id);
 }
 
-function wpinv_get_watermark( $id ) {
-    if ( !$id > 0 ) {
+function wpinv_get_watermark($id) {
+    if (!$id > 0) {
         return NULL;
     }
-    $invoice = wpinv_get_invoice( $id );
+    $invoice = wpinv_get_invoice($id);
     
-    if ( !empty( $invoice ) && "wpi_invoice" === $invoice->post_type ) {
-        if ( $invoice->is_paid() ) {
-            return __( 'Paid', 'invoicing' );
+    if (!empty($invoice) && "wpi_invoice" === $invoice->post_type) {
+        if ($invoice->is_paid()) {
+            return __('Paid', 'invoicing');
         }
-        if ( $invoice->is_refunded() ) {
-            return __( 'Refunded', 'invoicing' );
+        if ($invoice->is_refunded()) {
+            return __('Refunded', 'invoicing');
         }
-        if ( $invoice->has_status( array( 'wpi-cancelled' ) ) ) {
-            return __( 'Cancelled', 'invoicing' );
+        if ($invoice->has_status(array('wpi-cancelled'))) {
+            return __('Cancelled', 'invoicing');
         }
     }
     
     return NULL;
 }
 
-function wpinv_display_invoice_details( $invoice ) {
+function wpinv_display_invoice_details($invoice) {
     global $wpinv_euvat;
     
     $invoice_id = $invoice->ID;
     $vat_name   = $wpinv_euvat->get_vat_name();
     $use_taxes  = wpinv_use_taxes();
     
-    $invoice_status = wpinv_get_invoice_status( $invoice_id );
+    $invoice_status = wpinv_get_invoice_status($invoice_id);
     ?>
     <table class="table table-bordered table-sm">
-        <?php if ( $invoice_number = wpinv_get_invoice_number( $invoice_id ) ) { ?>
+        <?php if ($invoice_number = wpinv_get_invoice_number($invoice_id)) { ?>
             <tr class="wpi-row-number">
-                <th><?php echo apply_filters( 'wpinv_invoice_number_label', __( 'Invoice Number', 'invoicing' ), $invoice ); ?></th>
-                <td><?php echo esc_html( $invoice_number ); ?></td>
+                <th><?php echo apply_filters('wpinv_invoice_number_label', __('Invoice Number', 'invoicing'), $invoice); ?></th>
+                <td><?php echo esc_html($invoice_number); ?></td>
             </tr>
         <?php } ?>
         <tr class="wpi-row-status">
-            <th><?php echo apply_filters( 'wpinv_invoice_status_label', __( 'Invoice Status', 'invoicing' ), $invoice ); ?></th>
-            <td><?php echo wpinv_invoice_status_label( $invoice_status, wpinv_get_invoice_status( $invoice_id, true ) ); ?></td>
+            <th><?php echo apply_filters('wpinv_invoice_status_label', __('Invoice Status', 'invoicing'), $invoice); ?></th>
+            <td><?php echo wpinv_invoice_status_label($invoice_status, wpinv_get_invoice_status($invoice_id, true)); ?></td>
         </tr>
-        <?php if ( $invoice->is_renewal() ) { ?>
+        <?php if ($invoice->is_renewal()) { ?>
         <tr class="wpi-row-parent">
-            <th><?php echo apply_filters( 'wpinv_invoice_parent_invoice_label', __( 'Parent Invoice', 'invoicing' ), $invoice ); ?></th>
-            <td><?php echo wpinv_invoice_link( $invoice->parent_invoice ); ?></td>
+            <th><?php echo apply_filters('wpinv_invoice_parent_invoice_label', __('Parent Invoice', 'invoicing'), $invoice); ?></th>
+            <td><?php echo wpinv_invoice_link($invoice->parent_invoice); ?></td>
         </tr>
         <?php } ?>
-        <?php if ( ( $gateway_name = wpinv_get_payment_gateway_name( $invoice_id ) ) && ( $invoice->is_paid() || $invoice->is_refunded() ) ) { ?>
+        <?php if (($gateway_name = wpinv_get_payment_gateway_name($invoice_id)) && ($invoice->is_paid() || $invoice->is_refunded())) { ?>
             <tr class="wpi-row-gateway">
-                <th><?php echo apply_filters( 'wpinv_invoice_payment_method_label', __( 'Payment Method', 'invoicing' ), $invoice ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_payment_method_label', __('Payment Method', 'invoicing'), $invoice); ?></th>
                 <td><?php echo $gateway_name; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $invoice_date = wpinv_get_invoice_date( $invoice_id ) ) { ?>
+        <?php if ($invoice_date = wpinv_get_invoice_date($invoice_id)) { ?>
             <tr class="wpi-row-date">
-                <th><?php echo apply_filters( 'wpinv_invoice_date_label', __( 'Invoice Date', 'invoicing' ), $invoice ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_date_label', __('Invoice Date', 'invoicing'), $invoice); ?></th>
                 <td><?php echo $invoice_date; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && $invoice->needs_payment() && ( $due_date = $invoice->get_due_date( true ) ) ) { ?>
+        <?php if (wpinv_get_option('overdue_active') && $invoice->needs_payment() && ($due_date = $invoice->get_due_date(true))) { ?>
             <tr class="wpi-row-date">
-                <th><?php echo apply_filters( 'wpinv_invoice_due_date_label', __( 'Due Date', 'invoicing' ), $invoice ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_due_date_label', __('Due Date', 'invoicing'), $invoice); ?></th>
                 <td><?php echo $due_date; ?></td>
             </tr>
         <?php } ?>
-        <?php do_action( 'wpinv_display_details_before_due_date', $invoice_id ); ?>
-        <?php if ( $owner_vat_number = $wpinv_euvat->get_vat_number() ) { ?>
+        <?php do_action('wpinv_display_details_before_due_date', $invoice_id); ?>
+        <?php if ($owner_vat_number = $wpinv_euvat->get_vat_number()) { ?>
             <tr class="wpi-row-ovatno">
-                <th><?php echo apply_filters( 'wpinv_invoice_owner_vat_number_label', wp_sprintf( __( 'Owner %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_owner_vat_number_label', wp_sprintf(__('Owner %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></th>
                 <td><?php echo $owner_vat_number; ?></td>
             </tr>
         <?php } ?>
-        <?php do_action( 'wpinv_display_details_after_due_date', $invoice_id ); ?>
-        <?php if ( $use_taxes && ( $user_vat_number = wpinv_get_invoice_vat_number( $invoice_id ) ) ) { ?>
+        <?php do_action('wpinv_display_details_after_due_date', $invoice_id); ?>
+        <?php if ($use_taxes && ($user_vat_number = wpinv_get_invoice_vat_number($invoice_id))) { ?>
             <tr class="wpi-row-uvatno">
-                <th><?php echo apply_filters( 'wpinv_invoice_user_vat_number_label', wp_sprintf( __( 'Invoice %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></th>
+                <th><?php echo apply_filters('wpinv_invoice_user_vat_number_label', wp_sprintf(__('Invoice %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></th>
                 <td><?php echo $user_vat_number; ?></td>
             </tr>
         <?php } ?>
         <tr class="table-active tr-total wpi-row-total">
-            <th><strong><?php _e( 'Total Amount', 'invoicing' ) ?></strong></th>
-            <td><strong><?php echo wpinv_payment_total( $invoice_id, true ); ?></strong></td>
+            <th><strong><?php _e('Total Amount', 'invoicing') ?></strong></th>
+            <td><strong><?php echo wpinv_payment_total($invoice_id, true); ?></strong></td>
         </tr>
     </table>
 <?php
@@ -936,84 +936,84 @@ 
  * @param  string $separator How to separate address lines.
  * @return string
  */
-function wpinv_get_invoice_address_markup( $billing_details, $separator = '<br/>' ) {
+function wpinv_get_invoice_address_markup($billing_details, $separator = '<br/>') {
 
     // Retrieve the address markup...
-    $country= empty( $billing_details['country'] ) ? '' : $billing_details['country'];
-    $format = wpinv_get_full_address_format( $country );
+    $country = empty($billing_details['country']) ? '' : $billing_details['country'];
+    $format = wpinv_get_full_address_format($country);
 
     // ... and the replacements.
-    $replacements = wpinv_get_invoice_address_replacements( $billing_details );
+    $replacements = wpinv_get_invoice_address_replacements($billing_details);
 
-    $formatted_address = str_ireplace( array_keys( $replacements ), $replacements, $format );
+    $formatted_address = str_ireplace(array_keys($replacements), $replacements, $format);
     
 	// Remove unavailable tags.
-    $formatted_address = preg_replace( "/\{\{\w+\}\}/", '', $formatted_address );
+    $formatted_address = preg_replace("/\{\{\w+\}\}/", '', $formatted_address);
 
     // Clean up white space.
-	$formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
-    $formatted_address = preg_replace( '/\n\n+/', "\n", $formatted_address );
+	$formatted_address = preg_replace('/  +/', ' ', trim($formatted_address));
+    $formatted_address = preg_replace('/\n\n+/', "\n", $formatted_address);
     
     // Break newlines apart and remove empty lines/trim commas and white space.
-	$formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
+	$formatted_address = array_filter(array_map('wpinv_trim_formatted_address_line', explode("\n", $formatted_address)));
 
     // Add html breaks.
-	$formatted_address = implode( $separator, $formatted_address );
+	$formatted_address = implode($separator, $formatted_address);
 
 	// We're done!
 	return $formatted_address;
     
 }
 
-function wpinv_display_to_address( $invoice_id = 0 ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_display_to_address($invoice_id = 0) {
+    $invoice = wpinv_get_invoice($invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $billing_details = $invoice->get_user_info();
-    $output = '<div class="to col-xs-2"><strong>' . __( 'To:', 'invoicing' ) . '</strong></div>';
+    $output = '<div class="to col-xs-2"><strong>' . __('To:', 'invoicing') . '</strong></div>';
     $output .= '<div class="wrapper col-xs-10">';
     
     ob_start();
-    do_action( 'wpinv_display_to_address_top', $invoice );
+    do_action('wpinv_display_to_address_top', $invoice);
     $output .= ob_get_clean();
     
-    $address_row = wpinv_get_invoice_address_markup( $billing_details );
+    $address_row = wpinv_get_invoice_address_markup($billing_details);
 
-    if ( $address_row ) {
+    if ($address_row) {
         $output .= '<div class="address">' . $address_row . '</div>';
     }
 
-    if ( $phone = $invoice->get_phone() ) {
-        $output .= '<div class="phone">' . wp_sprintf( __( 'Phone: %s', 'invoicing' ), esc_html( $phone ) ) . '</div>';
+    if ($phone = $invoice->get_phone()) {
+        $output .= '<div class="phone">' . wp_sprintf(__('Phone: %s', 'invoicing'), esc_html($phone)) . '</div>';
     }
-    if ( $email = $invoice->get_email() ) {
-        $output .= '<div class="email">' . wp_sprintf( __( 'Email: %s' , 'invoicing'), esc_html( $email ) ) . '</div>';
+    if ($email = $invoice->get_email()) {
+        $output .= '<div class="email">' . wp_sprintf(__('Email: %s', 'invoicing'), esc_html($email)) . '</div>';
     }
 
     ob_start();
-    do_action( 'wpinv_display_to_address_bottom', $invoice );
+    do_action('wpinv_display_to_address_bottom', $invoice);
     $output .= ob_get_clean();
     
     $output .= '</div>';
-    $output = apply_filters( 'wpinv_display_to_address', $output, $invoice );
+    $output = apply_filters('wpinv_display_to_address', $output, $invoice);
 
     echo $output;
 }
 
-function wpinv_display_line_items( $invoice_id = 0 ) {
+function wpinv_display_line_items($invoice_id = 0) {
     global $wpinv_euvat, $ajax_cart_details;
-    $invoice            = wpinv_get_invoice( $invoice_id );
+    $invoice            = wpinv_get_invoice($invoice_id);
     $quantities_enabled = wpinv_item_quantities_enabled();
     $use_taxes          = wpinv_use_taxes();
-    if ( !$use_taxes && (float)$invoice->get_tax() > 0 ) {
+    if (!$use_taxes && (float) $invoice->get_tax() > 0) {
         $use_taxes = true;
     }
-    $zero_tax           = !(float)$invoice->get_tax() > 0 ? true : false;
-    $tax_label           = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __( 'Tax', 'invoicing' );
-    $tax_title          = !$zero_tax && $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+    $zero_tax           = !(float) $invoice->get_tax() > 0 ? true : false;
+    $tax_label = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __('Tax', 'invoicing');
+    $tax_title          = !$zero_tax && $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
 
     $cart_details       = $invoice->get_cart_details();
     $ajax_cart_details  = $cart_details;
@@ -1022,67 +1022,67 @@ 
     <table class="table table-sm table-bordered table-responsive">
         <thead>
             <tr>
-                <th class="name"><strong><?php _e( "Item Name", "invoicing" );?></strong></th>
-                <th class="rate"><strong><?php _e( "Price", "invoicing" );?></strong></th>
+                <th class="name"><strong><?php _e("Item Name", "invoicing"); ?></strong></th>
+                <th class="rate"><strong><?php _e("Price", "invoicing"); ?></strong></th>
                 <?php if ($quantities_enabled) { ?>
-                    <th class="qty"><strong><?php _e( "Qty", "invoicing" );?></strong></th>
+                    <th class="qty"><strong><?php _e("Qty", "invoicing"); ?></strong></th>
                 <?php } ?>
                 <?php if ($use_taxes && !$zero_tax) { ?>
                     <th class="tax"><strong><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></strong></th>
                 <?php } ?>
-                <th class="total"><strong><?php echo __( "Item Total", "invoicing" ) . ' <span class="normal small">' . $tax_title . '<span>';?></strong></th>
+                <th class="total"><strong><?php echo __("Item Total", "invoicing") . ' <span class="normal small">' . $tax_title . '<span>'; ?></strong></th>
             </tr>
         </thead>
         <tbody>
         <?php 
-            if ( !empty( $cart_details ) ) {
-                do_action( 'wpinv_display_line_items_start', $invoice );
+            if (!empty($cart_details)) {
+                do_action('wpinv_display_line_items_start', $invoice);
 
                 $count = 0;
                 $cols  = 3;
-                foreach ( $cart_details as $key => $cart_item ) {
-                    $item_id    = !empty($cart_item['id']) ? absint( $cart_item['id'] ) : '';
-                    $item_price = isset($cart_item["item_price"]) ? wpinv_round_amount( $cart_item["item_price"] ) : 0;
-                    $line_total = isset($cart_item["subtotal"]) ? wpinv_round_amount( $cart_item["subtotal"] ) : 0;
-                    $quantity   = !empty($cart_item['quantity']) && (int)$cart_item['quantity'] > 0 ? absint( $cart_item['quantity'] ) : 1;
+                foreach ($cart_details as $key => $cart_item) {
+                    $item_id    = !empty($cart_item['id']) ? absint($cart_item['id']) : '';
+                    $item_price = isset($cart_item["item_price"]) ? wpinv_round_amount($cart_item["item_price"]) : 0;
+                    $line_total = isset($cart_item["subtotal"]) ? wpinv_round_amount($cart_item["subtotal"]) : 0;
+                    $quantity   = !empty($cart_item['quantity']) && (int) $cart_item['quantity'] > 0 ? absint($cart_item['quantity']) : 1;
 
-                    $item       = $item_id ? new WPInv_Item( $item_id ) : NULL;
+                    $item       = $item_id ? new WPInv_Item($item_id) : NULL;
                     $summary    = '';
-	                $item_name    = '';
+	                $item_name = '';
                     $cols       = 3;
-                    if ( !empty($item) ) {
+                    if (!empty($item)) {
                         $item_name  = $item->get_name();
                         $summary    = $item->get_summary();
                     }
-                    $item_name  = !empty($cart_item['name']) ? $cart_item['name'] : $item_name;
+                    $item_name = !empty($cart_item['name']) ? $cart_item['name'] : $item_name;
 
-                    $summary = apply_filters( 'wpinv_print_invoice_line_item_summary', $summary, $cart_item, $item, $invoice );
+                    $summary = apply_filters('wpinv_print_invoice_line_item_summary', $summary, $cart_item, $item, $invoice);
 
                     $item_tax       = '';
                     $tax_rate       = '';
-                    if ( $use_taxes && $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0 ) {
-                        $item_tax = wpinv_price( wpinv_format_amount( $cart_item['tax'] ), $invoice->get_currency() );
-                        $tax_rate = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : ( $cart_item['tax'] / $cart_item['subtotal'] ) * 100;
-                        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+                    if ($use_taxes && $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0) {
+                        $item_tax = wpinv_price(wpinv_format_amount($cart_item['tax']), $invoice->get_currency());
+                        $tax_rate = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : ($cart_item['tax'] / $cart_item['subtotal']) * 100;
+                        $tax_rate = $tax_rate > 0 ? (float) wpinv_round_amount($tax_rate, 4) : '';
                         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate">(' . $tax_rate . '%)</small>' : '';
                     }
 
                     $line_item_tax = $item_tax . $tax_rate;
 
-                    if ( $line_item_tax === '' ) {
+                    if ($line_item_tax === '') {
                         $line_item_tax = 0; // Zero tax
                     }
 
-                    $action = apply_filters( 'wpinv_display_line_item_action', '', $cart_item, $invoice, $cols );
+                    $action = apply_filters('wpinv_display_line_item_action', '', $cart_item, $invoice, $cols);
 
-                    $line_item = '<tr class="row-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . ' wpinv-item">';
-                        $line_item .= '<td class="name">' . $action. esc_html__( $item_name, 'invoicing' ) . wpinv_get_item_suffix( $item );
-                        if ( $summary !== '' ) {
-                            $line_item .= '<br/><small class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</small>';
+                    $line_item = '<tr class="row-' . (($count % 2 == 0) ? 'even' : 'odd') . ' wpinv-item">';
+                        $line_item .= '<td class="name">' . $action . esc_html__($item_name, 'invoicing') . wpinv_get_item_suffix($item);
+                        if ($summary !== '') {
+                            $line_item .= '<br/><small class="meta">' . wpautop(wp_kses_post($summary)) . '</small>';
                         }
                         $line_item .= '</td>';
 
-                        $line_item .= '<td class="rate">' . esc_html__( wpinv_price( wpinv_format_amount( $item_price ), $invoice->get_currency() ) ) . '</td>';
+                        $line_item .= '<td class="rate">' . esc_html__(wpinv_price(wpinv_format_amount($item_price), $invoice->get_currency())) . '</td>';
                         if ($quantities_enabled) {
                             $cols++;
                             $line_item .= '<td class="qty">' . $quantity . '</td>';
@@ -1091,55 +1091,55 @@ 
                             $cols++;
                             $line_item .= '<td class="tax">' . $line_item_tax . '</td>';
                         }
-                        $line_item .= '<td class="total">' . esc_html__( wpinv_price( wpinv_format_amount( $line_total ), $invoice->get_currency() ) ) . '</td>';
+                        $line_item .= '<td class="total">' . esc_html__(wpinv_price(wpinv_format_amount($line_total), $invoice->get_currency())) . '</td>';
                     $line_item .= '</tr>';
 
-                    echo apply_filters( 'wpinv_display_line_item', $line_item, $cart_item, $invoice, $cols );
+                    echo apply_filters('wpinv_display_line_item', $line_item, $cart_item, $invoice, $cols);
 
                     $count++;
                 }
 
-                do_action( 'wpinv_display_before_subtotal', $invoice, $cols );
+                do_action('wpinv_display_before_subtotal', $invoice, $cols);
                 ?>
                 <tr class="row-sub-total row_odd">
-                    <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_subtotal_label', '<strong>' . __( 'Sub Total', 'invoicing' ) . ':</strong>', $invoice ); ?></td>
-                    <td class="total"><strong><?php _e( wpinv_subtotal( $invoice_id, true ) ) ?></strong></td>
+                    <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_subtotal_label', '<strong>' . __('Sub Total', 'invoicing') . ':</strong>', $invoice); ?></td>
+                    <td class="total"><strong><?php _e(wpinv_subtotal($invoice_id, true)) ?></strong></td>
                 </tr>
                 <?php
-                do_action( 'wpinv_display_after_subtotal', $invoice, $cols );
+                do_action('wpinv_display_after_subtotal', $invoice, $cols);
                 
-                if ( wpinv_discount( $invoice_id, false ) > 0 ) {
-                    do_action( 'wpinv_display_before_discount', $invoice, $cols );
+                if (wpinv_discount($invoice_id, false) > 0) {
+                    do_action('wpinv_display_before_discount', $invoice, $cols);
                     ?>
                         <tr class="row-discount">
-                            <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?>:</td>
-                            <td class="total"><?php echo wpinv_discount( $invoice_id, true, true ); ?></td>
+                            <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?>:</td>
+                            <td class="total"><?php echo wpinv_discount($invoice_id, true, true); ?></td>
                         </tr>
                     <?php
-                    do_action( 'wpinv_display_after_discount', $invoice, $cols );
+                    do_action('wpinv_display_after_discount', $invoice, $cols);
                 }
 
-                if ( $use_taxes ) {
-                    do_action( 'wpinv_display_before_tax', $invoice, $cols );
+                if ($use_taxes) {
+                    do_action('wpinv_display_before_tax', $invoice, $cols);
                     ?>
                     <tr class="row-tax">
-                        <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_tax_label', '<strong>' . $tax_label . ':</strong>', $invoice ); ?></td>
-                        <td class="total"><?php _e( wpinv_tax( $invoice_id, true ) ) ?></td>
+                        <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_tax_label', '<strong>' . $tax_label . ':</strong>', $invoice); ?></td>
+                        <td class="total"><?php _e(wpinv_tax($invoice_id, true)) ?></td>
                     </tr>
                     <?php
-                    do_action( 'wpinv_display_after_tax', $invoice, $cols );
+                    do_action('wpinv_display_after_tax', $invoice, $cols);
                 }
 
-                do_action( 'wpinv_display_before_total', $invoice, $cols );
+                do_action('wpinv_display_before_total', $invoice, $cols);
                 ?>
                 <tr class="table-active row-total">
-                    <td class="rate" colspan="<?php echo ( $cols - 1 ); ?>"><?php echo apply_filters( 'wpinv_print_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?></td>
-                    <td class="total"><strong><?php _e( wpinv_payment_total( $invoice_id, true ) ) ?></strong></td>
+                    <td class="rate" colspan="<?php echo ($cols - 1); ?>"><?php echo apply_filters('wpinv_print_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?></td>
+                    <td class="total"><strong><?php _e(wpinv_payment_total($invoice_id, true)) ?></strong></td>
                 </tr>
                 <?php
-                do_action( 'wpinv_display_after_total', $invoice, $cols );
+                do_action('wpinv_display_after_total', $invoice, $cols);
 
-                do_action( 'wpinv_display_line_end', $invoice, $cols );
+                do_action('wpinv_display_line_end', $invoice, $cols);
             }
         ?>
         </tbody>
@@ -1148,35 +1148,35 @@ 
     echo ob_get_clean();
 }
 
-function wpinv_display_invoice_totals( $invoice_id = 0 ) {
+function wpinv_display_invoice_totals($invoice_id = 0) {
     $use_taxes = wpinv_use_taxes();
 
-    do_action( 'wpinv_before_display_totals_table', $invoice_id ); 
+    do_action('wpinv_before_display_totals_table', $invoice_id); 
     ?>
     <table class="table table-sm table-bordered table-responsive">
         <tbody>
-            <?php do_action( 'wpinv_before_display_totals' ); ?>
+            <?php do_action('wpinv_before_display_totals'); ?>
             <tr class="row-sub-total">
-                <td class="rate"><strong><?php _e( 'Sub Total', 'invoicing' ); ?></strong></td>
-                <td class="total"><strong><?php _e( wpinv_subtotal( $invoice_id, true ) ) ?></strong></td>
+                <td class="rate"><strong><?php _e('Sub Total', 'invoicing'); ?></strong></td>
+                <td class="total"><strong><?php _e(wpinv_subtotal($invoice_id, true)) ?></strong></td>
             </tr>
-            <?php do_action( 'wpinv_after_display_totals' ); ?>
-            <?php if ( wpinv_discount( $invoice_id, false ) > 0 ) { ?>
+            <?php do_action('wpinv_after_display_totals'); ?>
+            <?php if (wpinv_discount($invoice_id, false) > 0) { ?>
                 <tr class="row-discount">
-                    <td class="rate"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?></td>
-                    <td class="total"><?php echo wpinv_discount( $invoice_id, true, true ); ?></td>
+                    <td class="rate"><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?></td>
+                    <td class="total"><?php echo wpinv_discount($invoice_id, true, true); ?></td>
                 </tr>
-            <?php do_action( 'wpinv_after_display_discount' ); ?>
+            <?php do_action('wpinv_after_display_discount'); ?>
             <?php } ?>
-            <?php if ( $use_taxes ) { ?>
+            <?php if ($use_taxes) { ?>
             <tr class="row-tax">
-                <td class="rate"><?php _e( 'Tax', 'invoicing' ); ?></td>
-                <td class="total"><?php _e( wpinv_tax( $invoice_id, true ) ) ?></td>
+                <td class="rate"><?php _e('Tax', 'invoicing'); ?></td>
+                <td class="total"><?php _e(wpinv_tax($invoice_id, true)) ?></td>
             </tr>
-            <?php do_action( 'wpinv_after_display_tax' ); ?>
+            <?php do_action('wpinv_after_display_tax'); ?>
             <?php } ?>
-            <?php if ( $fees = wpinv_get_fees( $invoice_id ) ) { ?>
-                <?php foreach ( $fees as $fee ) { ?>
+            <?php if ($fees = wpinv_get_fees($invoice_id)) { ?>
+                <?php foreach ($fees as $fee) { ?>
                     <tr class="row-fee">
                         <td class="rate"><?php echo $fee['label']; ?></td>
                         <td class="total"><?php echo $fee['amount_display']; ?></td>
@@ -1184,82 +1184,82 @@ 
                 <?php } ?>
             <?php } ?>
             <tr class="table-active row-total">
-                <td class="rate"><strong><?php _e( 'Total', 'invoicing' ) ?></strong></td>
-                <td class="total"><strong><?php _e( wpinv_payment_total( $invoice_id, true ) ) ?></strong></td>
+                <td class="rate"><strong><?php _e('Total', 'invoicing') ?></strong></td>
+                <td class="total"><strong><?php _e(wpinv_payment_total($invoice_id, true)) ?></strong></td>
             </tr>
-            <?php do_action( 'wpinv_after_totals' ); ?>
+            <?php do_action('wpinv_after_totals'); ?>
         </tbody>
 
     </table>
 
-    <?php do_action( 'wpinv_after_totals_table' );
+    <?php do_action('wpinv_after_totals_table');
 }
 
-function wpinv_display_payments_info( $invoice_id = 0, $echo = true ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_display_payments_info($invoice_id = 0, $echo = true) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
     ob_start();
-    do_action( 'wpinv_before_display_payments_info', $invoice_id );
-    if ( ( $gateway_title = $invoice->get_gateway_title() ) || $invoice->is_paid() || $invoice->is_refunded() ) {
+    do_action('wpinv_before_display_payments_info', $invoice_id);
+    if (($gateway_title = $invoice->get_gateway_title()) || $invoice->is_paid() || $invoice->is_refunded()) {
         ?>
         <div class="wpi-payment-info">
-            <p class="wpi-payment-gateway"><?php echo wp_sprintf( __( 'Payment via %s', 'invoicing' ), $gateway_title ? $gateway_title : __( 'Manually', 'invoicing' ) ); ?></p>
-            <?php if ( $gateway_title ) { ?>
-            <p class="wpi-payment-transid"><?php echo wp_sprintf( __( 'Transaction ID: %s', 'invoicing' ), $invoice->get_transaction_id() ); ?></p>
+            <p class="wpi-payment-gateway"><?php echo wp_sprintf(__('Payment via %s', 'invoicing'), $gateway_title ? $gateway_title : __('Manually', 'invoicing')); ?></p>
+            <?php if ($gateway_title) { ?>
+            <p class="wpi-payment-transid"><?php echo wp_sprintf(__('Transaction ID: %s', 'invoicing'), $invoice->get_transaction_id()); ?></p>
             <?php } ?>
         </div>
         <?php
     }
-    do_action( 'wpinv_after_display_payments_info', $invoice_id );
+    do_action('wpinv_after_display_payments_info', $invoice_id);
     $outout = ob_get_clean();
 
-    if ( $echo ) {
+    if ($echo) {
         echo $outout;
     } else {
         return $outout;
     }
 }
 
-function wpinv_display_style( $invoice ) {
-    wp_register_style( 'wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), WPINV_VERSION );
+function wpinv_display_style($invoice) {
+    wp_register_style('wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), WPINV_VERSION);
 
-    wp_print_styles( 'open-sans' );
-    wp_print_styles( 'wpinv-single-style' );
+    wp_print_styles('open-sans');
+    wp_print_styles('wpinv-single-style');
 
     $custom_css = wpinv_get_option('template_custom_css');
-    if(isset($custom_css) && !empty($custom_css)){
-        $custom_css     = wp_kses( $custom_css, array( '\'', '\"' ) );
-        $custom_css     = str_replace( '&gt;', '>', $custom_css );
+    if (isset($custom_css) && !empty($custom_css)) {
+        $custom_css     = wp_kses($custom_css, array('\'', '\"'));
+        $custom_css     = str_replace('&gt;', '>', $custom_css);
         echo '<style type="text/css">';
         echo $custom_css;
         echo '</style>';
     }
 }
-add_action( 'wpinv_invoice_print_head', 'wpinv_display_style' );
-add_action( 'wpinv_invalid_invoice_head', 'wpinv_display_style' );
+add_action('wpinv_invoice_print_head', 'wpinv_display_style');
+add_action('wpinv_invalid_invoice_head', 'wpinv_display_style');
 
 function wpinv_checkout_billing_details() {
-    $invoice_id = (int)wpinv_get_invoice_cart_id();
+    $invoice_id = (int) wpinv_get_invoice_cart_id();
     if (empty($invoice_id)) {
-        wpinv_error_log( 'Invoice id not found', 'ERROR', __FILE__, __LINE__ );
+        wpinv_error_log('Invoice id not found', 'ERROR', __FILE__, __LINE__);
         return null;
     }
 
-    $invoice = wpinv_get_invoice_cart( $invoice_id );
+    $invoice = wpinv_get_invoice_cart($invoice_id);
     if (empty($invoice)) {
-        wpinv_error_log( 'Invoice not found', 'ERROR', __FILE__, __LINE__ );
+        wpinv_error_log('Invoice not found', 'ERROR', __FILE__, __LINE__);
         return null;
     }
     $user_id        = $invoice->get_user_id();
     $user_info      = $invoice->get_user_info();
-    $address_info   = wpinv_get_user_address( $user_id );
+    $address_info   = wpinv_get_user_address($user_id);
 
-    if ( empty( $user_info['first_name'] ) && !empty( $user_info['first_name'] ) ) {
+    if (empty($user_info['first_name']) && !empty($user_info['first_name'])) {
         $user_info['first_name'] = $user_info['first_name'];
         $user_info['last_name'] = $user_info['last_name'];
     }
 
-    if ( ( ( empty( $user_info['country'] ) && !empty( $address_info['country'] ) ) || ( empty( $user_info['state'] ) && !empty( $address_info['state'] ) && $user_info['country'] == $address_info['country'] ) ) ) {
+    if (((empty($user_info['country']) && !empty($address_info['country'])) || (empty($user_info['state']) && !empty($address_info['state']) && $user_info['country'] == $address_info['country']))) {
         $user_info['country']   = $address_info['country'];
         $user_info['state']     = $address_info['state'];
         $user_info['city']      = $address_info['city'];
@@ -1275,98 +1275,98 @@ 
         'address'
     );
 
-    foreach ( $address_fields as $field ) {
-        if ( empty( $user_info[$field] ) ) {
+    foreach ($address_fields as $field) {
+        if (empty($user_info[$field])) {
             $user_info[$field] = $address_info[$field];
         }
     }
 
-    return apply_filters( 'wpinv_checkout_billing_details', $user_info, $invoice );
+    return apply_filters('wpinv_checkout_billing_details', $user_info, $invoice);
 }
 
 function wpinv_admin_get_line_items($invoice = array()) {
     $item_quantities    = wpinv_item_quantities_enabled();
     $use_taxes          = wpinv_use_taxes();
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
 
     $cart_items = $invoice->get_cart_details();
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return NULL;
     }
     ob_start();
 
-    do_action( 'wpinv_admin_before_line_items', $cart_items, $invoice );
+    do_action('wpinv_admin_before_line_items', $cart_items, $invoice);
 
     $count = 0;
-    foreach ( $cart_items as $key => $cart_item ) {
+    foreach ($cart_items as $key => $cart_item) {
         $item_id    = $cart_item['id'];
-        $wpi_item   = $item_id > 0 ? new WPInv_Item( $item_id ) : NULL;
+        $wpi_item   = $item_id > 0 ? new WPInv_Item($item_id) : NULL;
 
         if (empty($wpi_item)) {
             continue;
         }
 
-        $item_price     = wpinv_price( wpinv_format_amount( $cart_item['item_price'] ), $invoice->get_currency() );
-        $quantity       = !empty( $cart_item['quantity'] ) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
-        $item_subtotal  = wpinv_price( wpinv_format_amount( $cart_item['subtotal'] ), $invoice->get_currency() );
+        $item_price     = wpinv_price(wpinv_format_amount($cart_item['item_price']), $invoice->get_currency());
+        $quantity       = !empty($cart_item['quantity']) && $cart_item['quantity'] > 0 ? $cart_item['quantity'] : 1;
+        $item_subtotal  = wpinv_price(wpinv_format_amount($cart_item['subtotal']), $invoice->get_currency());
         $can_remove     = true;
 
-        $summary = apply_filters( 'wpinv_admin_invoice_line_item_summary', '', $cart_item, $wpi_item, $invoice );
+        $summary = apply_filters('wpinv_admin_invoice_line_item_summary', '', $cart_item, $wpi_item, $invoice);
 
         $item_tax       = '';
         $tax_rate       = '';
-        if ( $cart_item['tax'] > 0 && $cart_item['subtotal'] > 0 ) {
-            $item_tax = wpinv_price( wpinv_format_amount( $cart_item['tax'] ), $invoice->get_currency() );
-            $tax_rate = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : ( $cart_item['tax'] / $cart_item['subtotal'] ) * 100;
-            $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+        if ($cart_item['tax'] > 0 && $cart_item['subtotal'] > 0) {
+            $item_tax = wpinv_price(wpinv_format_amount($cart_item['tax']), $invoice->get_currency());
+            $tax_rate = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : ($cart_item['tax'] / $cart_item['subtotal']) * 100;
+            $tax_rate = $tax_rate > 0 ? (float) wpinv_round_amount($tax_rate, 4) : '';
             $tax_rate = $tax_rate != '' ? ' <span class="tax-rate">(' . $tax_rate . '%)</span>' : '';
         }
         $line_item_tax = $item_tax . $tax_rate;
 
-        if ( $line_item_tax === '' ) {
+        if ($line_item_tax === '') {
             $line_item_tax = 0; // Zero tax
         }
 
-        $line_item = '<tr class="item item-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . '" data-item-id="' . $item_id . '">';
+        $line_item = '<tr class="item item-' . (($count % 2 == 0) ? 'even' : 'odd') . '" data-item-id="' . $item_id . '">';
             $line_item .= '<td class="id">' . $item_id . '</td>';
-            $line_item .= '<td class="title"><a href="' . get_edit_post_link( $item_id ) . '" target="_blank">' . $cart_item['name'] . '</a>' . wpinv_get_item_suffix( $wpi_item );
-            if ( $summary !== '' ) {
-                $line_item .= '<span class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</span>';
+            $line_item .= '<td class="title"><a href="' . get_edit_post_link($item_id) . '" target="_blank">' . $cart_item['name'] . '</a>' . wpinv_get_item_suffix($wpi_item);
+            if ($summary !== '') {
+                $line_item .= '<span class="meta">' . wpautop(wp_kses_post($summary)) . '</span>';
             }
             $line_item .= '</td>';
             $line_item .= '<td class="price">' . $item_price . '</td>';
             
-            if ( $item_quantities ) {
-                if ( count( $cart_items ) == 1 && $quantity <= 1 ) {
+            if ($item_quantities) {
+                if (count($cart_items) == 1 && $quantity <= 1) {
                     $can_remove = false;
                 }
                 $line_item .= '<td class="qty" data-quantity="' . $quantity . '">&nbsp;&times;&nbsp;' . $quantity . '</td>';
             } else {
-                if ( count( $cart_items ) == 1 ) {
+                if (count($cart_items) == 1) {
                     $can_remove = false;
                 }
             }
             $line_item .= '<td class="total">' . $item_subtotal . '</td>';
             
-            if ( $use_taxes ) {
+            if ($use_taxes) {
                 $line_item .= '<td class="tax">' . $line_item_tax . '</td>';
             }
             $line_item .= '<td class="action">';
-            if ( !$invoice->is_paid() && !$invoice->is_refunded() ) {
+            if (!$invoice->is_paid() && !$invoice->is_refunded()) {
                 $line_item .= '<i class="fa fa-remove wpinv-item-remove"></i>';
             }
             $line_item .= '</td>';
         $line_item .= '</tr>';
 
-        echo apply_filters( 'wpinv_admin_line_item', $line_item, $cart_item, $invoice );
+        echo apply_filters('wpinv_admin_line_item', $line_item, $cart_item, $invoice);
 
         $count++;
     } 
 
-    do_action( 'wpinv_admin_after_line_items', $cart_items, $invoice );
+    do_action('wpinv_admin_after_line_items', $cart_items, $invoice);
 
     return ob_get_clean();
 }
@@ -1378,32 +1378,32 @@ 
     $wpi_checkout_id = wpinv_get_invoice_cart_id();
 
     //Maybe update the prices
-    if(! empty( $_GET['wpi_dynamic_item'] ) && ! empty( $_GET['wpi_dynamic_price'] ) ) {
+    if (!empty($_GET['wpi_dynamic_item']) && !empty($_GET['wpi_dynamic_price'])) {
 
         //If the invoice exists, update it with new pricing details
-        if (! empty( $wpi_checkout_id ) ) {
+        if (!empty($wpi_checkout_id)) {
 
             $_invoice       = wpinv_get_invoice_cart();
             $_cart_details  = $_invoice->get_cart_details();
-            $_dynamic_item  = sanitize_text_field( $_GET['wpi_dynamic_item'] );
+            $_dynamic_item  = sanitize_text_field($_GET['wpi_dynamic_item']);
 
             //First, fetch the item
-            $item    = new WPInv_Item( $_dynamic_item );
+            $item = new WPInv_Item($_dynamic_item);
     
             //Next, ensure it supports dynamic pricing...
-            if( $item->supports_dynamic_pricing() && $item->get_is_dynamic_pricing() ) {
+            if ($item->supports_dynamic_pricing() && $item->get_is_dynamic_pricing()) {
                 
                 //... and that the new price is not lower than the minimum price
-                $_dynamic_price = (float) wpinv_sanitize_amount( sanitize_text_field( $_GET['wpi_dynamic_price'] ) );
-                if( $_dynamic_price < $item->get_minimum_price() ) {
+                $_dynamic_price = (float) wpinv_sanitize_amount(sanitize_text_field($_GET['wpi_dynamic_price']));
+                if ($_dynamic_price < $item->get_minimum_price()) {
                     $_dynamic_price = $item->get_minimum_price();
                 }
 
                 //Finally, update our invoice with the new price
-                if ( !empty( $_cart_details ) ) {
+                if (!empty($_cart_details)) {
 
-                    foreach ( $_cart_details as $key => $item ) {
-                        if ( !empty( $item['id'] ) && $_dynamic_item == $item['id'] ) {
+                    foreach ($_cart_details as $key => $item) {
+                        if (!empty($item['id']) && $_dynamic_item == $item['id']) {
                             $_cart_details[$key]['custom_price'] = $_dynamic_price;
                             $_cart_details[$key]['item_price']   = $_dynamic_price;
                         }
@@ -1411,8 +1411,8 @@ 
 
                     $_meta = $_invoice->get_meta();
                     $_meta['cart_details'] = $_cart_details;
-                    $_invoice->set( 'payment_meta', $_meta );
-                    $_invoice->set( 'cart_details', $_cart_details );
+                    $_invoice->set('payment_meta', $_meta);
+                    $_invoice->set('cart_details', $_cart_details);
                     $_invoice->recalculate_totals();
 
                 }
@@ -1423,60 +1423,60 @@ 
 
     }
 
-    $form_action  = esc_url( wpinv_get_checkout_uri() );
+    $form_action = esc_url(wpinv_get_checkout_uri());
 
     ob_start();
-	    do_action( 'wpinv_checkout_content_before' );
+	    do_action('wpinv_checkout_content_before');
         echo '<div id="wpinv_checkout_wrap">';
 
-        if ( wpinv_get_cart_contents() || wpinv_cart_has_fees() ) {
+        if (wpinv_get_cart_contents() || wpinv_cart_has_fees()) {
             ?>
             <div id="wpinv_checkout_form_wrap" class="wpinv_clearfix table-responsive">
-                <?php do_action( 'wpinv_before_checkout_form' ); ?>
+                <?php do_action('wpinv_before_checkout_form'); ?>
                 <form id="wpinv_checkout_form" class="wpi-form" action="<?php echo $form_action; ?>" method="POST">
                     <?php
-                    do_action( 'wpinv_checkout_form_top' );
-                    do_action( 'wpinv_checkout_billing_info' );
-                    do_action( 'wpinv_checkout_cart' );
-                    do_action( 'wpinv_payment_mode_select'  );
-                    do_action( 'wpinv_checkout_form_bottom' )
+                    do_action('wpinv_checkout_form_top');
+                    do_action('wpinv_checkout_billing_info');
+                    do_action('wpinv_checkout_cart');
+                    do_action('wpinv_payment_mode_select');
+                    do_action('wpinv_checkout_form_bottom')
                     ?>
                 </form>
-                <?php do_action( 'wpinv_after_purchase_form' ); ?>
+                <?php do_action('wpinv_after_purchase_form'); ?>
             </div><!--end #wpinv_checkout_form_wrap-->
         <?php
         } else {
-            do_action( 'wpinv_cart_empty' );
+            do_action('wpinv_cart_empty');
         }
         echo '</div><!--end #wpinv_checkout_wrap-->';
-	    do_action( 'wpinv_checkout_content_after' );
+	    do_action('wpinv_checkout_content_after');
     return ob_get_clean();
 }
 
-function wpinv_checkout_cart( $cart_details = array(), $echo = true ) {
+function wpinv_checkout_cart($cart_details = array(), $echo = true) {
     global $ajax_cart_details;
     $ajax_cart_details = $cart_details;
 
     ob_start();
-    do_action( 'wpinv_before_checkout_cart' );
+    do_action('wpinv_before_checkout_cart');
     echo '<div id="wpinv_checkout_cart_form" method="post">';
         echo '<div id="wpinv_checkout_cart_wrap">';
-            wpinv_get_template_part( 'wpinv-checkout-cart' );
+            wpinv_get_template_part('wpinv-checkout-cart');
         echo '</div>';
     echo '</div>';
-    do_action( 'wpinv_after_checkout_cart' );
+    do_action('wpinv_after_checkout_cart');
     $content = ob_get_clean();
     
-    if ( $echo ) {
+    if ($echo) {
         echo $content;
     } else {
         return $content;
     }
 }
-add_action( 'wpinv_checkout_cart', 'wpinv_checkout_cart', 10 );
+add_action('wpinv_checkout_cart', 'wpinv_checkout_cart', 10);
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+	return apply_filters('wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __('Your cart is empty.', 'invoicing') . '</span>');
 }
 
 /**
@@ -1488,83 +1488,83 @@ 
 function wpinv_empty_checkout_cart() {
 	echo wpinv_empty_cart_message();
 }
-add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
+add_action('wpinv_cart_empty', 'wpinv_empty_checkout_cart');
 
 function wpinv_update_cart_button() {
-    if ( !wpinv_item_quantities_enabled() )
+    if (!wpinv_item_quantities_enabled())
         return;
 ?>
-    <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e( 'Update Cart', 'invoicing' ); ?>"/>
+    <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e('Update Cart', 'invoicing'); ?>"/>
     <input type="hidden" name="wpi_action" value="update_cart"/>
 <?php
 }
 
 function wpinv_checkout_cart_columns() {
     $default = 3;
-    if ( wpinv_item_quantities_enabled() ) {
+    if (wpinv_item_quantities_enabled()) {
         $default++;
     }
     
-    if ( wpinv_use_taxes() ) {
+    if (wpinv_use_taxes()) {
         $default++;
     }
 
-    return apply_filters( 'wpinv_checkout_cart_columns', $default );
+    return apply_filters('wpinv_checkout_cart_columns', $default);
 }
 
 function wpinv_display_cart_messages() {
     global $wpi_session;
 
-    $messages = $wpi_session->get( 'wpinv_cart_messages' );
+    $messages = $wpi_session->get('wpinv_cart_messages');
 
-    if ( $messages ) {
-        foreach ( $messages as $message_id => $message ) {
+    if ($messages) {
+        foreach ($messages as $message_id => $message) {
             // Try and detect what type of message this is
-            if ( strpos( strtolower( $message ), 'error' ) ) {
+            if (strpos(strtolower($message), 'error')) {
                 $type = 'error';
-            } elseif ( strpos( strtolower( $message ), 'success' ) ) {
+            } elseif (strpos(strtolower($message), 'success')) {
                 $type = 'success';
             } else {
                 $type = 'info';
             }
 
-            $classes = apply_filters( 'wpinv_' . $type . '_class', array( 'wpinv_errors', 'wpinv-alert', 'wpinv-alert-' . $type ) );
+            $classes = apply_filters('wpinv_' . $type . '_class', array('wpinv_errors', 'wpinv-alert', 'wpinv-alert-' . $type));
 
-            echo '<div class="' . implode( ' ', $classes ) . '">';
+            echo '<div class="' . implode(' ', $classes) . '">';
                 // Loop message codes and display messages
                     echo '<p class="wpinv_error" id="wpinv_msg_' . $message_id . '">' . $message . '</p>';
             echo '</div>';
         }
 
         // Remove all of the cart saving messages
-        $wpi_session->set( 'wpinv_cart_messages', null );
+        $wpi_session->set('wpinv_cart_messages', null);
     }
 }
-add_action( 'wpinv_before_checkout_cart', 'wpinv_display_cart_messages' );
+add_action('wpinv_before_checkout_cart', 'wpinv_display_cart_messages');
 
 function wpinv_discount_field() {
-    if ( isset( $_GET['wpi-gateway'] ) && wpinv_is_ajax_disabled() ) {
+    if (isset($_GET['wpi-gateway']) && wpinv_is_ajax_disabled()) {
         return; // Only show before a payment method has been selected if ajax is disabled
     }
 
-    if ( !wpinv_is_checkout() ) {
+    if (!wpinv_is_checkout()) {
         return;
     }
 
-    if ( wpinv_has_active_discounts() && wpinv_get_cart_total() ) {
+    if (wpinv_has_active_discounts() && wpinv_get_cart_total()) {
     ?>
     <div id="wpinv-discount-field" class="panel panel-default">
         <div class="panel-body">
             <p>
-                <label class="wpinv-label" for="wpinv_discount_code"><strong><?php _e( 'Discount', 'invoicing' ); ?></strong></label>
-                <span class="wpinv-description"><?php _e( 'Enter a discount code if you have one.', 'invoicing' ); ?></span>
+                <label class="wpinv-label" for="wpinv_discount_code"><strong><?php _e('Discount', 'invoicing'); ?></strong></label>
+                <span class="wpinv-description"><?php _e('Enter a discount code if you have one.', 'invoicing'); ?></span>
             </p>
             <div class="form-group row">
                 <div class="col-sm-4">
-                    <input class="wpinv-input form-control" type="text" id="wpinv_discount_code" name="wpinv_discount_code" placeholder="<?php _e( 'Enter discount code', 'invoicing' ); ?>"/>
+                    <input class="wpinv-input form-control" type="text" id="wpinv_discount_code" name="wpinv_discount_code" placeholder="<?php _e('Enter discount code', 'invoicing'); ?>"/>
                 </div>
                 <div class="col-sm-3">
-                    <button id="wpi-apply-discount" type="button" class="btn btn-success btn-sm"><?php _e( 'Apply Discount', 'invoicing' ); ?></button>
+                    <button id="wpi-apply-discount" type="button" class="btn btn-success btn-sm"><?php _e('Apply Discount', 'invoicing'); ?></button>
                 </div>
                 <div style="clear:both"></div>
                 <div class="col-sm-12 wpinv-discount-msg">
@@ -1577,10 +1577,10 @@ 
 <?php
     }
 }
-add_action( 'wpinv_after_checkout_cart', 'wpinv_discount_field', -10 );
+add_action('wpinv_after_checkout_cart', 'wpinv_discount_field', -10);
 
 function wpinv_agree_to_terms_js() {
-    if ( wpinv_get_option( 'show_agree_to_terms', false ) ) {
+    if (wpinv_get_option('show_agree_to_terms', false)) {
 ?>
 <script type="text/javascript">
     jQuery(document).ready(function($){
@@ -1595,125 +1595,125 @@ 
 <?php
     }
 }
-add_action( 'wpinv_checkout_form_top', 'wpinv_agree_to_terms_js' );
+add_action('wpinv_checkout_form_top', 'wpinv_agree_to_terms_js');
 
 function wpinv_payment_mode_select() {
-    $gateways = wpinv_get_enabled_payment_gateways( true );
-    $gateways = apply_filters( 'wpinv_payment_gateways_on_cart', $gateways );
-    $invoice = wpinv_get_invoice( 0, true );
+    $gateways = wpinv_get_enabled_payment_gateways(true);
+    $gateways = apply_filters('wpinv_payment_gateways_on_cart', $gateways);
+    $invoice = wpinv_get_invoice(0, true);
 
     do_action('wpinv_payment_mode_top');
-    $invoice_id = (int)$invoice->ID;
-    $chosen_gateway = wpinv_get_chosen_gateway( $invoice_id );
+    $invoice_id = (int) $invoice->ID;
+    $chosen_gateway = wpinv_get_chosen_gateway($invoice_id);
     ?>
-    <div id="wpinv_payment_mode_select" data-gateway="<?php echo $chosen_gateway; ?>" <?php echo ( $invoice->is_free() ? 'style="display:none;" data-free="1"' : '' ); ?>>
-            <?php do_action( 'wpinv_payment_mode_before_gateways_wrap' ); ?>
+    <div id="wpinv_payment_mode_select" data-gateway="<?php echo $chosen_gateway; ?>" <?php echo ($invoice->is_free() ? 'style="display:none;" data-free="1"' : ''); ?>>
+            <?php do_action('wpinv_payment_mode_before_gateways_wrap'); ?>
             <div id="wpinv-payment-mode-wrap" class="panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Select Payment Method', 'invoicing' ); ?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php _e('Select Payment Method', 'invoicing'); ?></h3></div>
                 <div class="panel-body list-group wpi-payment_methods">
                     <?php
-                    do_action( 'wpinv_payment_mode_before_gateways' );
-
-                    if ( !empty( $gateways ) ) {
-                        foreach ( $gateways as $gateway_id => $gateway ) {
-                            $checked       = checked( $gateway_id, $chosen_gateway, false );
-                            $button_label  = wpinv_get_gateway_button_label( $gateway_id );
-                            $gateway_label = wpinv_get_gateway_checkout_label( $gateway_id );
-                            $description   = wpinv_get_gateway_description( $gateway_id );
+                    do_action('wpinv_payment_mode_before_gateways');
+
+                    if (!empty($gateways)) {
+                        foreach ($gateways as $gateway_id => $gateway) {
+                            $checked       = checked($gateway_id, $chosen_gateway, false);
+                            $button_label  = wpinv_get_gateway_button_label($gateway_id);
+                            $gateway_label = wpinv_get_gateway_checkout_label($gateway_id);
+                            $description   = wpinv_get_gateway_description($gateway_id);
                             ?>
                             <div class="list-group-item">
                                 <div class="radio">
-                                    <label><input type="radio" data-button-text="<?php echo esc_attr( $button_label );?>" value="<?php echo esc_attr( $gateway_id ) ;?>" <?php echo $checked ;?> id="wpi_gateway_<?php echo esc_attr( $gateway_id );?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html( $gateway_label ); ?></label>
+                                    <label><input type="radio" data-button-text="<?php echo esc_attr($button_label); ?>" value="<?php echo esc_attr($gateway_id); ?>" <?php echo $checked; ?> id="wpi_gateway_<?php echo esc_attr($gateway_id); ?>" name="wpi-gateway" class="wpi-pmethod"><?php echo esc_html($gateway_label); ?></label>
                                 </div>
-                                <div style="display:none;" class="payment_box wpi_gateway_<?php echo esc_attr( $gateway_id );?>" role="alert">
-                                    <?php if ( !empty( $description ) ) { ?>
-                                        <div class="wpi-gateway-desc alert alert-info"><?php _e( $description, 'invoicing' ); ?></div>
+                                <div style="display:none;" class="payment_box wpi_gateway_<?php echo esc_attr($gateway_id); ?>" role="alert">
+                                    <?php if (!empty($description)) { ?>
+                                        <div class="wpi-gateway-desc alert alert-info"><?php _e($description, 'invoicing'); ?></div>
                                     <?php } ?>
-                                    <?php do_action( 'wpinv_' . $gateway_id . '_cc_form', $invoice_id ) ;?>
+                                    <?php do_action('wpinv_' . $gateway_id . '_cc_form', $invoice_id); ?>
                                 </div>
                             </div>
                             <?php
                         }
                     } else {
-                        echo '<div class="alert alert-warning">'. __( 'No payment gateway active', 'invoicing' ) .'</div>';
+                        echo '<div class="alert alert-warning">' . __('No payment gateway active', 'invoicing') . '</div>';
                     }
 
-                    do_action( 'wpinv_payment_mode_after_gateways' );
+                    do_action('wpinv_payment_mode_after_gateways');
                     ?>
                 </div>
             </div>
-            <?php do_action( 'wpinv_payment_mode_after_gateways_wrap' ); ?>
+            <?php do_action('wpinv_payment_mode_after_gateways_wrap'); ?>
     </div>
     <?php
     do_action('wpinv_payment_mode_bottom');
 }
-add_action( 'wpinv_payment_mode_select', 'wpinv_payment_mode_select' );
+add_action('wpinv_payment_mode_select', 'wpinv_payment_mode_select');
 
 function wpinv_checkout_billing_info() {
-    if ( wpinv_is_checkout() ) {
+    if (wpinv_is_checkout()) {
         $billing_details    = wpinv_checkout_billing_details();
-        $selected_country   = !empty( $billing_details['country'] ) ? $billing_details['country'] : wpinv_default_billing_country();
+        $selected_country   = !empty($billing_details['country']) ? $billing_details['country'] : wpinv_default_billing_country();
         ?>
         <div id="wpinv-fields" class="clearfix">
             <div id="wpi-billing" class="wpi-billing clearfix panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Billing Details', 'invoicing' );?></h3></div>
+                <div class="panel-heading"><h3 class="panel-title"><?php _e('Billing Details', 'invoicing'); ?></h3></div>
                 <div id="wpinv-fields-box" class="panel-body">
-                    <?php do_action( 'wpinv_checkout_billing_fields_first', $billing_details ); ?>
+                    <?php do_action('wpinv_checkout_billing_fields_first', $billing_details); ?>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_first_name" class="wpi-label"><?php _e( 'First Name', 'invoicing' );?><?php if ( wpinv_get_option( 'fname_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_first_name" class="wpi-label"><?php _e('First Name', 'invoicing'); ?><?php if (wpinv_get_option('fname_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_first_name',
                                 'name'          => 'wpinv_first_name',
                                 'value'         => $billing_details['first_name'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'First name', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'fname_mandatory' ),
-                            ) );
+                                'placeholder'   => __('First name', 'invoicing'),
+                                'required'      => (bool) wpinv_get_option('fname_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_last_name" class="wpi-label"><?php _e( 'Last Name', 'invoicing' );?><?php if ( wpinv_get_option( 'lname_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_last_name" class="wpi-label"><?php _e('Last Name', 'invoicing'); ?><?php if (wpinv_get_option('lname_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_last_name',
                                 'name'          => 'wpinv_last_name',
                                 'value'         => $billing_details['last_name'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Last name', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'lname_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Last name', 'invoicing'),
+                                'required'      => (bool) wpinv_get_option('lname_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_address" class="wpi-label"><?php _e( 'Address', 'invoicing' );?><?php if ( wpinv_get_option( 'address_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_address" class="wpi-label"><?php _e('Address', 'invoicing'); ?><?php if (wpinv_get_option('address_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_address',
                                 'name'          => 'wpinv_address',
                                 'value'         => $billing_details['address'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Address', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'address_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Address', 'invoicing'),
+                                'required'      => (bool) wpinv_get_option('address_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_city" class="wpi-label"><?php _e( 'City', 'invoicing' );?><?php if ( wpinv_get_option( 'city_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_city" class="wpi-label"><?php _e('City', 'invoicing'); ?><?php if (wpinv_get_option('city_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_city',
                                 'name'          => 'wpinv_city',
                                 'value'         => $billing_details['city'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'City', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'city_mandatory' ),
-                            ) );
+                                'placeholder'   => __('City', 'invoicing'),
+                                'required'      => (bool) wpinv_get_option('city_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p id="wpinv_country_box" class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_country" class="wpi-label"><?php _e( 'Country', 'invoicing' );?><?php if ( wpinv_get_option( 'country_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
-                        <?php echo wpinv_html_select( array(
+                        <label for="wpinv_country" class="wpi-label"><?php _e('Country', 'invoicing'); ?><?php if (wpinv_get_option('country_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <?php echo wpinv_html_select(array(
                             'options'          => wpinv_get_country_list(),
                             'name'             => 'wpinv_country',
                             'id'               => 'wpinv_country',
@@ -1721,16 +1721,16 @@ 
                             'show_option_all'  => false,
                             'show_option_none' => false,
                             'class'            => 'wpi-input form-control wpi_select2',
-                            'placeholder'      => __( 'Choose a country', 'invoicing' ),
-                            'required'         => (bool)wpinv_get_option( 'country_mandatory' ),
-                        ) ); ?>
+                            'placeholder'      => __('Choose a country', 'invoicing'),
+                            'required'         => (bool) wpinv_get_option('country_mandatory'),
+                        )); ?>
                     </p>
                     <p id="wpinv_state_box" class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_state" class="wpi-label"><?php _e( 'State / Province', 'invoicing' );?><?php if ( wpinv_get_option( 'state_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_state" class="wpi-label"><?php _e('State / Province', 'invoicing'); ?><?php if (wpinv_get_option('state_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        $states = wpinv_get_country_states( $selected_country );
-                        if( !empty( $states ) ) {
-                            echo wpinv_html_select( array(
+                        $states = wpinv_get_country_states($selected_country);
+                        if (!empty($states)) {
+                            echo wpinv_html_select(array(
                                 'options'          => $states,
                                 'name'             => 'wpinv_state',
                                 'id'               => 'wpinv_state',
@@ -1738,61 +1738,61 @@ 
                                 'show_option_all'  => false,
                                 'show_option_none' => false,
                                 'class'            => 'wpi-input form-control wpi_select2',
-                                'placeholder'      => __( 'Choose a state', 'invoicing' ),
-                                'required'         => (bool)wpinv_get_option( 'state_mandatory' ),
-                            ) );
+                                'placeholder'      => __('Choose a state', 'invoicing'),
+                                'required'         => (bool) wpinv_get_option('state_mandatory'),
+                            ));
                         } else {
-                            echo wpinv_html_text( array(
+                            echo wpinv_html_text(array(
                                 'name'          => 'wpinv_state',
                                 'value'         => $billing_details['state'],
                                 'id'            => 'wpinv_state',
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'State / Province', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'state_mandatory' ),
-                            ) );
+                                'placeholder'   => __('State / Province', 'invoicing'),
+                                'required'      => (bool) wpinv_get_option('state_mandatory'),
+                            ));
                         }
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-colf">
-                        <label for="wpinv_zip" class="wpi-label"><?php _e( 'ZIP / Postcode', 'invoicing' );?><?php if ( wpinv_get_option( 'zip_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_zip" class="wpi-label"><?php _e('ZIP / Postcode', 'invoicing'); ?><?php if (wpinv_get_option('zip_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'name'          => 'wpinv_zip',
                                 'value'         => $billing_details['zip'],
                                 'id'            => 'wpinv_zip',
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'ZIP / Postcode', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'zip_mandatory' ),
-                            ) );
+                                'placeholder'   => __('ZIP / Postcode', 'invoicing'),
+                                'required'      => (bool) wpinv_get_option('zip_mandatory'),
+                            ));
                         ?>
                     </p>
                     <p class="wpi-cart-field wpi-col2 wpi-coll">
-                        <label for="wpinv_phone" class="wpi-label"><?php _e( 'Phone', 'invoicing' );?><?php if ( wpinv_get_option( 'phone_mandatory' ) ) { echo '<span class="wpi-required">*</span>'; } ?></label>
+                        <label for="wpinv_phone" class="wpi-label"><?php _e('Phone', 'invoicing'); ?><?php if (wpinv_get_option('phone_mandatory')) { echo '<span class="wpi-required">*</span>'; } ?></label>
                         <?php
-                        echo wpinv_html_text( array(
+                        echo wpinv_html_text(array(
                                 'id'            => 'wpinv_phone',
                                 'name'          => 'wpinv_phone',
                                 'value'         => $billing_details['phone'],
                                 'class'         => 'wpi-input form-control',
-                                'placeholder'   => __( 'Phone', 'invoicing' ),
-                                'required'      => (bool)wpinv_get_option( 'phone_mandatory' ),
-                            ) );
+                                'placeholder'   => __('Phone', 'invoicing'),
+                                'required'      => (bool) wpinv_get_option('phone_mandatory'),
+                            ));
                         ?>
                     </p>
-                    <?php do_action( 'wpinv_checkout_billing_fields_last', $billing_details ); ?>
+                    <?php do_action('wpinv_checkout_billing_fields_last', $billing_details); ?>
                     <div class="clearfix"></div>
                 </div>
             </div>
-            <?php do_action( 'wpinv_after_billing_fields', $billing_details ); ?>
+            <?php do_action('wpinv_after_billing_fields', $billing_details); ?>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_checkout_billing_info', 'wpinv_checkout_billing_info' );
+add_action('wpinv_checkout_billing_info', 'wpinv_checkout_billing_info');
 
 function wpinv_checkout_hidden_fields() {
 ?>
-    <?php if ( is_user_logged_in() ) { ?>
+    <?php if (is_user_logged_in()) { ?>
     <input type="hidden" name="wpinv_user_id" value="<?php echo get_current_user_id(); ?>"/>
     <?php } ?>
     <input type="hidden" name="wpi_action" value="payment" />
@@ -1802,9 +1802,9 @@ 
 function wpinv_checkout_button_purchase() {
     ob_start();
 ?>
-    <input type="submit" class="btn btn-success wpinv-submit" id="wpinv-payment-button" data-value="<?php esc_attr_e( 'Proceed to Pay', 'invoicing' ) ?>" name="wpinv_payment" value="<?php esc_attr_e( 'Proceed to Pay', 'invoicing' ) ?>"/>
+    <input type="submit" class="btn btn-success wpinv-submit" id="wpinv-payment-button" data-value="<?php esc_attr_e('Proceed to Pay', 'invoicing') ?>" name="wpinv_payment" value="<?php esc_attr_e('Proceed to Pay', 'invoicing') ?>"/>
 <?php
-    return apply_filters( 'wpinv_checkout_button_purchase', ob_get_clean() );
+    return apply_filters('wpinv_checkout_button_purchase', ob_get_clean());
 }
 
 function wpinv_checkout_total() {
@@ -1813,84 +1813,84 @@ 
 <div id="wpinv_checkout_total" class="panel panel-info">
     <div class="panel-body">
     <?php
-    do_action( 'wpinv_purchase_form_before_checkout_total' );
+    do_action('wpinv_purchase_form_before_checkout_total');
     ?>
-    <strong><?php _e( 'Invoice Total:', 'invoicing' ) ?></strong> <span class="wpinv-chdeckout-total"><?php echo $cart_total;?></span>
+    <strong><?php _e('Invoice Total:', 'invoicing') ?></strong> <span class="wpinv-chdeckout-total"><?php echo $cart_total; ?></span>
     <?php
-    do_action( 'wpinv_purchase_form_after_checkout_total' );
+    do_action('wpinv_purchase_form_after_checkout_total');
     ?>
     </div>
 </div>
 <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_total', 9998 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_total', 9998);
 
 function wpinv_checkout_accept_tandc() {
-    $page = wpinv_get_option( 'tandc_page' );
+    $page = wpinv_get_option('tandc_page');
     ?>
     <div id="wpinv_checkout_tandc" class="panel panel-success">
         <div class="panel-body">
             <?php echo wpinv_get_policy_text(); ?>
             <?php
-            if(isset($page) && (int)$page > 0 && apply_filters( 'wpinv_checkout_show_terms', true )){
-                $terms_link = esc_url( get_permalink( $page ) );
+            if (isset($page) && (int) $page > 0 && apply_filters('wpinv_checkout_show_terms', true)) {
+                $terms_link = esc_url(get_permalink($page));
                 ?>
                 <label class="">
-                    <input type="checkbox" class="wpi-terms-checkbox" name="wpi_terms" id="wpi-terms" <?php checked( apply_filters( 'wpinv_terms_is_checked_default', isset( $_POST['wpi_terms'] ) ), true ); ?>> <span><?php printf( __( 'I&rsquo;ve read and accept the <a href="%s" target="_blank" class="wpi-terms-and-conditions-link">terms &amp; conditions</a>', 'invoicing' ), $terms_link ); ?></span> <span class="wpi-required">*</span>
+                    <input type="checkbox" class="wpi-terms-checkbox" name="wpi_terms" id="wpi-terms" <?php checked(apply_filters('wpinv_terms_is_checked_default', isset($_POST['wpi_terms'])), true); ?>> <span><?php printf(__('I&rsquo;ve read and accept the <a href="%s" target="_blank" class="wpi-terms-and-conditions-link">terms &amp; conditions</a>', 'invoicing'), $terms_link); ?></span> <span class="wpi-required">*</span>
                 </label>
             <?php } ?>
         </div>
     </div>
     <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_accept_tandc', 9995 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_accept_tandc', 9995);
 
 function wpinv_checkout_submit() {
 ?>
 <div id="wpinv_purchase_submit" class="panel panel-success">
     <div class="panel-body text-center">
     <?php
-    do_action( 'wpinv_purchase_form_before_submit' );
+    do_action('wpinv_purchase_form_before_submit');
     wpinv_checkout_hidden_fields();
     echo wpinv_checkout_button_purchase();
-    do_action( 'wpinv_purchase_form_after_submit' );
+    do_action('wpinv_purchase_form_after_submit');
     ?>
     </div>
 </div>
 <?php
 }
-add_action( 'wpinv_checkout_form_bottom', 'wpinv_checkout_submit', 9999 );
+add_action('wpinv_checkout_form_bottom', 'wpinv_checkout_submit', 9999);
 
-function wpinv_receipt_billing_address( $invoice_id = 0 ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_receipt_billing_address($invoice_id = 0) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
 
     $billing_details = $invoice->get_user_info();
-    $address_row = wpinv_get_invoice_address_markup( $billing_details );
+    $address_row = wpinv_get_invoice_address_markup($billing_details);
 
     ob_start();
     ?>
     <table class="table table-bordered table-sm wpi-billing-details">
         <tbody>
             <tr class="wpi-receipt-name">
-                <th class="text-left"><?php _e( 'Name', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( trim( $billing_details['first_name'] . ' ' . $billing_details['last_name'] ) ) ;?></td>
+                <th class="text-left"><?php _e('Name', 'invoicing'); ?></th>
+                <td><?php echo esc_html(trim($billing_details['first_name'] . ' ' . $billing_details['last_name'])); ?></td>
             </tr>
             <tr class="wpi-receipt-email">
-                <th class="text-left"><?php _e( 'Email', 'invoicing' ); ?></th>
-                <td><?php echo $billing_details['email'] ;?></td>
+                <th class="text-left"><?php _e('Email', 'invoicing'); ?></th>
+                <td><?php echo $billing_details['email']; ?></td>
             </tr>
             <tr class="wpi-receipt-address">
-                <th class="text-left"><?php _e( 'Address', 'invoicing' ); ?></th>
-                <td><?php echo $address_row ;?></td>
+                <th class="text-left"><?php _e('Address', 'invoicing'); ?></th>
+                <td><?php echo $address_row; ?></td>
             </tr>
-            <?php if ( $billing_details['phone'] ) { ?>
+            <?php if ($billing_details['phone']) { ?>
             <tr class="wpi-receipt-phone">
-                <th class="text-left"><?php _e( 'Phone', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $billing_details['phone'] ) ;?></td>
+                <th class="text-left"><?php _e('Phone', 'invoicing'); ?></th>
+                <td><?php echo esc_html($billing_details['phone']); ?></td>
             </tr>
             <?php } ?>
         </tbody>
@@ -1898,74 +1898,74 @@ 
     <?php
     $output = ob_get_clean();
     
-    $output = apply_filters( 'wpinv_receipt_billing_address', $output, $invoice_id );
+    $output = apply_filters('wpinv_receipt_billing_address', $output, $invoice_id);
 
     echo $output;
 }
 
-function wpinv_filter_success_page_content( $content ) {
-    if ( isset( $_GET['payment-confirm'] ) && wpinv_is_success_page() ) {
-        if ( has_filter( 'wpinv_payment_confirm_' . sanitize_text_field( $_GET['payment-confirm'] ) ) ) {
-            $content = apply_filters( 'wpinv_payment_confirm_' . sanitize_text_field( $_GET['payment-confirm'] ), $content );
+function wpinv_filter_success_page_content($content) {
+    if (isset($_GET['payment-confirm']) && wpinv_is_success_page()) {
+        if (has_filter('wpinv_payment_confirm_' . sanitize_text_field($_GET['payment-confirm']))) {
+            $content = apply_filters('wpinv_payment_confirm_' . sanitize_text_field($_GET['payment-confirm']), $content);
         }
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_filter_success_page_content', 99999 );
+add_filter('the_content', 'wpinv_filter_success_page_content', 99999);
 
-function wpinv_receipt_actions( $invoice ) {
-    if ( !empty( $invoice ) ) {
+function wpinv_receipt_actions($invoice) {
+    if (!empty($invoice)) {
         $actions = array();
 
-        if ( wpinv_user_can_view_invoice( $invoice->ID ) ) {
-            $actions['print']   = array(
-                'url'  => $invoice->get_view_url( true ),
-                'name' => __( 'Print Invoice', 'invoicing' ),
+        if (wpinv_user_can_view_invoice($invoice->ID)) {
+            $actions['print'] = array(
+                'url'  => $invoice->get_view_url(true),
+                'name' => __('Print Invoice', 'invoicing'),
                 'class' => 'btn-primary',
             );
         }
 
-        if ( is_user_logged_in() ) {
+        if (is_user_logged_in()) {
             $actions['history'] = array(
                 'url'  => wpinv_get_history_page_uri(),
-                'name' => __( 'Invoice History', 'invoicing' ),
+                'name' => __('Invoice History', 'invoicing'),
                 'class' => 'btn-warning',
             );
         }
 
-        $actions = apply_filters( 'wpinv_invoice_receipt_actions', $actions, $invoice );
+        $actions = apply_filters('wpinv_invoice_receipt_actions', $actions, $invoice);
 
-        if ( !empty( $actions ) ) {
+        if (!empty($actions)) {
         ?>
         <div class="wpinv-receipt-actions text-right">
-            <?php foreach ( $actions as $key => $action ) { $class = !empty($action['class']) ? sanitize_html_class( $action['class'] ) : ''; ?>
-            <a href="<?php echo esc_url( $action['url'] );?>" class="btn btn-sm <?php echo $class . ' ' . sanitize_html_class( $key );?>" <?php echo ( !empty($action['attrs']) ? $action['attrs'] : '' ) ;?>><?php echo esc_html( $action['name'] );?></a>
+            <?php foreach ($actions as $key => $action) { $class = !empty($action['class']) ? sanitize_html_class($action['class']) : ''; ?>
+            <a href="<?php echo esc_url($action['url']); ?>" class="btn btn-sm <?php echo $class . ' ' . sanitize_html_class($key); ?>" <?php echo (!empty($action['attrs']) ? $action['attrs'] : ''); ?>><?php echo esc_html($action['name']); ?></a>
             <?php } ?>
         </div>
         <?php
         }
     }
 }
-add_action( 'wpinv_receipt_start', 'wpinv_receipt_actions', -10, 1 );
+add_action('wpinv_receipt_start', 'wpinv_receipt_actions', -10, 1);
 
-function wpinv_invoice_link( $invoice_id ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_invoice_link($invoice_id) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
 
-    $invoice_link = '<a href="' . esc_url( $invoice->get_view_url() ) . '">' . $invoice->get_number() . '</a>';
+    $invoice_link = '<a href="' . esc_url($invoice->get_view_url()) . '">' . $invoice->get_number() . '</a>';
 
-    return apply_filters( 'wpinv_get_invoice_link', $invoice_link, $invoice );
+    return apply_filters('wpinv_get_invoice_link', $invoice_link, $invoice);
 }
 
-function wpinv_invoice_subscription_details( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->is_recurring() && ! wpinv_is_subscription_payment( $invoice ) ) {
-        $subscription = wpinv_get_subscription( $invoice, true );
+function wpinv_invoice_subscription_details($invoice) {
+    if (!empty($invoice) && $invoice->is_recurring() && !wpinv_is_subscription_payment($invoice)) {
+        $subscription = wpinv_get_subscription($invoice, true);
 
-        if ( empty( $subscription ) ) {
+        if (empty($subscription)) {
             return;
         }
 
@@ -1976,15 +1976,15 @@ 
         $payments = $subscription->get_child_payments();
         ?>
         <div class="wpinv-subscriptions-details">
-            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters( 'wpinv_subscription_details_title', __( 'Subscription Details', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-subscriptions-t"><?php echo apply_filters('wpinv_subscription_details_title', __('Subscription Details', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
-                        <th><?php _e( 'Billing Cycle', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Start Date', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Expiration Date', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Times Billed', 'invoicing' ) ;?></th>
-                        <th class="text-center"><?php _e( 'Status', 'invoicing' ) ;?></th>
+                        <th><?php _e('Billing Cycle', 'invoicing'); ?></th>
+                        <th><?php _e('Start Date', 'invoicing'); ?></th>
+                        <th><?php _e('Expiration Date', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Times Billed', 'invoicing'); ?></th>
+                        <th class="text-center"><?php _e('Status', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -1998,29 +1998,29 @@ 
                 </tbody>
             </table>
         </div>
-        <?php if ( !empty( $payments ) ) { ?>
+        <?php if (!empty($payments)) { ?>
         <div class="wpinv-renewal-payments">
-            <h3 class="wpinv-renewals-t"><?php echo apply_filters( 'wpinv_renewal_payments_title', __( 'Renewal Payments', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-renewals-t"><?php echo apply_filters('wpinv_renewal_payments_title', __('Renewal Payments', 'invoicing')); ?></h3>
             <table class="table">
                 <thead>
                     <tr>
                         <th>#</th>
-                        <th><?php _e( 'Invoice', 'invoicing' ) ;?></th>
-                        <th><?php _e( 'Date', 'invoicing' ) ;?></th>
-                        <th class="text-right"><?php _e( 'Amount', 'invoicing' ) ;?></th>
+                        <th><?php _e('Invoice', 'invoicing'); ?></th>
+                        <th><?php _e('Date', 'invoicing'); ?></th>
+                        <th class="text-right"><?php _e('Amount', 'invoicing'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php
                         $i = 1;
-                        foreach ( $payments as $payment ) {
+                        foreach ($payments as $payment) {
                             $invoice_id = $payment->ID;
                     ?>
                     <tr>
-                        <th scope="row"><?php echo $i;?></th>
-                        <td><?php echo wpinv_invoice_link( $invoice_id ) ;?></td>
-                        <td><?php echo wpinv_get_invoice_date( $invoice_id ); ?></td>
-                        <td class="text-right"><?php echo wpinv_payment_total( $invoice_id, true ); ?></td>
+                        <th scope="row"><?php echo $i; ?></th>
+                        <td><?php echo wpinv_invoice_link($invoice_id); ?></td>
+                        <td><?php echo wpinv_get_invoice_date($invoice_id); ?></td>
+                        <td class="text-right"><?php echo wpinv_payment_total($invoice_id, true); ?></td>
                     </tr>
                     <?php $i++; } ?>
                 </tbody>
@@ -2031,52 +2031,52 @@ 
     }
 }
 
-function wpinv_cart_total_label( $label, $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_cart_total_label($label, $invoice) {
+    if (empty($invoice)) {
         return $label;
     }
 
     $prefix_label = '';
-    if ( $invoice->is_parent() && $item_id = $invoice->get_recurring() ) {
-        $prefix_label   = '<span class="label label-primary label-recurring">' . __( 'Recurring Payment', 'invoicing' ) . '</span> ' . wpinv_subscription_payment_desc( $invoice );
-    } else if ( $invoice->is_renewal() ) {
-        $prefix_label   = '<span class="label label-primary label-renewal">' . __( 'Renewal Payment', 'invoicing' ) . '</span> ';        
+    if ($invoice->is_parent() && $item_id = $invoice->get_recurring()) {
+        $prefix_label   = '<span class="label label-primary label-recurring">' . __('Recurring Payment', 'invoicing') . '</span> ' . wpinv_subscription_payment_desc($invoice);
+    } else if ($invoice->is_renewal()) {
+        $prefix_label   = '<span class="label label-primary label-renewal">' . __('Renewal Payment', 'invoicing') . '</span> ';        
     }
 
-    if ( $prefix_label != '' ) {
-        $label  = '<span class="wpinv-cart-sub-desc">' . $prefix_label . '</span> ' . $label;
+    if ($prefix_label != '') {
+        $label = '<span class="wpinv-cart-sub-desc">' . $prefix_label . '</span> ' . $label;
     }
 
     return $label;
 }
-add_filter( 'wpinv_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
-add_filter( 'wpinv_email_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
-add_filter( 'wpinv_print_cart_total_label', 'wpinv_cart_total_label', 10, 2 );
+add_filter('wpinv_cart_total_label', 'wpinv_cart_total_label', 10, 2);
+add_filter('wpinv_email_cart_total_label', 'wpinv_cart_total_label', 10, 2);
+add_filter('wpinv_print_cart_total_label', 'wpinv_cart_total_label', 10, 2);
 
-add_action( 'wpinv_invoice_print_middle', 'wpinv_invoice_subscription_details', 10, 1 );
+add_action('wpinv_invoice_print_middle', 'wpinv_invoice_subscription_details', 10, 1);
 
-function wpinv_invoice_print_description( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_print_description($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
-    if ( $description = wpinv_get_invoice_description( $invoice->ID ) ) {
+    if ($description = wpinv_get_invoice_description($invoice->ID)) {
         ?>
         <div class="row wpinv-lower">
             <div class="col-sm-12 wpinv-description">
-                <?php echo wpautop( $description ); ?>
+                <?php echo wpautop($description); ?>
             </div>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_invoice_print_middle', 'wpinv_invoice_print_description', 10.1, 1 );
+add_action('wpinv_invoice_print_middle', 'wpinv_invoice_print_description', 10.1, 1);
 
-function wpinv_invoice_print_payment_info( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_print_payment_info($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
 
-    if ( $payments_info = wpinv_display_payments_info( $invoice->ID, false ) ) {
+    if ($payments_info = wpinv_display_payments_info($invoice->ID, false)) {
         ?>
         <div class="row wpinv-payments">
             <div class="col-sm-12">
@@ -2088,43 +2088,43 @@ 
 }
 // add_action( 'wpinv_invoice_print_after_line_items', 'wpinv_invoice_print_payment_info', 10, 1 );
 
-function wpinv_get_invoice_note_line_item( $note, $echo = true ) {
-    if ( empty( $note ) ) {
+function wpinv_get_invoice_note_line_item($note, $echo = true) {
+    if (empty($note)) {
         return NULL;
     }
 
-    if ( is_int( $note ) ) {
-        $note = get_comment( $note );
+    if (is_int($note)) {
+        $note = get_comment($note);
     }
 
-    if ( !( is_object( $note ) && is_a( $note, 'WP_Comment' ) ) ) {
+    if (!(is_object($note) && is_a($note, 'WP_Comment'))) {
         return NULL;
     }
 
-    $note_classes   = array( 'note' );
-    $note_classes[] = get_comment_meta( $note->comment_ID, '_wpi_customer_note', true ) ? 'customer-note' : '';
+    $note_classes   = array('note');
+    $note_classes[] = get_comment_meta($note->comment_ID, '_wpi_customer_note', true) ? 'customer-note' : '';
     $note_classes[] = $note->comment_author === 'System' ? 'system-note' : '';
-    $note_classes   = apply_filters( 'wpinv_invoice_note_class', array_filter( $note_classes ), $note );
-    $note_classes   = !empty( $note_classes ) ? implode( ' ', $note_classes ) : '';
+    $note_classes   = apply_filters('wpinv_invoice_note_class', array_filter($note_classes), $note);
+    $note_classes   = !empty($note_classes) ? implode(' ', $note_classes) : '';
 
     ob_start();
     ?>
-    <li rel="<?php echo absint( $note->comment_ID ) ; ?>" class="<?php echo esc_attr( $note_classes ); ?>">
+    <li rel="<?php echo absint($note->comment_ID); ?>" class="<?php echo esc_attr($note_classes); ?>">
         <div class="note_content">
-            <?php echo wpautop( wptexturize( wp_kses_post( $note->comment_content ) ) ); ?>
+            <?php echo wpautop(wptexturize(wp_kses_post($note->comment_content))); ?>
         </div>
         <p class="meta">
-            <abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf( __( '%1$s - %2$s at %3$s', 'invoicing' ), $note->comment_author, date_i18n( get_option( 'date_format' ), strtotime( $note->comment_date ) ), date_i18n( get_option( 'time_format' ), strtotime( $note->comment_date ) ) ); ?></abbr>&nbsp;&nbsp;
-            <?php if ( $note->comment_author !== 'System' || wpinv_current_user_can_manage_invoicing() ) { ?>
-                <a href="#" class="delete_note"><?php _e( 'Delete note', 'invoicing' ); ?></a>
+            <abbr class="exact-date" title="<?php echo $note->comment_date; ?>"><?php printf(__('%1$s - %2$s at %3$s', 'invoicing'), $note->comment_author, date_i18n(get_option('date_format'), strtotime($note->comment_date)), date_i18n(get_option('time_format'), strtotime($note->comment_date))); ?></abbr>&nbsp;&nbsp;
+            <?php if ($note->comment_author !== 'System' || wpinv_current_user_can_manage_invoicing()) { ?>
+                <a href="#" class="delete_note"><?php _e('Delete note', 'invoicing'); ?></a>
             <?php } ?>
         </p>
     </li>
     <?php
     $note_content = ob_get_clean();
-    $note_content = apply_filters( 'wpinv_get_invoice_note_line_item', $note_content, $note, $echo );
+    $note_content = apply_filters('wpinv_get_invoice_note_line_item', $note_content, $note, $echo);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $note_content;
     } else {
         return $note_content;
@@ -2134,43 +2134,43 @@ 
 function wpinv_invalid_invoice_content() {
     global $post;
 
-    $invoice = wpinv_get_invoice( $post->ID );
+    $invoice = wpinv_get_invoice($post->ID);
 
-    $error = __( 'This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing' );
-    if ( !empty( $invoice->ID ) && $invoice->has_status( array_keys( wpinv_get_invoice_statuses() ) ) ) {
-        if ( is_user_logged_in() ) {
-            if ( wpinv_require_login_to_checkout() ) {
-                if ( isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-                    $error = __( 'You are not allowed to view this invoice.', 'invoicing' );
+    $error = __('This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing');
+    if (!empty($invoice->ID) && $invoice->has_status(array_keys(wpinv_get_invoice_statuses()))) {
+        if (is_user_logged_in()) {
+            if (wpinv_require_login_to_checkout()) {
+                if (isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+                    $error = __('You are not allowed to view this invoice.', 'invoicing');
                 }
             }
         } else {
-            if ( wpinv_require_login_to_checkout() ) {
-                if ( isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-                    $error = __( 'You must be logged in to view this invoice.', 'invoicing' );
+            if (wpinv_require_login_to_checkout()) {
+                if (isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+                    $error = __('You must be logged in to view this invoice.', 'invoicing');
                 }
             }
         }
     } else {
-        $error = __( 'This invoice is deleted or does not exist.', 'invoicing' );
+        $error = __('This invoice is deleted or does not exist.', 'invoicing');
     }
     ?>
     <div class="row wpinv-row-invalid">
         <div class="col-md-6 col-md-offset-3 wpinv-message error">
-            <h3><?php _e( 'Access Denied', 'invoicing' ); ?></h3>
+            <h3><?php _e('Access Denied', 'invoicing'); ?></h3>
             <p class="wpinv-msg-text"><?php echo $error; ?></p>
         </div>
     </div>
     <?php
 }
-add_action( 'wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content' );
+add_action('wpinv_invalid_invoice_content', 'wpinv_invalid_invoice_content');
 
-add_action( 'wpinv_checkout_billing_fields_last', 'wpinv_force_company_name_field');
-function wpinv_force_company_name_field(){
+add_action('wpinv_checkout_billing_fields_last', 'wpinv_force_company_name_field');
+function wpinv_force_company_name_field() {
     $invoice = wpinv_get_invoice_cart();
-    $user_id = wpinv_get_user_id( $invoice->ID );
-    $company = empty( $user_id ) ? "" : get_user_meta( $user_id, '_wpinv_company', true );
-    if ( 1 == wpinv_get_option( 'force_show_company' ) && !wpinv_use_taxes() ) {
+    $user_id = wpinv_get_user_id($invoice->ID);
+    $company = empty($user_id) ? "" : get_user_meta($user_id, '_wpinv_company', true);
+    if (1 == wpinv_get_option('force_show_company') && !wpinv_use_taxes()) {
         ?>
         <p class="wpi-cart-field wpi-col2 wpi-colf">
             <label for="wpinv_company" class="wpi-label"><?php _e('Company Name', 'invoicing'); ?></label>
@@ -2195,21 +2195,21 @@ 
  * @return string
  */
 function wpinv_get_policy_text() {
-    $privacy_page_id = get_option( 'wp_page_for_privacy_policy', 0 );
+    $privacy_page_id = get_option('wp_page_for_privacy_policy', 0);
 
-    $text = wpinv_get_option('invoicing_privacy_checkout_message', sprintf( __( 'Your personal data will be used to process your invoice, payment and for other purposes described in our %s.', 'invoicing' ), '[wpinv_privacy_policy]' ));
+    $text = wpinv_get_option('invoicing_privacy_checkout_message', sprintf(__('Your personal data will be used to process your invoice, payment and for other purposes described in our %s.', 'invoicing'), '[wpinv_privacy_policy]'));
 
-    if(!$privacy_page_id){
-        $privacy_page_id = wpinv_get_option( 'privacy_page', 0 );
+    if (!$privacy_page_id) {
+        $privacy_page_id = wpinv_get_option('privacy_page', 0);
     }
 
-    $privacy_link    = $privacy_page_id ? '<a href="' . esc_url( get_permalink( $privacy_page_id ) ) . '" class="wpinv-privacy-policy-link" target="_blank">' . __( 'privacy policy', 'invoicing' ) . '</a>' : __( 'privacy policy', 'invoicing' );
+    $privacy_link = $privacy_page_id ? '<a href="' . esc_url(get_permalink($privacy_page_id)) . '" class="wpinv-privacy-policy-link" target="_blank">' . __('privacy policy', 'invoicing') . '</a>' : __('privacy policy', 'invoicing');
 
     $find_replace = array(
         '[wpinv_privacy_policy]' => $privacy_link,
     );
 
-    $privacy_text = str_replace( array_keys( $find_replace ), array_values( $find_replace ), $text );
+    $privacy_text = str_replace(array_keys($find_replace), array_values($find_replace), $text);
 
     return wp_kses_post(wpautop($privacy_text));
 }
@@ -2218,25 +2218,25 @@ 
 /**
  * Allows the user to set their own price for an invoice item
  */
-function wpinv_checkout_cart_item_name_your_price( $cart_item, $key ) {
+function wpinv_checkout_cart_item_name_your_price($cart_item, $key) {
     
     //Ensure we have an item id
-    if(! is_array( $cart_item ) || empty( $cart_item['id'] ) ) {
+    if (!is_array($cart_item) || empty($cart_item['id'])) {
         return;
     }
 
     //Fetch the item
     $item_id = $cart_item['id'];
-    $item    = new WPInv_Item( $item_id );
+    $item    = new WPInv_Item($item_id);
     
-    if(! $item->supports_dynamic_pricing() || !$item->get_is_dynamic_pricing() ) {
+    if (!$item->supports_dynamic_pricing() || !$item->get_is_dynamic_pricing()) {
         return;
     }
 
     //Fetch the dynamic pricing "strings"
-    $suggested_price_text = esc_html( wpinv_get_option( 'suggested_price_text', __( 'Suggested Price:', 'invoicing' ) ) );
-    $minimum_price_text   = esc_html( wpinv_get_option( 'minimum_price_text', __( 'Minimum Price:', 'invoicing' ) ) );
-    $name_your_price_text = esc_html( wpinv_get_option( 'name_your_price_text', __( 'Name Your Price', 'invoicing' ) ) );
+    $suggested_price_text = esc_html(wpinv_get_option('suggested_price_text', __('Suggested Price:', 'invoicing')));
+    $minimum_price_text   = esc_html(wpinv_get_option('minimum_price_text', __('Minimum Price:', 'invoicing')));
+    $name_your_price_text = esc_html(wpinv_get_option('name_your_price_text', __('Name Your Price', 'invoicing')));
 
     //Display a "name_your_price" button
     echo " &mdash; <a href='#' class='wpinv-name-your-price-frontend small'>$name_your_price_text</a></div>";
@@ -2245,7 +2245,7 @@ 
     echo '<div class="name-your-price-miniform">';
     
     //Maybe display the recommended price
-    if( $item->get_price() > 0 && !empty( $suggested_price_text ) ) {
+    if ($item->get_price() > 0 && !empty($suggested_price_text)) {
         $suggested_price = $item->get_the_price();
         echo "<div>$suggested_price_text &mdash; $suggested_price</div>";
     }
@@ -2253,50 +2253,50 @@ 
     //Display the update price form
     $symbol         = wpinv_currency_symbol();
     $position       = wpinv_currency_position();
-    $minimum        = esc_attr( $item->get_minimum_price() );
-    $price          = esc_attr( $cart_item['item_price'] );
-    $update         = esc_attr__( "Update", 'invoicing' );
+    $minimum        = esc_attr($item->get_minimum_price());
+    $price          = esc_attr($cart_item['item_price']);
+    $update         = esc_attr__("Update", 'invoicing');
 
     //Ensure it supports dynamic prici
-    if( $price < $minimum ) {
+    if ($price < $minimum) {
         $price = $minimum;
     }
 
     echo '<label>';
     echo $position != 'right' ? $symbol . '&nbsp;' : '';
     echo "<input type='number' min='$minimum' placeholder='$price' value='$price' class='wpi-field-price' />";
-    echo $position == 'right' ? '&nbsp;' . $symbol : '' ;
+    echo $position == 'right' ? '&nbsp;' . $symbol : '';
     echo "</label>";
     echo "<input type='hidden' value='$item_id' class='wpi-field-item' />";
     echo "<a class='btn btn-success wpinv-submit wpinv-update-dynamic-price-frontend'>$update</a>";
 
     //Maybe display the minimum price
-    if( $item->get_minimum_price() > 0 && !empty( $minimum_price_text ) ) {
-        $minimum_price = wpinv_price( wpinv_format_amount( $item->get_minimum_price() ) );
+    if ($item->get_minimum_price() > 0 && !empty($minimum_price_text)) {
+        $minimum_price = wpinv_price(wpinv_format_amount($item->get_minimum_price()));
         echo "<div>$minimum_price_text &mdash; $minimum_price</div>";
     }
 
     echo "</div>";
 
 }
-add_action( 'wpinv_checkout_cart_item_price_after', 'wpinv_checkout_cart_item_name_your_price', 10, 2 );
+add_action('wpinv_checkout_cart_item_price_after', 'wpinv_checkout_cart_item_name_your_price', 10, 2);
 
 function wpinv_oxygen_fix_conflict() {
     global $ct_ignore_post_types;
 
-    if ( ! is_array( $ct_ignore_post_types ) ) {
+    if (!is_array($ct_ignore_post_types)) {
         $ct_ignore_post_types = array();
     }
 
-    $post_types = array( 'wpi_discount', 'wpi_invoice', 'wpi_item' );
+    $post_types = array('wpi_discount', 'wpi_invoice', 'wpi_item');
 
-    foreach ( $post_types as $post_type ) {
+    foreach ($post_types as $post_type) {
         $ct_ignore_post_types[] = $post_type;
 
         // Ignore post type
-        add_filter( 'pre_option_oxygen_vsb_ignore_post_type_' . $post_type, '__return_true', 999 );
+        add_filter('pre_option_oxygen_vsb_ignore_post_type_' . $post_type, '__return_true', 999);
     }
 
-    remove_filter( 'template_include', 'wpinv_template', 10, 1 );
-    add_filter( 'template_include', 'wpinv_template', 999, 1 );
+    remove_filter('template_include', 'wpinv_template', 10, 1);
+    add_filter('template_include', 'wpinv_template', 999, 1);
 }
\ No newline at end of file

includes/wpinv-helper-functions.php

Spacing +408 added lines, -408 removed lines

@@ -7,132 +7,132 @@ 
  */
 
 // 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( $draft = false, $trashed = false, $invoice = false ) {
+function wpinv_get_invoice_statuses($draft = false, $trashed = false, $invoice = false) {
     global $post;
 
     $invoice_statuses = array(
-        'wpi-pending' => __( 'Pending Payment', 'invoicing' ),
-        'publish' => __( 'Paid', 'invoicing'),
-        'wpi-processing' => __( 'Processing', 'invoicing' ),
-        'wpi-onhold' => __( 'On Hold', 'invoicing' ),
-        'wpi-refunded' => __( 'Refunded', 'invoicing' ),
-        'wpi-cancelled' => __( 'Cancelled', 'invoicing' ),
-        'wpi-failed' => __( 'Failed', 'invoicing' ),
-        'wpi-renewal' => __( 'Renewal Payment', 'invoicing' )
+        'wpi-pending' => __('Pending Payment', 'invoicing'),
+        'publish' => __('Paid', 'invoicing'),
+        'wpi-processing' => __('Processing', 'invoicing'),
+        'wpi-onhold' => __('On Hold', 'invoicing'),
+        'wpi-refunded' => __('Refunded', 'invoicing'),
+        'wpi-cancelled' => __('Cancelled', 'invoicing'),
+        'wpi-failed' => __('Failed', 'invoicing'),
+        'wpi-renewal' => __('Renewal Payment', 'invoicing')
     );
 
-    if ( $draft ) {
-        $invoice_statuses['draft'] = __( 'Draft', 'invoicing' );
+    if ($draft) {
+        $invoice_statuses['draft'] = __('Draft', 'invoicing');
     }
 
-    if ( $trashed ) {
-        $invoice_statuses['trash'] = __( 'Trash', 'invoicing' );
+    if ($trashed) {
+        $invoice_statuses['trash'] = __('Trash', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_statuses', $invoice_statuses, $invoice );
+    return apply_filters('wpinv_statuses', $invoice_statuses, $invoice);
 }
 
-function wpinv_status_nicename( $status ) {
-    $statuses = wpinv_get_invoice_statuses( true, true );
-    $status   = isset( $statuses[$status] ) ? $statuses[$status] : __( $status, 'invoicing' );
+function wpinv_status_nicename($status) {
+    $statuses = wpinv_get_invoice_statuses(true, true);
+    $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' => '&#x62f;.&#x625;',
         'AFN' => '&#x60b;',
         'ALL' => 'L',
@@ -295,209 +295,209 @@ 
         'YER' => '&#xfdfc;',
         'ZAR' => '&#82;',
         'ZMW' => 'ZK',
-    ) );
+    ));
 
-    $currency_symbol = isset( $symbols[$currency] ) ? $symbols[$currency] : $currency;
+    $currency_symbol = isset($symbols[$currency]) ? $symbols[$currency] : $currency;
 
-    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 Dollar', 'invoicing' ),
-        'EUR' => __( 'Euro', 'invoicing' ),
-        'GBP' => __( 'Pound Sterling', 'invoicing' ),
-        'AED' => __( 'United Arab Emirates', 'invoicing' ),
-        'AFN' => __( 'Afghan Afghani', 'invoicing' ),
-        'ALL' => __( 'Albanian Lek', 'invoicing' ),
-        'AMD' => __( 'Armenian Dram', 'invoicing' ),
-        'ANG' => __( 'Netherlands Antillean Guilder', 'invoicing' ),
-        'AOA' => __( 'Angolan Kwanza', 'invoicing' ),
-        'ARS' => __( 'Argentine Peso', 'invoicing' ),
-        'AUD' => __( 'Australian Dollar', 'invoicing' ),
-        'AWG' => __( 'Aruban Florin', 'invoicing' ),
-        'AZN' => __( 'Azerbaijani Manat', 'invoicing' ),
-        'BAM' => __( 'Bosnia and Herzegovina Convertible Marka', 'invoicing' ),
-        'BBD' => __( 'Barbadian Dollar', 'invoicing' ),
-        'BDT' => __( 'Bangladeshi Taka', 'invoicing' ),
-        'BGN' => __( 'Bulgarian Lev', 'invoicing' ),
-        'BHD' => __( 'Bahraini Dinar', 'invoicing' ),
-        'BIF' => __( 'Burundian Franc', 'invoicing' ),
-        'BMD' => __( 'Bermudian Dollar', 'invoicing' ),
-        'BND' => __( 'Brunei Dollar', 'invoicing' ),
-        'BOB' => __( 'Bolivian Boliviano', 'invoicing' ),
-        'BRL' => __( 'Brazilian Real', 'invoicing' ),
-        'BSD' => __( 'Bahamian Dollar', 'invoicing' ),
-        'BTC' => __( 'Bitcoin', 'invoicing' ),
-        'BTN' => __( 'Bhutanese Ngultrum', 'invoicing' ),
-        'BWP' => __( 'Botswana Pula', 'invoicing' ),
-        'BYN' => __( 'Belarusian Ruble', 'invoicing' ),
-        'BZD' => __( 'Belize Dollar', 'invoicing' ),
-        'CAD' => __( 'Canadian Dollar', 'invoicing' ),
-        'CDF' => __( 'Congolese Franc', 'invoicing' ),
-        'CHF' => __( 'Swiss Franc', 'invoicing' ),
-        'CLP' => __( 'Chilean Peso', 'invoicing' ),
-        'CNY' => __( 'Chinese Yuan', 'invoicing' ),
-        'COP' => __( 'Colombian Peso', 'invoicing' ),
-        'CRC' => __( 'Costa Rican Colon', 'invoicing' ),
-        'CUC' => __( 'Cuban Convertible Peso', 'invoicing' ),
-        'CUP' => __( 'Cuban Peso', 'invoicing' ),
-        'CVE' => __( 'Cape Verdean escudo', 'invoicing' ),
-        'CZK' => __( 'Czech Koruna', 'invoicing' ),
-        'DJF' => __( 'Djiboutian Franc', 'invoicing' ),
-        'DKK' => __( 'Danish Krone', 'invoicing' ),
-        'DOP' => __( 'Dominican Peso', 'invoicing' ),
-        'DZD' => __( 'Algerian Dinar', 'invoicing' ),
-        'EGP' => __( 'Egyptian Pound', 'invoicing' ),
-        'ERN' => __( 'Eritrean Nakfa', 'invoicing' ),
-        'ETB' => __( 'Ethiopian Irr', 'invoicing' ),
-        'FJD' => __( 'Fijian Dollar', 'invoicing' ),
-        'FKP' => __( 'Falkland Islands Pound', 'invoicing' ),
-        'GEL' => __( 'Georgian Lari', 'invoicing' ),
-        'GGP' => __( 'Guernsey Pound', 'invoicing' ),
-        'GHS' => __( 'Ghana Cedi', 'invoicing' ),
-        'GIP' => __( 'Gibraltar Pound', 'invoicing' ),
-        'GMD' => __( 'Gambian Dalasi', 'invoicing' ),
-        'GNF' => __( 'Guinean Franc', 'invoicing' ),
-        'GTQ' => __( 'Guatemalan Quetzal', 'invoicing' ),
-        'GYD' => __( 'Guyanese Dollar', 'invoicing' ),
-        'HKD' => __( 'Hong Kong Dollar', 'invoicing' ),
-        'HNL' => __( 'Honduran Lempira', 'invoicing' ),
-        'HRK' => __( 'Croatian Kuna', 'invoicing' ),
-        'HTG' => __( 'Haitian Gourde', 'invoicing' ),
-        'HUF' => __( 'Hungarian Forint', 'invoicing' ),
-        'IDR' => __( 'Indonesian Rupiah', 'invoicing' ),
-        'ILS' => __( 'Israeli New Shekel', 'invoicing' ),
-        'IMP' => __( 'Manx Pound', 'invoicing' ),
-        'INR' => __( 'Indian Rupee', 'invoicing' ),
-        'IQD' => __( 'Iraqi Dinar', 'invoicing' ),
-        'IRR' => __( 'Iranian Rial', 'invoicing' ),
-        'IRT' => __( 'Iranian Toman', 'invoicing' ),
-        'ISK' => __( 'Icelandic Krona', 'invoicing' ),
-        'JEP' => __( 'Jersey Pound', 'invoicing' ),
-        'JMD' => __( 'Jamaican Dollar', 'invoicing' ),
-        'JOD' => __( 'Jordanian Dinar', 'invoicing' ),
-        'JPY' => __( 'Japanese Yen', 'invoicing' ),
-        'KES' => __( 'Kenyan Shilling', 'invoicing' ),
-        'KGS' => __( 'Kyrgyzstani Som', 'invoicing' ),
-        'KHR' => __( 'Cambodian Riel', 'invoicing' ),
-        'KMF' => __( 'Comorian Franc', 'invoicing' ),
-        'KPW' => __( 'North Korean Won', 'invoicing' ),
-        'KRW' => __( 'South Korean Won', 'invoicing' ),
-        'KWD' => __( 'Kuwaiti Dinar', 'invoicing' ),
-        'KYD' => __( 'Cayman Islands Dollar', 'invoicing' ),
-        'KZT' => __( 'Kazakhstani Tenge', 'invoicing' ),
-        'LAK' => __( 'Lao Kip', 'invoicing' ),
-        'LBP' => __( 'Lebanese Pound', 'invoicing' ),
-        'LKR' => __( 'Sri Lankan Rupee', 'invoicing' ),
-        'LRD' => __( 'Liberian Dollar', 'invoicing' ),
-        'LSL' => __( 'Lesotho Loti', 'invoicing' ),
-        'LYD' => __( 'Libyan Dinar', 'invoicing' ),
-        'MAD' => __( 'Moroccan Dirham', 'invoicing' ),
-        'MDL' => __( 'Moldovan Leu', 'invoicing' ),
-        'MGA' => __( 'Malagasy Ariary', 'invoicing' ),
-        'MKD' => __( 'Macedonian Denar', 'invoicing' ),
-        'MMK' => __( 'Burmese Kyat', 'invoicing' ),
-        'MNT' => __( 'Mongolian Tughrik', 'invoicing' ),
-        'MOP' => __( 'Macanese Pataca', 'invoicing' ),
-        'MRO' => __( 'Mauritanian Ouguiya', 'invoicing' ),
-        'MUR' => __( 'Mauritian Rupee', 'invoicing' ),
-        'MVR' => __( 'Maldivian Rufiyaa', 'invoicing' ),
-        'MWK' => __( 'Malawian Kwacha', 'invoicing' ),
-        'MXN' => __( 'Mexican Peso', 'invoicing' ),
-        'MYR' => __( 'Malaysian Ringgit', 'invoicing' ),
-        'MZN' => __( 'Mozambican Metical', 'invoicing' ),
-        'NAD' => __( 'Namibian Dollar', 'invoicing' ),
-        'NGN' => __( 'Nigerian Naira', 'invoicing' ),
-        'NIO' => __( 'Nicaraguan Cordoba', 'invoicing' ),
-        'NOK' => __( 'Norwegian Krone', 'invoicing' ),
-        'NPR' => __( 'Nepalese Rupee', 'invoicing' ),
-        'NZD' => __( 'New Zealand Dollar', 'invoicing' ),
-        'OMR' => __( 'Omani Rial', 'invoicing' ),
-        'PAB' => __( 'Panamanian Balboa', 'invoicing' ),
-        'PEN' => __( 'Peruvian Nuevo Sol', 'invoicing' ),
-        'PGK' => __( 'Papua New Guinean Kina', 'invoicing' ),
-        'PHP' => __( 'Philippine Peso', 'invoicing' ),
-        'PKR' => __( 'Pakistani Rupee', 'invoicing' ),
-        'PLN' => __( 'Polish Zloty', 'invoicing' ),
-        'PRB' => __( 'Transnistrian Ruble', 'invoicing' ),
-        'PYG' => __( 'Paraguayan Guarani', 'invoicing' ),
-        'QAR' => __( 'Qatari Riyal', 'invoicing' ),
-        'RON' => __( 'Romanian Leu', 'invoicing' ),
-        'RSD' => __( 'Serbian Dinar', 'invoicing' ),
-        'RUB' => __( 'Russian Ruble', 'invoicing' ),
-        'RWF' => __( 'Rwandan Franc', 'invoicing' ),
-        'SAR' => __( 'Saudi Riyal', 'invoicing' ),
-        'SBD' => __( 'Solomon Islands Dollar', 'invoicing' ),
-        'SCR' => __( 'Seychellois Rupee', 'invoicing' ),
-        'SDG' => __( 'Sudanese Pound', 'invoicing' ),
-        'SEK' => __( 'Swedish Krona', 'invoicing' ),
-        'SGD' => __( 'Singapore Dollar', 'invoicing' ),
-        'SHP' => __( 'Saint Helena Pound', 'invoicing' ),
-        'SLL' => __( 'Sierra Leonean Leone', 'invoicing' ),
-        'SOS' => __( 'Somali Shilling', 'invoicing' ),
-        'SRD' => __( 'Surinamese Dollar', 'invoicing' ),
-        'SSP' => __( 'South Sudanese Pound', 'invoicing' ),
-        'STD' => __( 'Sao Tomean Dobra', 'invoicing' ),
-        'SYP' => __( 'Syrian Pound', 'invoicing' ),
-        'SZL' => __( 'Swazi Lilangeni', 'invoicing' ),
-        'THB' => __( 'Thai Baht', 'invoicing' ),
-        'TJS' => __( 'Tajikistani Somoni', 'invoicing' ),
-        'TMT' => __( 'Turkmenistan Manat', 'invoicing' ),
-        'TND' => __( 'Tunisian Dinar', 'invoicing' ),
-        'TOP' => __( 'Tongan Pa&#x2bb;anga', 'invoicing' ),
-        'TRY' => __( 'Turkish Lira', 'invoicing' ),
-        'TTD' => __( 'Trinidad and Tobago Dollar', 'invoicing' ),
-        'TWD' => __( 'New Taiwan Dollar', 'invoicing' ),
-        'TZS' => __( 'Tanzanian Shilling', 'invoicing' ),
-        'UAH' => __( 'Ukrainian Hryvnia', 'invoicing' ),
-        'UGX' => __( 'Ugandan Shilling', 'invoicing' ),
-        'UYU' => __( 'Uruguayan Peso', 'invoicing' ),
-        'UZS' => __( 'Uzbekistani Som', 'invoicing' ),
-        'VEF' => __( 'Venezuelan Bol&iacute;var', 'invoicing' ),
-        'VND' => __( 'Vietnamese Dong', 'invoicing' ),
-        'VUV' => __( 'Vanuatu Vatu', 'invoicing' ),
-        'WST' => __( 'Samoan Tala', 'invoicing' ),
-        'XAF' => __( 'Central African CFA Franc', 'invoicing' ),
-        'XCD' => __( 'East Caribbean Dollar', 'invoicing' ),
-        'XOF' => __( 'West African CFA Franc', 'invoicing' ),
-        'XPF' => __( 'CFP Franc', 'invoicing' ),
-        'YER' => __( 'Yemeni Rial', 'invoicing' ),
-        'ZAR' => __( 'South African Rand', 'invoicing' ),
-        'ZMW' => __( 'Zambian Kwacha', 'invoicing' ),
+        'USD' => __('US Dollar', 'invoicing'),
+        'EUR' => __('Euro', 'invoicing'),
+        'GBP' => __('Pound Sterling', 'invoicing'),
+        'AED' => __('United Arab Emirates', 'invoicing'),
+        'AFN' => __('Afghan Afghani', 'invoicing'),
+        'ALL' => __('Albanian Lek', 'invoicing'),
+        'AMD' => __('Armenian Dram', 'invoicing'),
+        'ANG' => __('Netherlands Antillean Guilder', 'invoicing'),
+        'AOA' => __('Angolan Kwanza', 'invoicing'),
+        'ARS' => __('Argentine Peso', 'invoicing'),
+        'AUD' => __('Australian Dollar', 'invoicing'),
+        'AWG' => __('Aruban Florin', 'invoicing'),
+        'AZN' => __('Azerbaijani Manat', 'invoicing'),
+        'BAM' => __('Bosnia and Herzegovina Convertible Marka', 'invoicing'),
+        'BBD' => __('Barbadian Dollar', 'invoicing'),
+        'BDT' => __('Bangladeshi Taka', 'invoicing'),
+        'BGN' => __('Bulgarian Lev', 'invoicing'),
+        'BHD' => __('Bahraini Dinar', 'invoicing'),
+        'BIF' => __('Burundian Franc', 'invoicing'),
+        'BMD' => __('Bermudian Dollar', 'invoicing'),
+        'BND' => __('Brunei Dollar', 'invoicing'),
+        'BOB' => __('Bolivian Boliviano', 'invoicing'),
+        'BRL' => __('Brazilian Real', 'invoicing'),
+        'BSD' => __('Bahamian Dollar', 'invoicing'),
+        'BTC' => __('Bitcoin', 'invoicing'),
+        'BTN' => __('Bhutanese Ngultrum', 'invoicing'),
+        'BWP' => __('Botswana Pula', 'invoicing'),
+        'BYN' => __('Belarusian Ruble', 'invoicing'),
+        'BZD' => __('Belize Dollar', 'invoicing'),
+        'CAD' => __('Canadian Dollar', 'invoicing'),
+        'CDF' => __('Congolese Franc', 'invoicing'),
+        'CHF' => __('Swiss Franc', 'invoicing'),
+        'CLP' => __('Chilean Peso', 'invoicing'),
+        'CNY' => __('Chinese Yuan', 'invoicing'),
+        'COP' => __('Colombian Peso', 'invoicing'),
+        'CRC' => __('Costa Rican Colon', 'invoicing'),
+        'CUC' => __('Cuban Convertible Peso', 'invoicing'),
+        'CUP' => __('Cuban Peso', 'invoicing'),
+        'CVE' => __('Cape Verdean escudo', 'invoicing'),
+        'CZK' => __('Czech Koruna', 'invoicing'),
+        'DJF' => __('Djiboutian Franc', 'invoicing'),
+        'DKK' => __('Danish Krone', 'invoicing'),
+        'DOP' => __('Dominican Peso', 'invoicing'),
+        'DZD' => __('Algerian Dinar', 'invoicing'),
+        'EGP' => __('Egyptian Pound', 'invoicing'),
+        'ERN' => __('Eritrean Nakfa', 'invoicing'),
+        'ETB' => __('Ethiopian Irr', 'invoicing'),
+        'FJD' => __('Fijian Dollar', 'invoicing'),
+        'FKP' => __('Falkland Islands Pound', 'invoicing'),
+        'GEL' => __('Georgian Lari', 'invoicing'),
+        'GGP' => __('Guernsey Pound', 'invoicing'),
+        'GHS' => __('Ghana Cedi', 'invoicing'),
+        'GIP' => __('Gibraltar Pound', 'invoicing'),
+        'GMD' => __('Gambian Dalasi', 'invoicing'),
+        'GNF' => __('Guinean Franc', 'invoicing'),
+        'GTQ' => __('Guatemalan Quetzal', 'invoicing'),
+        'GYD' => __('Guyanese Dollar', 'invoicing'),
+        'HKD' => __('Hong Kong Dollar', 'invoicing'),
+        'HNL' => __('Honduran Lempira', 'invoicing'),
+        'HRK' => __('Croatian Kuna', 'invoicing'),
+        'HTG' => __('Haitian Gourde', 'invoicing'),
+        'HUF' => __('Hungarian Forint', 'invoicing'),
+        'IDR' => __('Indonesian Rupiah', 'invoicing'),
+        'ILS' => __('Israeli New Shekel', 'invoicing'),
+        'IMP' => __('Manx Pound', 'invoicing'),
+        'INR' => __('Indian Rupee', 'invoicing'),
+        'IQD' => __('Iraqi Dinar', 'invoicing'),
+        'IRR' => __('Iranian Rial', 'invoicing'),
+        'IRT' => __('Iranian Toman', 'invoicing'),
+        'ISK' => __('Icelandic Krona', 'invoicing'),
+        'JEP' => __('Jersey Pound', 'invoicing'),
+        'JMD' => __('Jamaican Dollar', 'invoicing'),
+        'JOD' => __('Jordanian Dinar', 'invoicing'),
+        'JPY' => __('Japanese Yen', 'invoicing'),
+        'KES' => __('Kenyan Shilling', 'invoicing'),
+        'KGS' => __('Kyrgyzstani Som', 'invoicing'),
+        'KHR' => __('Cambodian Riel', 'invoicing'),
+        'KMF' => __('Comorian Franc', 'invoicing'),
+        'KPW' => __('North Korean Won', 'invoicing'),
+        'KRW' => __('South Korean Won', 'invoicing'),
+        'KWD' => __('Kuwaiti Dinar', 'invoicing'),
+        'KYD' => __('Cayman Islands Dollar', 'invoicing'),
+        'KZT' => __('Kazakhstani Tenge', 'invoicing'),
+        'LAK' => __('Lao Kip', 'invoicing'),
+        'LBP' => __('Lebanese Pound', 'invoicing'),
+        'LKR' => __('Sri Lankan Rupee', 'invoicing'),
+        'LRD' => __('Liberian Dollar', 'invoicing'),
+        'LSL' => __('Lesotho Loti', 'invoicing'),
+        'LYD' => __('Libyan Dinar', 'invoicing'),
+        'MAD' => __('Moroccan Dirham', 'invoicing'),
+        'MDL' => __('Moldovan Leu', 'invoicing'),
+        'MGA' => __('Malagasy Ariary', 'invoicing'),
+        'MKD' => __('Macedonian Denar', 'invoicing'),
+        'MMK' => __('Burmese Kyat', 'invoicing'),
+        'MNT' => __('Mongolian Tughrik', 'invoicing'),
+        'MOP' => __('Macanese Pataca', 'invoicing'),
+        'MRO' => __('Mauritanian Ouguiya', 'invoicing'),
+        'MUR' => __('Mauritian Rupee', 'invoicing'),
+        'MVR' => __('Maldivian Rufiyaa', 'invoicing'),
+        'MWK' => __('Malawian Kwacha', 'invoicing'),
+        'MXN' => __('Mexican Peso', 'invoicing'),
+        'MYR' => __('Malaysian Ringgit', 'invoicing'),
+        'MZN' => __('Mozambican Metical', 'invoicing'),
+        'NAD' => __('Namibian Dollar', 'invoicing'),
+        'NGN' => __('Nigerian Naira', 'invoicing'),
+        'NIO' => __('Nicaraguan Cordoba', 'invoicing'),
+        'NOK' => __('Norwegian Krone', 'invoicing'),
+        'NPR' => __('Nepalese Rupee', 'invoicing'),
+        'NZD' => __('New Zealand Dollar', 'invoicing'),
+        'OMR' => __('Omani Rial', 'invoicing'),
+        'PAB' => __('Panamanian Balboa', 'invoicing'),
+        'PEN' => __('Peruvian Nuevo Sol', 'invoicing'),
+        'PGK' => __('Papua New Guinean Kina', 'invoicing'),
+        'PHP' => __('Philippine Peso', 'invoicing'),
+        'PKR' => __('Pakistani Rupee', 'invoicing'),
+        'PLN' => __('Polish Zloty', 'invoicing'),
+        'PRB' => __('Transnistrian Ruble', 'invoicing'),
+        'PYG' => __('Paraguayan Guarani', 'invoicing'),
+        'QAR' => __('Qatari Riyal', 'invoicing'),
+        'RON' => __('Romanian Leu', 'invoicing'),
+        'RSD' => __('Serbian Dinar', 'invoicing'),
+        'RUB' => __('Russian Ruble', 'invoicing'),
+        'RWF' => __('Rwandan Franc', 'invoicing'),
+        'SAR' => __('Saudi Riyal', 'invoicing'),
+        'SBD' => __('Solomon Islands Dollar', 'invoicing'),
+        'SCR' => __('Seychellois Rupee', 'invoicing'),
+        'SDG' => __('Sudanese Pound', 'invoicing'),
+        'SEK' => __('Swedish Krona', 'invoicing'),
+        'SGD' => __('Singapore Dollar', 'invoicing'),
+        'SHP' => __('Saint Helena Pound', 'invoicing'),
+        'SLL' => __('Sierra Leonean Leone', 'invoicing'),
+        'SOS' => __('Somali Shilling', 'invoicing'),
+        'SRD' => __('Surinamese Dollar', 'invoicing'),
+        'SSP' => __('South Sudanese Pound', 'invoicing'),
+        'STD' => __('Sao Tomean Dobra', 'invoicing'),
+        'SYP' => __('Syrian Pound', 'invoicing'),
+        'SZL' => __('Swazi Lilangeni', 'invoicing'),
+        'THB' => __('Thai Baht', 'invoicing'),
+        'TJS' => __('Tajikistani Somoni', 'invoicing'),
+        'TMT' => __('Turkmenistan Manat', 'invoicing'),
+        'TND' => __('Tunisian Dinar', 'invoicing'),
+        'TOP' => __('Tongan Pa&#x2bb;anga', 'invoicing'),
+        'TRY' => __('Turkish Lira', 'invoicing'),
+        'TTD' => __('Trinidad and Tobago Dollar', 'invoicing'),
+        'TWD' => __('New Taiwan Dollar', 'invoicing'),
+        'TZS' => __('Tanzanian Shilling', 'invoicing'),
+        'UAH' => __('Ukrainian Hryvnia', 'invoicing'),
+        'UGX' => __('Ugandan Shilling', 'invoicing'),
+        'UYU' => __('Uruguayan Peso', 'invoicing'),
+        'UZS' => __('Uzbekistani Som', 'invoicing'),
+        'VEF' => __('Venezuelan Bol&iacute;var', 'invoicing'),
+        'VND' => __('Vietnamese Dong', 'invoicing'),
+        'VUV' => __('Vanuatu Vatu', 'invoicing'),
+        'WST' => __('Samoan Tala', 'invoicing'),
+        'XAF' => __('Central African CFA Franc', 'invoicing'),
+        'XCD' => __('East Caribbean Dollar', 'invoicing'),
+        'XOF' => __('West African CFA Franc', 'invoicing'),
+        'XPF' => __('CFP Franc', 'invoicing'),
+        'YER' => __('Yemeni Rial', 'invoicing'),
+        'ZAR' => __('South African Rand', 'invoicing'),
+        'ZMW' => __('Zambian Kwacha', 'invoicing'),
     );
     
     //asort( $currencies ); // this
 
-    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();
     }
 
@@ -505,14 +505,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" :
@@ -524,15 +524,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" :
@@ -543,83 +543,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;
@@ -635,32 +635,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;
         }
     }
@@ -668,65 +668,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;
@@ -735,18 +735,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;
@@ -755,22 +755,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];
     }
 
@@ -790,12 +790,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;
 }
 
 /**
@@ -807,28 +807,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);
 }
 
 /**
@@ -842,12 +842,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);
 }
 
 /**
@@ -861,12 +861,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);
 }
 
 /**
@@ -881,16 +881,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);
 }
 
 /**
@@ -902,48 +902,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;
         }
     }
@@ -951,14 +951,14 @@ 
     return $period;
 }
 
-function wpinv_cal_days_in_month( $calendar, $month, $year ) {
-    if ( function_exists( 'cal_days_in_month' ) ) {
-        return cal_days_in_month( $calendar, $month, $year );
+function wpinv_cal_days_in_month($calendar, $month, $year) {
+    if (function_exists('cal_days_in_month')) {
+        return cal_days_in_month($calendar, $month, $year);
     }
 
     // Fallback in case the calendar extension is not loaded in PHP
     // Only supports Gregorian calendar
-    return date( 't', mktime( 0, 0, 0, $month, 1, $year ) );
+    return date('t', mktime(0, 0, 0, $month, 1, $year));
 }
 
 /**
@@ -969,11 +969,11 @@ 
  *
  * @return string
  */
-function wpi_help_tip( $tip, $allow_html = false ) {
-    if ( $allow_html ) {
-        $tip = wpi_sanitize_tooltip( $tip );
+function wpi_help_tip($tip, $allow_html = false) {
+    if ($allow_html) {
+        $tip = wpi_sanitize_tooltip($tip);
     } else {
-        $tip = esc_attr( $tip );
+        $tip = esc_attr($tip);
     }
 
     return '<span class="wpi-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
@@ -987,8 +987,8 @@ 
  * @param string $var
  * @return string
  */
-function wpi_sanitize_tooltip( $var ) {
-    return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+function wpi_sanitize_tooltip($var) {
+    return htmlspecialchars(wp_kses(html_entity_decode($var), array(
         'br'     => array(),
         'em'     => array(),
         'strong' => array(),
@@ -998,7 +998,7 @@ 
         'li'     => array(),
         'ol'     => array(),
         'p'      => array(),
-    ) ) );
+    )));
 }
 
 /**
@@ -1008,7 +1008,7 @@ 
  */
 function wpinv_get_screen_ids() {
 
-    $screen_id = sanitize_title( __( 'Invoicing', 'invoicing' ) );
+    $screen_id = sanitize_title(__('Invoicing', 'invoicing'));
 
     $screen_ids = array(
         'toplevel_page_' . $screen_id,
@@ -1026,7 +1026,7 @@ 
         'invoicing_page_wpi-addons',
     );
 
-    return apply_filters( 'wpinv_screen_ids', $screen_ids );
+    return apply_filters('wpinv_screen_ids', $screen_ids);
 }
 
 /**
@@ -1037,9 +1037,9 @@ 
  * @param array|string $list List of values.
  * @return array Sanitized array of values.
  */
-function wpinv_parse_list( $list ) {
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+function wpinv_parse_list($list) {
+	if (!is_array($list)) {
+		return preg_split('/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY);
 	}
 
 	return $list;
@@ -1053,16 +1053,16 @@ 
  * @param string $key Type of data to fetch.
  * @return mixed Fetched data.
  */
-function wpinv_get_data( $key ) {
+function wpinv_get_data($key) {
     
     // Try fetching it from the cache.
-    $data = wp_cache_get( "wpinv-$key", 'wpinv' );
-    if( $data ) {
+    $data = wp_cache_get("wpinv-$key", 'wpinv');
+    if ($data) {
         return $data;
     }
 
-    $data = apply_filters( "wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php" );
-	wp_cache_set( "wpinv-$key", $data, 'wpinv' );
+    $data = apply_filters("wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php");
+	wp_cache_set("wpinv-$key", $data, 'wpinv');
 
 	return $data;
 }
@@ -1076,10 +1076,10 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return mixed Fetched data.
  */
-function wpinv_maybe_add_empty_option( $options, $first_empty ) {
+function wpinv_maybe_add_empty_option($options, $first_empty) {
 
-    if ( ! empty( $options ) && $first_empty ) {
-        return array_merge( array( '' => '' ), $options );
+    if (!empty($options) && $first_empty) {
+        return array_merge(array('' => ''), $options);
     }
     return $options;
 
@@ -1091,19 +1091,19 @@ 
  * @param mixed $var Data to sanitize.
  * @return string|array
  */
-function wpinv_clean( $var ) {
+function wpinv_clean($var) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+	if (is_array($var)) {
+		return array_map('wpinv_clean', $var);
     }
 
-    if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+    if (is_object($var)) {
+		$object_vars = get_object_vars($var);
+		foreach ($object_vars as $property_name => $property_value) {
+			$var->$property_name = wpinv_clean($property_value);
         }
         return $var;
 	}
     
-    return is_string( $var ) ? sanitize_text_field( $var ) : $var;
+    return is_string($var) ? sanitize_text_field($var) : $var;
 }
\ No newline at end of file