AyeCode / invoicing

includes/wpinv-invoice-functions.php

Spacing +758 added lines, -758 removed lines

@@ -7,14 +7,14 @@ 
  */
  
 // 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_invoice_cart_id() {
     $wpinv_checkout = wpinv_get_checkout_session();
     
-    if ( !empty( $wpinv_checkout['invoice_id'] ) ) {
+    if (!empty($wpinv_checkout['invoice_id'])) {
         return $wpinv_checkout['invoice_id'];
     }
     
@@ -28,27 +28,27 @@ 
  * @param  bool          $wp_error       Whether to return false or WP_Error on failure.
  * @return mixed         The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_insert_invoice( $invoice_data = array(), $wp_error = false ) {
-    if ( empty( $invoice_data ) ) {
+function wpinv_insert_invoice($invoice_data = array(), $wp_error = false) {
+    if (empty($invoice_data)) {
         return false;
     }
     
-    if ( !( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) ) ) {
-        return $wp_error ? new WP_Error( 'wpinv_invalid_items', __( 'Invoice must have atleast one item.', 'invoicing' ) ) : 0;
+    if (!(!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details']))) {
+        return $wp_error ? new WP_Error('wpinv_invalid_items', __('Invoice must have atleast one item.', 'invoicing')) : 0;
     }
     
     // If no user id is provided, default to the current user id
-    if ( empty( $invoice_data['user_id'] ) ) {
+    if (empty($invoice_data['user_id'])) {
         $invoice_data['user_id'] = get_current_user_id();
     }
     
-    $invoice_data['invoice_id'] = !empty( $invoice_data['invoice_id'] ) ? (int)$invoice_data['invoice_id'] : 0;
+    $invoice_data['invoice_id'] = !empty($invoice_data['invoice_id']) ? (int)$invoice_data['invoice_id'] : 0;
     
-    if ( empty( $invoice_data['status'] ) ) {
+    if (empty($invoice_data['status'])) {
         $invoice_data['status'] = 'wpi-pending';
     }
     
-    if ( empty( $invoice_data['ip'] ) ) {
+    if (empty($invoice_data['ip'])) {
         $invoice_data['ip'] = wpinv_get_ip();
     }
 
@@ -59,12 +59,12 @@ 
         'status'        => $invoice_data['status'],
     );
 
-    $invoice = wpinv_create_invoice( $default_args, $invoice_data, true );
-    if ( is_wp_error( $invoice ) ) {
+    $invoice = wpinv_create_invoice($default_args, $invoice_data, true);
+    if (is_wp_error($invoice)) {
         return $wp_error ? $invoice : 0;
     }
     
-    if ( empty( $invoice_data['invoice_id'] ) ) {
+    if (empty($invoice_data['invoice_id'])) {
         //$invoice->add_note( wp_sprintf( __( 'Invoice is created with status %s.', 'invoicing' ), wpinv_status_nicename( $invoice->status ) ) );
     }
     
@@ -87,24 +87,24 @@ 
         'discount'              => array(),
     );
 
-    if ( $user_id = (int)$invoice->get_user_id() ) {
-        if ( $user_address = wpinv_get_user_address( $user_id ) ) {
-            $default_user_info = wp_parse_args( $user_address, $default_user_info );
+    if ($user_id = (int)$invoice->get_user_id()) {
+        if ($user_address = wpinv_get_user_address($user_id)) {
+            $default_user_info = wp_parse_args($user_address, $default_user_info);
         }
     }
     
-    if ( empty( $invoice_data['user_info'] ) ) {
+    if (empty($invoice_data['user_info'])) {
         $invoice_data['user_info'] = array();
     }
     
-    $user_info = wp_parse_args( $invoice_data['user_info'], $default_user_info );
+    $user_info = wp_parse_args($invoice_data['user_info'], $default_user_info);
     
-    if ( empty( $user_info['first_name'] ) ) {
+    if (empty($user_info['first_name'])) {
         $user_info['first_name'] = $default_user_info['first_name'];
         $user_info['last_name'] = $default_user_info['last_name'];
     }
     
-    if ( empty( $user_info['country'] ) ) {
+    if (empty($user_info['country'])) {
         $user_info['country'] = $default_user_info['country'];
         $user_info['state'] = $default_user_info['state'];
         $user_info['city'] = $default_user_info['city'];
@@ -113,13 +113,13 @@ 
         $user_info['phone'] = $default_user_info['phone'];
     }
     
-    if ( !empty( $user_info['discount'] ) && !is_array( $user_info['discount'] ) ) {
+    if (!empty($user_info['discount']) && !is_array($user_info['discount'])) {
         $user_info['discount'] = (array)$user_info['discount'];
     }
 
     // Payment details
     $payment_details = array();
-    if ( !empty( $invoice_data['payment_details'] ) ) {
+    if (!empty($invoice_data['payment_details'])) {
         $default_payment_details = array(
             'gateway'           => 'manual',
             'gateway_title'     => '',
@@ -127,56 +127,56 @@ 
             'transaction_id'    => '',
         );
         
-        $payment_details = wp_parse_args( $invoice_data['payment_details'], $default_payment_details );
+        $payment_details = wp_parse_args($invoice_data['payment_details'], $default_payment_details);
         
-        if ( empty( $payment_details['gateway'] ) ) {
+        if (empty($payment_details['gateway'])) {
             $payment_details['gateway'] = 'manual';
         }
         
-        if ( empty( $payment_details['currency'] ) ) {
+        if (empty($payment_details['currency'])) {
             $payment_details['currency'] = wpinv_get_default_country();
         }
         
-        if ( empty( $payment_details['gateway_title'] ) ) {
-            $payment_details['gateway_title'] = wpinv_get_gateway_checkout_label( $payment_details['gateway'] );
+        if (empty($payment_details['gateway_title'])) {
+            $payment_details['gateway_title'] = wpinv_get_gateway_checkout_label($payment_details['gateway']);
         }
     }
     
-    $invoice->set( 'status', ( !empty( $invoice_data['status'] ) ? $invoice_data['status'] : 'wpi-pending' ) );
-    
-    if ( !empty( $payment_details ) ) {
-        $invoice->set( 'currency', $payment_details['currency'] );
-        $invoice->set( 'gateway', $payment_details['gateway'] );
-        $invoice->set( 'gateway_title', $payment_details['gateway_title'] );
-        $invoice->set( 'transaction_id', $payment_details['transaction_id'] );
-    }
-    
-    $invoice->set( 'user_info', $user_info );
-    $invoice->set( 'first_name', $user_info['first_name'] );
-    $invoice->set( 'last_name', $user_info['last_name'] );
-    $invoice->set( 'address', $user_info['address'] );
-    $invoice->set( 'company', $user_info['company'] );
-    $invoice->set( 'vat_number', $user_info['vat_number'] );
-    $invoice->set( 'phone', $user_info['phone'] );
-    $invoice->set( 'city', $user_info['city'] );
-    $invoice->set( 'country', $user_info['country'] );
-    $invoice->set( 'state', $user_info['state'] );
-    $invoice->set( 'zip', $user_info['zip'] );
-    $invoice->set( 'discounts', $user_info['discount'] );
-    $invoice->set( 'ip', ( !empty( $invoice_data['ip'] ) ? $invoice_data['ip'] : wpinv_get_ip() ) );
-    $invoice->set( 'mode', ( wpinv_is_test_mode() ? 'test' : 'live' ) );
-    $invoice->set( 'parent_invoice', ( !empty( $invoice_data['parent'] ) ? absint( $invoice_data['parent'] ) : '' ) );
-    
-    if ( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) ) {
-        foreach ( $invoice_data['cart_details'] as $key => $item ) {
-            $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-            $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-            $name           = !empty( $item['name'] ) ? $item['name'] : '';
-            $item_price     = isset( $item['item_price'] ) ? $item['item_price'] : '';
+    $invoice->set('status', (!empty($invoice_data['status']) ? $invoice_data['status'] : 'wpi-pending'));
+    
+    if (!empty($payment_details)) {
+        $invoice->set('currency', $payment_details['currency']);
+        $invoice->set('gateway', $payment_details['gateway']);
+        $invoice->set('gateway_title', $payment_details['gateway_title']);
+        $invoice->set('transaction_id', $payment_details['transaction_id']);
+    }
+    
+    $invoice->set('user_info', $user_info);
+    $invoice->set('first_name', $user_info['first_name']);
+    $invoice->set('last_name', $user_info['last_name']);
+    $invoice->set('address', $user_info['address']);
+    $invoice->set('company', $user_info['company']);
+    $invoice->set('vat_number', $user_info['vat_number']);
+    $invoice->set('phone', $user_info['phone']);
+    $invoice->set('city', $user_info['city']);
+    $invoice->set('country', $user_info['country']);
+    $invoice->set('state', $user_info['state']);
+    $invoice->set('zip', $user_info['zip']);
+    $invoice->set('discounts', $user_info['discount']);
+    $invoice->set('ip', (!empty($invoice_data['ip']) ? $invoice_data['ip'] : wpinv_get_ip()));
+    $invoice->set('mode', (wpinv_is_test_mode() ? 'test' : 'live'));
+    $invoice->set('parent_invoice', (!empty($invoice_data['parent']) ? absint($invoice_data['parent']) : ''));
+    
+    if (!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details'])) {
+        foreach ($invoice_data['cart_details'] as $key => $item) {
+            $item_id        = !empty($item['id']) ? $item['id'] : 0;
+            $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+            $name           = !empty($item['name']) ? $item['name'] : '';
+            $item_price     = isset($item['item_price']) ? $item['item_price'] : '';
             
-            $post_item  = new WPInv_Item( $item_id );
-            if ( !empty( $post_item ) ) {
-                $name       = !empty( $name ) ? $name : $post_item->get_name();
+            $post_item = new WPInv_Item($item_id);
+            if (!empty($post_item)) {
+                $name       = !empty($name) ? $name : $post_item->get_name();
                 $item_price = $item_price !== '' ? $item_price : $post_item->get_price();
             } else {
                 continue;
@@ -186,253 +186,253 @@ 
                 'name'          => $name,
                 'quantity'      => $quantity,
                 'item_price'    => $item_price,
-                'custom_price'  => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
-                'tax'           => !empty( $item['tax'] ) ? $item['tax'] : 0.00,
-                'discount'      => isset( $item['discount'] ) ? $item['discount'] : 0,
-                'meta'          => isset( $item['meta'] ) ? $item['meta'] : array(),
-                'fees'          => isset( $item['fees'] ) ? $item['fees'] : array(),
+                'custom_price'  => isset($item['custom_price']) ? $item['custom_price'] : '',
+                'tax'           => !empty($item['tax']) ? $item['tax'] : 0.00,
+                'discount'      => isset($item['discount']) ? $item['discount'] : 0,
+                'meta'          => isset($item['meta']) ? $item['meta'] : array(),
+                'fees'          => isset($item['fees']) ? $item['fees'] : array(),
             );
 
-            $invoice->add_item( $item_id, $args );
+            $invoice->add_item($item_id, $args);
         }
     }
 
-    $invoice->increase_tax( wpinv_get_cart_fee_tax() );
+    $invoice->increase_tax(wpinv_get_cart_fee_tax());
 
-    if ( isset( $invoice_data['post_date'] ) ) {
-        $invoice->set( 'date', $invoice_data['post_date'] );
+    if (isset($invoice_data['post_date'])) {
+        $invoice->set('date', $invoice_data['post_date']);
     }
     
     // Invoice due date
-    if ( isset( $invoice_data['due_date'] ) ) {
-        $invoice->set( 'due_date', $invoice_data['due_date'] );
+    if (isset($invoice_data['due_date'])) {
+        $invoice->set('due_date', $invoice_data['due_date']);
     }
     
     $invoice->save();
     
     // Add notes
-    if ( !empty( $invoice_data['private_note'] ) ) {
-        $invoice->add_note( $invoice_data['private_note'] );
+    if (!empty($invoice_data['private_note'])) {
+        $invoice->add_note($invoice_data['private_note']);
     }
-    if ( !empty( $invoice_data['user_note'] ) ) {
-        $invoice->add_note( $invoice_data['user_note'], true );
+    if (!empty($invoice_data['user_note'])) {
+        $invoice->add_note($invoice_data['user_note'], true);
     }
     
-    do_action( 'wpinv_insert_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_insert_invoice', $invoice->ID, $invoice_data);
 
-    if ( ! empty( $invoice->ID ) ) {
+    if (!empty($invoice->ID)) {
         global $wpi_userID, $wpinv_ip_address_country;
         
         $checkout_session = wpinv_get_checkout_session();
         
         $data_session                   = array();
         $data_session['invoice_id']     = $invoice->ID;
-        $data_session['cart_discounts'] = $invoice->get_discounts( true );
+        $data_session['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data_session );
+        wpinv_set_checkout_session($data_session);
         
         $wpi_userID         = (int)$invoice->get_user_id();
         
-        $_POST['country']   = !empty( $invoice->country ) ? $invoice->country : wpinv_get_default_country();
+        $_POST['country']   = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
         $_POST['state']     = $invoice->state;
 
-        $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-        $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->set('country', sanitize_text_field($_POST['country']));
+        $invoice->set('state', sanitize_text_field($_POST['state']));
         
         $wpinv_ip_address_country = $invoice->country;
         
-        $invoice = $invoice->recalculate_totals( true );
+        $invoice = $invoice->recalculate_totals(true);
         
-        wpinv_set_checkout_session( $checkout_session );
+        wpinv_set_checkout_session($checkout_session);
                     
         return $invoice;
     }
     
-    if ( $wp_error ) {
-        if ( is_wp_error( $invoice ) ) {
+    if ($wp_error) {
+        if (is_wp_error($invoice)) {
             return $invoice;
         } else {
-            return new WP_Error( 'wpinv_insert_invoice_error', __( 'Error in insert invoice.', 'invoicing' ) );
+            return new WP_Error('wpinv_insert_invoice_error', __('Error in insert invoice.', 'invoicing'));
         }
     } else {
         return 0;
     }
 }
 
-function wpinv_update_invoice( $invoice_data = array(), $wp_error = false ) {
-    $invoice_ID = !empty( $invoice_data['ID'] ) ? absint( $invoice_data['ID'] ) : NULL;
+function wpinv_update_invoice($invoice_data = array(), $wp_error = false) {
+    $invoice_ID = !empty($invoice_data['ID']) ? absint($invoice_data['ID']) : NULL;
 
-    if ( !$invoice_ID ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice_id', __( 'Invalid invoice ID.', 'invoicing' ) );
+    if (!$invoice_ID) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice_id', __('Invalid invoice ID.', 'invoicing'));
         }
         return 0;
     }
 
-    $invoice = wpinv_get_invoice( $invoice_ID );
+    $invoice = wpinv_get_invoice($invoice_ID);
 
-    $recurring_item = $invoice->is_recurring() ? $invoice->get_recurring( true ) : NULL;
+    $recurring_item = $invoice->is_recurring() ? $invoice->get_recurring(true) : NULL;
 
-    if ( empty( $invoice->ID ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice', __( 'Invalid invoice.', 'invoicing' ) );
+    if (empty($invoice->ID)) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice', __('Invalid invoice.', 'invoicing'));
         }
         return 0;
     }
 
-    if ( !$invoice->has_status( array( 'wpi-pending' ) ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice_status', __( 'Only invoice with pending payment is allowed to update.', 'invoicing' ) );
+    if (!$invoice->has_status(array('wpi-pending'))) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice_status', __('Only invoice with pending payment is allowed to update.', 'invoicing'));
         }
         return 0;
     }
 
     // Invoice status
-    if ( !empty( $invoice_data['status'] ) ) {
-        $invoice->set( 'status', $invoice_data['status'] );
+    if (!empty($invoice_data['status'])) {
+        $invoice->set('status', $invoice_data['status']);
     }
 
     // Invoice date
-    if ( !empty( $invoice_data['post_date'] ) ) {
-        $invoice->set( 'date', $invoice_data['post_date'] );
+    if (!empty($invoice_data['post_date'])) {
+        $invoice->set('date', $invoice_data['post_date']);
     }
 
     // Invoice due date
-    if ( isset( $invoice_data['due_date'] ) ) {
-        $invoice->set( 'due_date', $invoice_data['due_date'] );
+    if (isset($invoice_data['due_date'])) {
+        $invoice->set('due_date', $invoice_data['due_date']);
     }
 
     // Invoice IP address
-    if ( !empty( $invoice_data['ip'] ) ) {
-        $invoice->set( 'ip', $invoice_data['ip'] );
+    if (!empty($invoice_data['ip'])) {
+        $invoice->set('ip', $invoice_data['ip']);
     }
     
     // User info
-    if ( !empty( $invoice_data['user_info'] ) && is_array( $invoice_data['user_info'] ) ) {
-        $user_info = wp_parse_args( $invoice_data['user_info'], $invoice->user_info );
+    if (!empty($invoice_data['user_info']) && is_array($invoice_data['user_info'])) {
+        $user_info = wp_parse_args($invoice_data['user_info'], $invoice->user_info);
 
-        if ( $discounts = $invoice->get_discounts() ) {
+        if ($discounts = $invoice->get_discounts()) {
             $set_discount = $discounts;
         } else {
             $set_discount = '';
         }
 
         // Manage discount
-        if ( !empty( $invoice_data['user_info']['discount'] ) ) {
+        if (!empty($invoice_data['user_info']['discount'])) {
             // Remove discount
-            if ( $invoice_data['user_info']['discount'] == 'none' ) {
+            if ($invoice_data['user_info']['discount'] == 'none') {
                 $set_discount = '';
             } else {
                 $set_discount = $invoice_data['user_info']['discount'];
             }
 
-            $invoice->set( 'discounts', $set_discount );
+            $invoice->set('discounts', $set_discount);
         }
 
         $user_info['discount'] = $set_discount;
 
-        $invoice->set( 'user_info', $user_info );
+        $invoice->set('user_info', $user_info);
     }
 
-    if ( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) && $cart_details = $invoice_data['cart_details'] ) {
-        $remove_items = !empty( $cart_details['remove_items'] ) && is_array( $cart_details['remove_items'] ) ? $cart_details['remove_items'] : array();
+    if (!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details']) && $cart_details = $invoice_data['cart_details']) {
+        $remove_items = !empty($cart_details['remove_items']) && is_array($cart_details['remove_items']) ? $cart_details['remove_items'] : array();
 
-        if ( !empty( $remove_items[0]['id'] ) ) {
-            foreach ( $remove_items as $item ) {
-                $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-                $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-                if ( empty( $item_id ) ) {
+        if (!empty($remove_items[0]['id'])) {
+            foreach ($remove_items as $item) {
+                $item_id        = !empty($item['id']) ? $item['id'] : 0;
+                $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+                if (empty($item_id)) {
                     continue;
                 }
 
-                foreach ( $invoice->cart_details as $cart_index => $cart_item ) {
-                    if ( $item_id == $cart_item['id'] ) {
+                foreach ($invoice->cart_details as $cart_index => $cart_item) {
+                    if ($item_id == $cart_item['id']) {
                         $args = array(
                             'id'         => $item_id,
                             'quantity'   => $quantity,
                             'cart_index' => $cart_index
                         );
 
-                        $invoice->remove_item( $item_id, $args );
+                        $invoice->remove_item($item_id, $args);
                         break;
                     }
                 }
             }
         }
 
-        $add_items = !empty( $cart_details['add_items'] ) && is_array( $cart_details['add_items'] ) ? $cart_details['add_items'] : array();
+        $add_items = !empty($cart_details['add_items']) && is_array($cart_details['add_items']) ? $cart_details['add_items'] : array();
 
-        if ( !empty( $add_items[0]['id'] ) ) {
-            foreach ( $add_items as $item ) {
-                $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-                $post_item      = new WPInv_Item( $item_id );
-                if ( empty( $post_item ) ) {
+        if (!empty($add_items[0]['id'])) {
+            foreach ($add_items as $item) {
+                $item_id        = !empty($item['id']) ? $item['id'] : 0;
+                $post_item      = new WPInv_Item($item_id);
+                if (empty($post_item)) {
                     continue;
                 }
 
                 $valid_item = true;
-                if ( !empty( $recurring_item ) ) {
-                    if ( $recurring_item->ID != $item_id ) {
+                if (!empty($recurring_item)) {
+                    if ($recurring_item->ID != $item_id) {
                         $valid_item = false;
                     }
-                } else if ( wpinv_is_recurring_item( $item_id ) ) {
+                } else if (wpinv_is_recurring_item($item_id)) {
                     $valid_item = false;
                 }
                 
-                if ( !$valid_item ) {
-                    if ( $wp_error ) {
-                        return new WP_Error( 'invalid_invoice_item', __( 'You can not add item because recurring item must be paid individually!', 'invoicing' ) );
+                if (!$valid_item) {
+                    if ($wp_error) {
+                        return new WP_Error('invalid_invoice_item', __('You can not add item because recurring item must be paid individually!', 'invoicing'));
                     }
                     return 0;
                 }
 
-                $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-                $name           = !empty( $item['name'] ) ? $item['name'] : $post_item->get_name();
-                $item_price     = isset( $item['item_price'] ) ? $item['item_price'] : $post_item->get_price();
+                $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+                $name           = !empty($item['name']) ? $item['name'] : $post_item->get_name();
+                $item_price     = isset($item['item_price']) ? $item['item_price'] : $post_item->get_price();
 
                 $args = array(
                     'name'          => $name,
                     'quantity'      => $quantity,
                     'item_price'    => $item_price,
-                    'custom_price'  => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
-                    'tax'           => !empty( $item['tax'] ) ? $item['tax'] : 0,
-                    'discount'      => isset( $item['discount'] ) ? $item['discount'] : 0,
-                    'meta'          => isset( $item['meta'] ) ? $item['meta'] : array(),
-                    'fees'          => isset( $item['fees'] ) ? $item['fees'] : array(),
+                    'custom_price'  => isset($item['custom_price']) ? $item['custom_price'] : '',
+                    'tax'           => !empty($item['tax']) ? $item['tax'] : 0,
+                    'discount'      => isset($item['discount']) ? $item['discount'] : 0,
+                    'meta'          => isset($item['meta']) ? $item['meta'] : array(),
+                    'fees'          => isset($item['fees']) ? $item['fees'] : array(),
                 );
 
-                $invoice->add_item( $item_id, $args );
+                $invoice->add_item($item_id, $args);
             }
         }
     }
     
     // Payment details
-    if ( !empty( $invoice_data['payment_details'] ) && $payment_details = $invoice_data['payment_details'] ) {
-        if ( !empty( $payment_details['gateway'] ) ) {
-            $invoice->set( 'gateway', $payment_details['gateway'] );
+    if (!empty($invoice_data['payment_details']) && $payment_details = $invoice_data['payment_details']) {
+        if (!empty($payment_details['gateway'])) {
+            $invoice->set('gateway', $payment_details['gateway']);
         }
 
-        if ( !empty( $payment_details['transaction_id'] ) ) {
-            $invoice->set( 'transaction_id', $payment_details['transaction_id'] );
+        if (!empty($payment_details['transaction_id'])) {
+            $invoice->set('transaction_id', $payment_details['transaction_id']);
         }
     }
 
-    do_action( 'wpinv_pre_update_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_pre_update_invoice', $invoice->ID, $invoice_data);
 
     // Parent invoice
-    if ( !empty( $invoice_data['parent'] ) ) {
-        $invoice->set( 'parent_invoice', $invoice_data['parent'] );
+    if (!empty($invoice_data['parent'])) {
+        $invoice->set('parent_invoice', $invoice_data['parent']);
     }
 
     // Save invoice data.
     $invoice->save();
     
-    if ( empty( $invoice->ID ) || is_wp_error( $invoice ) ) {
-        if ( $wp_error ) {
-            if ( is_wp_error( $invoice ) ) {
+    if (empty($invoice->ID) || is_wp_error($invoice)) {
+        if ($wp_error) {
+            if (is_wp_error($invoice)) {
                 return $invoice;
             } else {
-                return new WP_Error( 'wpinv_update_invoice_error', __( 'Error in update invoice.', 'invoicing' ) );
+                return new WP_Error('wpinv_update_invoice_error', __('Error in update invoice.', 'invoicing'));
             }
         } else {
             return 0;
@@ -440,13 +440,13 @@ 
     }
 
     // Add private note
-    if ( !empty( $invoice_data['private_note'] ) ) {
-        $invoice->add_note( $invoice_data['private_note'] );
+    if (!empty($invoice_data['private_note'])) {
+        $invoice->add_note($invoice_data['private_note']);
     }
 
     // Add user note
-    if ( !empty( $invoice_data['user_note'] ) ) {
-        $invoice->add_note( $invoice_data['user_note'], true );
+    if (!empty($invoice_data['user_note'])) {
+        $invoice->add_note($invoice_data['user_note'], true);
     }
 
     global $wpi_userID, $wpinv_ip_address_country;
@@ -455,450 +455,450 @@ 
 
     $data_session                   = array();
     $data_session['invoice_id']     = $invoice->ID;
-    $data_session['cart_discounts'] = $invoice->get_discounts( true );
+    $data_session['cart_discounts'] = $invoice->get_discounts(true);
 
-    wpinv_set_checkout_session( $data_session );
+    wpinv_set_checkout_session($data_session);
 
     $wpi_userID         = (int)$invoice->get_user_id();
 
-    $_POST['country']   = !empty( $invoice->country ) ? $invoice->country : wpinv_get_default_country();
+    $_POST['country']   = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
     $_POST['state']     = $invoice->state;
 
-    $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-    $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+    $invoice->set('country', sanitize_text_field($_POST['country']));
+    $invoice->set('state', sanitize_text_field($_POST['state']));
 
     $wpinv_ip_address_country = $invoice->country;
 
-    $invoice = $invoice->recalculate_totals( true );
+    $invoice = $invoice->recalculate_totals(true);
 
-    do_action( 'wpinv_post_update_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_post_update_invoice', $invoice->ID, $invoice_data);
 
-    wpinv_set_checkout_session( $checkout_session );
+    wpinv_set_checkout_session($checkout_session);
 
     return $invoice;
 }
 
-function wpinv_get_invoice( $invoice_id = 0, $cart = false ) {
-    if ( $cart && empty( $invoice_id ) ) {
+function wpinv_get_invoice($invoice_id = 0, $cart = false) {
+    if ($cart && empty($invoice_id)) {
         $invoice_id = (int)wpinv_get_invoice_cart_id();
     }
 
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    if ( ! empty( $invoice ) && ! empty( $invoice->ID ) ) {
+    if (!empty($invoice) && !empty($invoice->ID)) {
         return $invoice;
     }
     
     return NULL;
 }
 
-function wpinv_get_invoice_cart( $invoice_id = 0 ) {
-    return wpinv_get_invoice( $invoice_id, true );
+function wpinv_get_invoice_cart($invoice_id = 0) {
+    return wpinv_get_invoice($invoice_id, true);
 }
 
-function wpinv_get_invoice_description( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_description($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_description();
 }
 
-function wpinv_get_invoice_currency_code( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_currency_code($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_currency();
 }
 
-function wpinv_get_payment_user_email( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_user_email($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_email();
 }
 
-function wpinv_get_user_id( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_user_id($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_user_id();
 }
 
-function wpinv_get_invoice_status( $invoice_id, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_status($invoice_id, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->get_status( $return_label );
+    return $invoice->get_status($return_label);
 }
 
-function wpinv_get_payment_gateway( $invoice_id, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_gateway($invoice_id, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->get_gateway( $return_label );
+    return $invoice->get_gateway($return_label);
 }
 
-function wpinv_get_payment_gateway_name( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_gateway_name($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->get_gateway_title();
 }
 
-function wpinv_get_payment_transaction_id( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_transaction_id($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->get_transaction_id();
 }
 
-function wpinv_get_id_by_transaction_id( $key ) {
+function wpinv_get_id_by_transaction_id($key) {
     global $wpdb;
 
-    $invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = %s LIMIT 1", $key ) );
+    $invoice_id = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = %s LIMIT 1", $key));
 
-    if ( $invoice_id != NULL )
+    if ($invoice_id != NULL)
         return $invoice_id;
 
     return 0;
 }
 
-function wpinv_get_invoice_meta( $invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_meta($invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_meta( $meta_key, $single );
+    return $invoice->get_meta($meta_key, $single);
 }
 
-function wpinv_update_invoice_meta( $invoice_id = 0, $meta_key = '', $meta_value = '', $prev_value = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_update_invoice_meta($invoice_id = 0, $meta_key = '', $meta_value = '', $prev_value = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->update_meta( $meta_key, $meta_value, $prev_value );
+    return $invoice->update_meta($meta_key, $meta_value, $prev_value);
 }
 
-function wpinv_get_items( $invoice_id = 0 ) {
-    $invoice            = wpinv_get_invoice( $invoice_id );
+function wpinv_get_items($invoice_id = 0) {
+    $invoice            = wpinv_get_invoice($invoice_id);
     
     $items              = $invoice->get_items();
     $invoice_currency   = $invoice->get_currency();
 
-    if ( !empty( $items ) && is_array( $items ) ) {
-        foreach ( $items as $key => $item ) {
+    if (!empty($items) && is_array($items)) {
+        foreach ($items as $key => $item) {
             $items[$key]['currency'] = $invoice_currency;
 
-            if ( !isset( $item['subtotal'] ) ) {
+            if (!isset($item['subtotal'])) {
                 $items[$key]['subtotal'] = $items[$key]['amount'] * 1;
             }
         }
     }
 
-    return apply_filters( 'wpinv_get_items', $items, $invoice_id );
+    return apply_filters('wpinv_get_items', $items, $invoice_id);
 }
 
-function wpinv_get_fees( $invoice_id = 0 ) {
-    $invoice           = wpinv_get_invoice( $invoice_id );
+function wpinv_get_fees($invoice_id = 0) {
+    $invoice           = wpinv_get_invoice($invoice_id);
     $fees              = $invoice->get_fees();
 
-    return apply_filters( 'wpinv_get_fees', $fees, $invoice_id );
+    return apply_filters('wpinv_get_fees', $fees, $invoice_id);
 }
 
-function wpinv_get_invoice_ip( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_ip($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_ip();
 }
 
-function wpinv_get_invoice_user_info( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_user_info($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_user_info();
 }
 
-function wpinv_subtotal( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_subtotal($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_subtotal( $currency );
+    return $invoice->get_subtotal($currency);
 }
 
-function wpinv_tax( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_tax($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_tax( $currency );
+    return $invoice->get_tax($currency);
 }
 
-function wpinv_discount( $invoice_id = 0, $currency = false, $dash = false ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_discount($invoice_id = 0, $currency = false, $dash = false) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    return $invoice->get_discount( $currency, $dash );
+    return $invoice->get_discount($currency, $dash);
 }
 
-function wpinv_discount_code( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_discount_code($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
     return $invoice->get_discount_code();
 }
 
-function wpinv_payment_total( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_payment_total($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_total( $currency );
+    return $invoice->get_total($currency);
 }
 
-function wpinv_get_date_created( $invoice_id = 0, $format = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_date_created($invoice_id = 0, $format = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    $format         = !empty( $format ) ? $format : get_option( 'date_format' );
+    $format         = !empty($format) ? $format : get_option('date_format');
     $date_created   = $invoice->get_created_date();
-    $date_created   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n( $format, strtotime( $date_created ) ) : '';
+    $date_created   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n($format, strtotime($date_created)) : '';
 
     return $date_created;
 }
 
-function wpinv_get_invoice_date( $invoice_id = 0, $format = '', $default = true ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_date($invoice_id = 0, $format = '', $default = true) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    $format         = !empty( $format ) ? $format : get_option( 'date_format' );
+    $format         = !empty($format) ? $format : get_option('date_format');
     $date_completed = $invoice->get_completed_date();
-    $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n( $format, strtotime( $date_completed ) ) : '';
-    if ( $invoice_date == '' && $default ) {
-        $invoice_date   = wpinv_get_date_created( $invoice_id, $format );
+    $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n($format, strtotime($date_completed)) : '';
+    if ($invoice_date == '' && $default) {
+        $invoice_date = wpinv_get_date_created($invoice_id, $format);
     }
 
     return $invoice_date;
 }
 
-function wpinv_get_invoice_vat_number( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_vat_number($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->vat_number;
 }
 
-function wpinv_insert_payment_note( $invoice_id = 0, $note = '', $user_type = false, $added_by_user = false, $system = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_insert_payment_note($invoice_id = 0, $note = '', $user_type = false, $added_by_user = false, $system = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->add_note( $note, $user_type, $added_by_user, $system );
+    return $invoice->add_note($note, $user_type, $added_by_user, $system);
 }
 
-function wpinv_get_invoice_notes( $invoice_id = 0, $type = '' ) {
+function wpinv_get_invoice_notes($invoice_id = 0, $type = '') {
     global $invoicing;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return NULL;
     }
     
-    $notes = $invoicing->notes->get_invoice_notes( $invoice_id, $type );
+    $notes = $invoicing->notes->get_invoice_notes($invoice_id, $type);
     
-    return apply_filters( 'wpinv_invoice_notes', $notes, $invoice_id, $type );
+    return apply_filters('wpinv_invoice_notes', $notes, $invoice_id, $type);
 }
 
-function wpinv_get_payment_key( $invoice_id = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_key($invoice_id = 0) {
+	$invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_key();
 }
 
-function wpinv_get_invoice_number( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_number($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_number();
 }
 
-function wpinv_get_cart_discountable_subtotal( $code_id ) {
+function wpinv_get_cart_discountable_subtotal($code_id) {
     $cart_items = wpinv_get_cart_content_details();
     $items      = array();
 
-    $excluded_items = wpinv_get_discount_excluded_items( $code_id );
+    $excluded_items = wpinv_get_discount_excluded_items($code_id);
 
-    if( $cart_items ) {
+    if ($cart_items) {
 
-        foreach( $cart_items as $item ) {
+        foreach ($cart_items as $item) {
 
-            if( ! in_array( $item['id'], $excluded_items ) ) {
-                $items[] =  $item;
+            if (!in_array($item['id'], $excluded_items)) {
+                $items[] = $item;
             }
         }
     }
 
-    $subtotal = wpinv_get_cart_items_subtotal( $items );
+    $subtotal = wpinv_get_cart_items_subtotal($items);
 
-    return apply_filters( 'wpinv_get_cart_discountable_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_discountable_subtotal', $subtotal);
 }
 
-function wpinv_get_cart_items_subtotal( $items ) {
+function wpinv_get_cart_items_subtotal($items) {
     $subtotal = 0.00;
 
-    if ( is_array( $items ) && ! empty( $items ) ) {
-        $prices = wp_list_pluck( $items, 'subtotal' );
+    if (is_array($items) && !empty($items)) {
+        $prices = wp_list_pluck($items, 'subtotal');
 
-        if( is_array( $prices ) ) {
-            $subtotal = array_sum( $prices );
+        if (is_array($prices)) {
+            $subtotal = array_sum($prices);
         } else {
             $subtotal = 0.00;
         }
 
-        if( $subtotal < 0 ) {
+        if ($subtotal < 0) {
             $subtotal = 0.00;
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_items_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_items_subtotal', $subtotal);
 }
 
-function wpinv_get_cart_subtotal( $items = array() ) {
-    $items    = !empty( $items ) ? $items : wpinv_get_cart_content_details();
-    $subtotal = wpinv_get_cart_items_subtotal( $items );
+function wpinv_get_cart_subtotal($items = array()) {
+    $items    = !empty($items) ? $items : wpinv_get_cart_content_details();
+    $subtotal = wpinv_get_cart_items_subtotal($items);
 
-    return apply_filters( 'wpinv_get_cart_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_subtotal', $subtotal);
 }
 
-function wpinv_cart_subtotal( $items = array() ) {
-    $price = wpinv_price( wpinv_format_amount( wpinv_get_cart_subtotal( $items ) ) );
+function wpinv_cart_subtotal($items = array()) {
+    $price = wpinv_price(wpinv_format_amount(wpinv_get_cart_subtotal($items)));
 
     return $price;
 }
 
-function wpinv_get_cart_total( $items = array(), $discounts = false, $invoice = array() ) {
-    $subtotal  = (float)wpinv_get_cart_subtotal( $items );
-    $discounts = (float)wpinv_get_cart_discounted_amount( $items );
-    $cart_tax  = (float)wpinv_get_cart_tax( $items );
+function wpinv_get_cart_total($items = array(), $discounts = false, $invoice = array()) {
+    $subtotal  = (float)wpinv_get_cart_subtotal($items);
+    $discounts = (float)wpinv_get_cart_discounted_amount($items);
+    $cart_tax  = (float)wpinv_get_cart_tax($items);
     $fees      = (float)wpinv_get_cart_fee_total();
-    if ( !empty( $invoice ) && $invoice->is_free_trial() ) {
+    if (!empty($invoice) && $invoice->is_free_trial()) {
         $total = 0;
     } else {
-        $total     = $subtotal - $discounts + $cart_tax + $fees;
+        $total = $subtotal - $discounts + $cart_tax + $fees;
     }
 
-    if ( $total < 0 ) {
+    if ($total < 0) {
         $total = 0.00;
     }
     
-    $total = (float)apply_filters( 'wpinv_get_cart_total', $total, $items );
+    $total = (float)apply_filters('wpinv_get_cart_total', $total, $items);
 
-    return wpinv_sanitize_amount( $total );
+    return wpinv_sanitize_amount($total);
 }
 
-function wpinv_cart_total( $cart_items = array(), $echo = true, $invoice = array() ) {
+function wpinv_cart_total($cart_items = array(), $echo = true, $invoice = array()) {
     global $cart_total;
-    $total = wpinv_price( wpinv_format_amount( wpinv_get_cart_total( $cart_items, NULL, $invoice ) ) );
-    $total = apply_filters( 'wpinv_cart_total', $total, $cart_items, $invoice );
+    $total = wpinv_price(wpinv_format_amount(wpinv_get_cart_total($cart_items, NULL, $invoice)));
+    $total = apply_filters('wpinv_cart_total', $total, $cart_items, $invoice);
     
     $cart_total = $total;
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $total;
     }
 
     echo $total;
 }
 
-function wpinv_get_cart_tax( $items = array() ) {
+function wpinv_get_cart_tax($items = array()) {
     $cart_tax = 0;
-    $items    = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items    = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( $items ) {
-        $taxes = wp_list_pluck( $items, 'tax' );
+    if ($items) {
+        $taxes = wp_list_pluck($items, 'tax');
 
-        if( is_array( $taxes ) ) {
-            $cart_tax = array_sum( $taxes );
+        if (is_array($taxes)) {
+            $cart_tax = array_sum($taxes);
         }
     }
 
     $cart_tax += wpinv_get_cart_fee_tax();
 
-    return apply_filters( 'wpinv_get_cart_tax', wpinv_sanitize_amount( $cart_tax ) );
+    return apply_filters('wpinv_get_cart_tax', wpinv_sanitize_amount($cart_tax));
 }
 
-function wpinv_cart_tax( $items = array(), $echo = false ) {
-    $cart_tax = wpinv_get_cart_tax( $items );
-    $cart_tax = wpinv_price( wpinv_format_amount( $cart_tax ) );
+function wpinv_cart_tax($items = array(), $echo = false) {
+    $cart_tax = wpinv_get_cart_tax($items);
+    $cart_tax = wpinv_price(wpinv_format_amount($cart_tax));
 
-    $tax = apply_filters( 'wpinv_cart_tax', $cart_tax, $items );
+    $tax = apply_filters('wpinv_cart_tax', $cart_tax, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $tax;
     }
 
     echo $tax;
 }
 
-function wpinv_get_cart_discount_code( $items = array() ) {
+function wpinv_get_cart_discount_code($items = array()) {
     $invoice = wpinv_get_invoice_cart();
-    $cart_discount_code = !empty( $invoice ) ? $invoice->get_discount_code() : '';
+    $cart_discount_code = !empty($invoice) ? $invoice->get_discount_code() : '';
     
-    return apply_filters( 'wpinv_get_cart_discount_code', $cart_discount_code );
+    return apply_filters('wpinv_get_cart_discount_code', $cart_discount_code);
 }
 
-function wpinv_cart_discount_code( $items = array(), $echo = false ) {
-    $cart_discount_code = wpinv_get_cart_discount_code( $items );
+function wpinv_cart_discount_code($items = array(), $echo = false) {
+    $cart_discount_code = wpinv_get_cart_discount_code($items);
 
-    if ( $cart_discount_code != '' ) {
+    if ($cart_discount_code != '') {
         $cart_discount_code = ' (' . $cart_discount_code . ')';
     }
     
-    $discount_code = apply_filters( 'wpinv_cart_discount_code', $cart_discount_code, $items );
+    $discount_code = apply_filters('wpinv_cart_discount_code', $cart_discount_code, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $discount_code;
     }
 
     echo $discount_code;
 }
 
-function wpinv_get_cart_discount( $items = array() ) {
+function wpinv_get_cart_discount($items = array()) {
     $invoice = wpinv_get_invoice_cart();
-    $cart_discount = !empty( $invoice ) ? $invoice->get_discount() : 0;
+    $cart_discount = !empty($invoice) ? $invoice->get_discount() : 0;
     
-    return apply_filters( 'wpinv_get_cart_discount', wpinv_sanitize_amount( $cart_discount ), $items );
+    return apply_filters('wpinv_get_cart_discount', wpinv_sanitize_amount($cart_discount), $items);
 }
 
-function wpinv_cart_discount( $items = array(), $echo = false ) {
-    $cart_discount = wpinv_get_cart_discount( $items );
-    $cart_discount = wpinv_price( wpinv_format_amount( $cart_discount ) );
+function wpinv_cart_discount($items = array(), $echo = false) {
+    $cart_discount = wpinv_get_cart_discount($items);
+    $cart_discount = wpinv_price(wpinv_format_amount($cart_discount));
 
-    $discount = apply_filters( 'wpinv_cart_discount', $cart_discount, $items );
+    $discount = apply_filters('wpinv_cart_discount', $cart_discount, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $discount;
     }
 
     echo $discount;
 }
 
-function wpinv_get_cart_fees( $type = 'all', $item_id = 0 ) {
-    $item = new WPInv_Item( $item_id );
+function wpinv_get_cart_fees($type = 'all', $item_id = 0) {
+    $item = new WPInv_Item($item_id);
     
-    return $item->get_fees( $type, $item_id );
+    return $item->get_fees($type, $item_id);
 }
 
 function wpinv_get_cart_fee_total() {
-    $total  = 0;
+    $total = 0;
     $fees = wpinv_get_cart_fees();
     
-    if ( $fees ) {
-        foreach ( $fees as $fee_id => $fee ) {
+    if ($fees) {
+        foreach ($fees as $fee_id => $fee) {
             $total += $fee['amount'];
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_fee_total', $total );
+    return apply_filters('wpinv_get_cart_fee_total', $total);
 }
 
 function wpinv_get_cart_fee_tax() {
     $tax  = 0;
     $fees = wpinv_get_cart_fees();
 
-    if ( $fees ) {
-        foreach ( $fees as $fee_id => $fee ) {
-            if( ! empty( $fee['no_tax'] ) ) {
+    if ($fees) {
+        foreach ($fees as $fee_id => $fee) {
+            if (!empty($fee['no_tax'])) {
                 continue;
             }
 
-            $tax += wpinv_calculate_tax( $fee['amount'] );
+            $tax += wpinv_calculate_tax($fee['amount']);
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_fee_tax', $tax );
+    return apply_filters('wpinv_get_cart_fee_tax', $tax);
 }
 
 function wpinv_cart_has_recurring_item() {
     $cart_items = wpinv_get_cart_contents();
     
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return false;
     }
     
     $has_subscription = false;
-    foreach( $cart_items as $cart_item ) {
-        if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+    foreach ($cart_items as $cart_item) {
+        if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
             $has_subscription = true;
             break;
         }
     }
     
-    return apply_filters( 'wpinv_cart_has_recurring_item', $has_subscription, $cart_items );
+    return apply_filters('wpinv_cart_has_recurring_item', $has_subscription, $cart_items);
 }
 
 function wpinv_cart_has_free_trial() {
@@ -906,97 +906,97 @@ 
     
     $free_trial = false;
     
-    if ( !empty( $invoice ) && $invoice->is_free_trial() ) {
+    if (!empty($invoice) && $invoice->is_free_trial()) {
         $free_trial = true;
     }
     
-    return apply_filters( 'wpinv_cart_has_free_trial', $free_trial, $invoice );
+    return apply_filters('wpinv_cart_has_free_trial', $free_trial, $invoice);
 }
 
 function wpinv_get_cart_contents() {
     $cart_details = wpinv_get_cart_details();
     
-    return apply_filters( 'wpinv_get_cart_contents', $cart_details );
+    return apply_filters('wpinv_get_cart_contents', $cart_details);
 }
 
 function wpinv_get_cart_content_details() {
     global $wpinv_euvat, $wpi_current_id, $wpi_item_id, $wpinv_is_last_cart_item, $wpinv_flat_discount_total;
     $cart_items = wpinv_get_cart_contents();
     
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return false;
     }
     $invoice = wpinv_get_invoice_cart();
-	if ( empty( $invoice ) ) {
+	if (empty($invoice)) {
         return false;
     }
 
     $details = array();
-    $length  = count( $cart_items ) - 1;
+    $length  = count($cart_items) - 1;
     
-    if ( empty( $_POST['country'] ) ) {
+    if (empty($_POST['country'])) {
         $_POST['country'] = $invoice->country;
     }
-    if ( !isset( $_POST['state'] ) ) {
+    if (!isset($_POST['state'])) {
         $_POST['state'] = $invoice->state;
     }
 
-    foreach( $cart_items as $key => $item ) {
-        $item_id            = isset( $item['id'] ) ? sanitize_text_field( $item['id'] ) : '';
-        if ( empty( $item_id ) ) {
+    foreach ($cart_items as $key => $item) {
+        $item_id = isset($item['id']) ? sanitize_text_field($item['id']) : '';
+        if (empty($item_id)) {
             continue;
         }
         
         $wpi_current_id         = $invoice->ID;
         $wpi_item_id            = $item_id;
         
-        if ( isset( $item['custom_price'] ) && $item['custom_price'] !== '' ) {
+        if (isset($item['custom_price']) && $item['custom_price'] !== '') {
             $item_price = $item['custom_price'];
         } else {
-            if ( isset( $item['item_price'] ) && $item['item_price'] !== '' && $item['item_price'] !== false ) {
+            if (isset($item['item_price']) && $item['item_price'] !== '' && $item['item_price'] !== false) {
                 $item_price = $item['item_price'];
             } else {
-                $item_price = wpinv_get_item_price( $item_id );
+                $item_price = wpinv_get_item_price($item_id);
             }
         }
-        $discount           = wpinv_get_cart_item_discount_amount( $item );
-        $discount           = apply_filters( 'wpinv_get_cart_content_details_item_discount_amount', $discount, $item );
-        $quantity           = wpinv_get_cart_item_quantity( $item );
-        $fees               = wpinv_get_cart_fees( 'fee', $item_id );
+        $discount           = wpinv_get_cart_item_discount_amount($item);
+        $discount           = apply_filters('wpinv_get_cart_content_details_item_discount_amount', $discount, $item);
+        $quantity           = wpinv_get_cart_item_quantity($item);
+        $fees               = wpinv_get_cart_fees('fee', $item_id);
         
         $subtotal           = $item_price * $quantity;
-        $tax_rate           = wpinv_get_tax_rate( $_POST['country'], $_POST['state'], $wpi_item_id );
-        $tax_class          = $wpinv_euvat->get_item_class( $item_id );
-        $tax                = wpinv_get_cart_item_tax( $item_id, $subtotal - $discount );
+        $tax_rate           = wpinv_get_tax_rate($_POST['country'], $_POST['state'], $wpi_item_id);
+        $tax_class          = $wpinv_euvat->get_item_class($item_id);
+        $tax                = wpinv_get_cart_item_tax($item_id, $subtotal - $discount);
         
-        if ( wpinv_prices_include_tax() ) {
-            $subtotal -= wpinv_round_amount( $tax );
+        if (wpinv_prices_include_tax()) {
+            $subtotal -= wpinv_round_amount($tax);
         }
         
-        $total              = $subtotal - $discount + $tax;
+        $total = $subtotal - $discount + $tax;
         
         // Do not allow totals to go negatve
-        if( $total < 0 ) {
+        if ($total < 0) {
             $total = 0;
         }
         
-        $details[ $key ]  = array(
+        $details[$key] = array(
             'id'                => $item_id,
-            'name'              => !empty($item['name']) ? $item['name'] : get_the_title( $item_id ),
-            'item_price'        => wpinv_round_amount( $item_price ),
-            'custom_price'      => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
+            'name'              => !empty($item['name']) ? $item['name'] : get_the_title($item_id),
+            'item_price'        => wpinv_round_amount($item_price),
+            'custom_price'      => isset($item['custom_price']) ? $item['custom_price'] : '',
             'quantity'          => $quantity,
-            'discount'          => wpinv_round_amount( $discount ),
-            'subtotal'          => wpinv_round_amount( $subtotal ),
-            'tax'               => wpinv_round_amount( $tax ),
-            'price'             => wpinv_round_amount( $total ),
+            'discount'          => wpinv_round_amount($discount),
+            'subtotal'          => wpinv_round_amount($subtotal),
+            'tax'               => wpinv_round_amount($tax),
+            'price'             => wpinv_round_amount($total),
             'vat_rates_class'   => $tax_class,
             'vat_rate'          => $tax_rate,
-            'meta'              => isset( $item['meta'] ) ? $item['meta'] : array(),
+            'meta'              => isset($item['meta']) ? $item['meta'] : array(),
             'fees'              => $fees,
         );
         
-        if ( $wpinv_is_last_cart_item ) {
+        if ($wpinv_is_last_cart_item) {
             $wpinv_is_last_cart_item   = false;
             $wpinv_flat_discount_total = 0.00;
         }
@@ -1005,67 +1005,67 @@ 
     return $details;
 }
 
-function wpinv_get_cart_details( $invoice_id = 0 ) {
+function wpinv_get_cart_details($invoice_id = 0) {
     global $ajax_cart_details;
 
-    $invoice      = wpinv_get_invoice_cart( $invoice_id );
+    $invoice      = wpinv_get_invoice_cart($invoice_id);
     $cart_details = $ajax_cart_details;
-    if ( empty( $cart_details ) && ! empty( $invoice->cart_details ) ) {
+    if (empty($cart_details) && !empty($invoice->cart_details)) {
         $cart_details = $invoice->cart_details;
     }
 
-    if ( ! empty( $cart_details ) && is_array( $cart_details ) ) {
-        $invoice_currency = ! empty( $invoice->currency ) ? $invoice->currency : wpinv_get_default_country();
+    if (!empty($cart_details) && is_array($cart_details)) {
+        $invoice_currency = !empty($invoice->currency) ? $invoice->currency : wpinv_get_default_country();
 
-        foreach ( $cart_details as $key => $cart_item ) {
-            $cart_details[ $key ]['currency'] = $invoice_currency;
+        foreach ($cart_details as $key => $cart_item) {
+            $cart_details[$key]['currency'] = $invoice_currency;
 
-            if ( ! isset( $cart_item['subtotal'] ) ) {
-                $cart_details[ $key ]['subtotal'] = $cart_item['price'];
+            if (!isset($cart_item['subtotal'])) {
+                $cart_details[$key]['subtotal'] = $cart_item['price'];
             }
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_details', $cart_details, $invoice_id );
+    return apply_filters('wpinv_get_cart_details', $cart_details, $invoice_id);
 }
 
-function wpinv_record_status_change( $invoice_id, $new_status, $old_status ) {
-    if ( 'wpi_invoice' != get_post_type( $invoice_id ) ) {
+function wpinv_record_status_change($invoice_id, $new_status, $old_status) {
+    if ('wpi_invoice' != get_post_type($invoice_id)) {
         return;
     }
 
-    if ( ( $old_status == 'wpi-pending' && $new_status == 'draft' ) || ( $old_status == 'draft' && $new_status == 'wpi-pending' ) ) {
+    if (($old_status == 'wpi-pending' && $new_status == 'draft') || ($old_status == 'draft' && $new_status == 'wpi-pending')) {
         return;
     }
 
-    $invoice    = wpinv_get_invoice( $invoice_id );
+    $invoice    = wpinv_get_invoice($invoice_id);
     
-    $old_status = wpinv_status_nicename( $old_status );
-    $new_status = wpinv_status_nicename( $new_status );
+    $old_status = wpinv_status_nicename($old_status);
+    $new_status = wpinv_status_nicename($new_status);
 
-    $status_change = sprintf( __( 'Invoice status changed from %s to %s', 'invoicing' ), $old_status, $new_status );
+    $status_change = sprintf(__('Invoice status changed from %s to %s', 'invoicing'), $old_status, $new_status);
     
     // Add note
-    return $invoice->add_note( $status_change, false, false, true );
+    return $invoice->add_note($status_change, false, false, true);
 }
-add_action( 'wpinv_update_status', 'wpinv_record_status_change', 100, 3 );
+add_action('wpinv_update_status', 'wpinv_record_status_change', 100, 3);
 
-function wpinv_complete_payment( $invoice_id, $new_status, $old_status ) {
+function wpinv_complete_payment($invoice_id, $new_status, $old_status) {
     global $wpi_has_free_trial;
     
     $wpi_has_free_trial = false;
     
-    if ( $old_status == 'publish' ) {
+    if ($old_status == 'publish') {
         return; // Make sure that payments are only paid once
     }
 
     // Make sure the payment completion is only processed when new status is paid
-    if ( $new_status != 'publish' ) {
+    if ($new_status != 'publish') {
         return;
     }
 
-    $invoice = new WPInv_Invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = new WPInv_Invoice($invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
@@ -1073,58 +1073,58 @@ 
     $completed_date = $invoice->completed_date;
     $cart_details   = $invoice->cart_details;
 
-    do_action( 'wpinv_pre_complete_payment', $invoice_id );
+    do_action('wpinv_pre_complete_payment', $invoice_id);
 
-    if ( is_array( $cart_details ) ) {
+    if (is_array($cart_details)) {
         // Increase purchase count and earnings
-        foreach ( $cart_details as $cart_index => $item ) {
+        foreach ($cart_details as $cart_index => $item) {
             // Ensure these actions only run once, ever
-            if ( empty( $completed_date ) ) {
-                do_action( 'wpinv_complete_item_payment', $item['id'], $invoice_id, $item, $cart_index );
+            if (empty($completed_date)) {
+                do_action('wpinv_complete_item_payment', $item['id'], $invoice_id, $item, $cart_index);
             }
         }
     }
     
     // Check for discount codes and increment their use counts
-    if ( $discounts = $invoice->get_discounts( true ) ) {
-        if( ! empty( $discounts ) ) {
-            foreach( $discounts as $code ) {
-                wpinv_increase_discount_usage( $code );
+    if ($discounts = $invoice->get_discounts(true)) {
+        if (!empty($discounts)) {
+            foreach ($discounts as $code) {
+                wpinv_increase_discount_usage($code);
             }
         }
     }
     
     // Ensure this action only runs once ever
-    if( empty( $completed_date ) ) {
+    if (empty($completed_date)) {
         // Save the completed date
-        $invoice->set( 'completed_date', current_time( 'mysql', 0 ) );
+        $invoice->set('completed_date', current_time('mysql', 0));
         $invoice->save();
 
-        do_action( 'wpinv_complete_payment', $invoice_id );
+        do_action('wpinv_complete_payment', $invoice_id);
     }
 
     // Empty the shopping cart
     wpinv_empty_cart();
 }
-add_action( 'wpinv_update_status', 'wpinv_complete_payment', 100, 3 );
+add_action('wpinv_update_status', 'wpinv_complete_payment', 100, 3);
 
-function wpinv_update_payment_status( $invoice_id, $new_status = 'publish' ) {    
-    $invoice = !empty( $invoice_id ) && is_object( $invoice_id ) ? $invoice_id : wpinv_get_invoice( (int)$invoice_id );
+function wpinv_update_payment_status($invoice_id, $new_status = 'publish') {    
+    $invoice = !empty($invoice_id) && is_object($invoice_id) ? $invoice_id : wpinv_get_invoice((int)$invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
-    return $invoice->update_status( $new_status );
+    return $invoice->update_status($new_status);
 }
 
-function wpinv_cart_has_fees( $type = 'all' ) {
+function wpinv_cart_has_fees($type = 'all') {
     return false;
 }
 
 function wpinv_validate_checkout_fields() {    
     // Check if there is $_POST
-    if ( empty( $_POST ) ) {
+    if (empty($_POST)) {
         return false;
     }
     
@@ -1136,11 +1136,11 @@ 
     );
     
     // Validate agree to terms
-    $page = wpinv_get_option( 'tandc_page' );
-    if(isset($page) && (int)$page > 0 && apply_filters( 'wpinv_checkout_show_terms', true )){
+    $page = wpinv_get_option('tandc_page');
+    if (isset($page) && (int)$page > 0 && apply_filters('wpinv_checkout_show_terms', true)) {
         // Validate agree to terms
-        if ( ! isset( $_POST['wpi_terms'] ) || !$_POST['wpi_terms'] ) {
-            wpinv_set_error( 'accept_terms', apply_filters( 'wpinv_accept_terms_error_text', __( 'You must accept terms and conditions', 'invoicing' ) ) );
+        if (!isset($_POST['wpi_terms']) || !$_POST['wpi_terms']) {
+            wpinv_set_error('accept_terms', apply_filters('wpinv_accept_terms_error_text', __('You must accept terms and conditions', 'invoicing')));
         }
     }
     
@@ -1156,26 +1156,26 @@ 
     
     $invoice = wpinv_get_invoice_cart();
     $has_subscription = $invoice->is_recurring();
-    if ( empty( $invoice ) ) {
-        wpinv_set_error( 'invalid_invoice', __( 'Your cart is empty.', 'invoicing' ) );
+    if (empty($invoice)) {
+        wpinv_set_error('invalid_invoice', __('Your cart is empty.', 'invoicing'));
         return $gateway;
     }
 
     // Check if a gateway value is present
-    if ( !empty( $_REQUEST['wpi-gateway'] ) ) {
-        $gateway = sanitize_text_field( $_REQUEST['wpi-gateway'] );
+    if (!empty($_REQUEST['wpi-gateway'])) {
+        $gateway = sanitize_text_field($_REQUEST['wpi-gateway']);
 
-        if ( $invoice->is_free() ) {
+        if ($invoice->is_free()) {
             $gateway = 'manual';
-        } elseif ( !wpinv_is_gateway_active( $gateway ) ) {
-            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not enabled', 'invoicing' ) );
-        } elseif ( $has_subscription && !wpinv_gateway_support_subscription( $gateway ) ) {
-            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway doesnot support subscription payment', 'invoicing' ) );
+        } elseif (!wpinv_is_gateway_active($gateway)) {
+            wpinv_set_error('invalid_gateway', __('The selected payment gateway is not enabled', 'invoicing'));
+        } elseif ($has_subscription && !wpinv_gateway_support_subscription($gateway)) {
+            wpinv_set_error('invalid_gateway', __('The selected payment gateway doesnot support subscription payment', 'invoicing'));
         }
     }
 
-    if ( $has_subscription && count( wpinv_get_cart_contents() ) > 1 ) {
-        wpinv_set_error( 'subscription_invalid', __( 'Only one subscription may be purchased through payment per checkout.', 'invoicing' ) );
+    if ($has_subscription && count(wpinv_get_cart_contents()) > 1) {
+        wpinv_set_error('subscription_invalid', __('Only one subscription may be purchased through payment per checkout.', 'invoicing'));
     }
 
     return $gateway;
@@ -1189,10 +1189,10 @@ 
     
     $error = false;
     // If we have discounts, loop through them
-    if ( ! empty( $discounts ) ) {
-        foreach ( $discounts as $discount ) {
+    if (!empty($discounts)) {
+        foreach ($discounts as $discount) {
             // Check if valid
-            if (  !wpinv_is_discount_valid( $discount, (int)$wpi_cart->get_user_id() ) ) {
+            if (!wpinv_is_discount_valid($discount, (int)$wpi_cart->get_user_id())) {
                 // Discount is not valid
                 $error = true;
             }
@@ -1202,20 +1202,20 @@ 
         return NULL;
     }
 
-    if ( $error && !wpinv_get_errors() ) {
-        wpinv_set_error( 'invalid_discount', __( 'Discount code you entered is invalid', 'invoicing' ) );
+    if ($error && !wpinv_get_errors()) {
+        wpinv_set_error('invalid_discount', __('Discount code you entered is invalid', 'invoicing'));
     }
 
-    return implode( ',', $discounts );
+    return implode(',', $discounts);
 }
 
 function wpinv_checkout_validate_cc() {
     $card_data = wpinv_checkout_get_cc_info();
 
     // Validate the card zip
-    if ( !empty( $card_data['wpinv_zip'] ) ) {
-        if ( !wpinv_checkout_validate_cc_zip( $card_data['wpinv_zip'], $card_data['wpinv_country'] ) ) {
-            wpinv_set_error( 'invalid_cc_zip', __( 'The zip / postcode you entered for your billing address is invalid', 'invoicing' ) );
+    if (!empty($card_data['wpinv_zip'])) {
+        if (!wpinv_checkout_validate_cc_zip($card_data['wpinv_zip'], $card_data['wpinv_country'])) {
+            wpinv_set_error('invalid_cc_zip', __('The zip / postcode you entered for your billing address is invalid', 'invoicing'));
         }
     }
 
@@ -1225,28 +1225,28 @@ 
 
 function wpinv_checkout_get_cc_info() {
 	$cc_info = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
-	$cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
-	$cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
-	$cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
+	$cc_info['card_name']      = isset($_POST['card_name']) ? sanitize_text_field($_POST['card_name']) : '';
+	$cc_info['card_number']    = isset($_POST['card_number']) ? sanitize_text_field($_POST['card_number']) : '';
+	$cc_info['card_cvc']       = isset($_POST['card_cvc']) ? sanitize_text_field($_POST['card_cvc']) : '';
+	$cc_info['card_exp_month'] = isset($_POST['card_exp_month']) ? sanitize_text_field($_POST['card_exp_month']) : '';
+	$cc_info['card_exp_year']  = isset($_POST['card_exp_year']) ? sanitize_text_field($_POST['card_exp_year']) : '';
+	$cc_info['card_address']   = isset($_POST['wpinv_address']) ? sanitize_text_field($_POST['wpinv_address']) : '';
+	$cc_info['card_city']      = isset($_POST['wpinv_city']) ? sanitize_text_field($_POST['wpinv_city']) : '';
+	$cc_info['card_state']     = isset($_POST['wpinv_state']) ? sanitize_text_field($_POST['wpinv_state']) : '';
+	$cc_info['card_country']   = isset($_POST['wpinv_country']) ? sanitize_text_field($_POST['wpinv_country']) : '';
+	$cc_info['card_zip']       = isset($_POST['wpinv_zip']) ? sanitize_text_field($_POST['wpinv_zip']) : '';
 
 	// Return cc info
 	return $cc_info;
 }
 
-function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
+function wpinv_checkout_validate_cc_zip($zip = 0, $country_code = '') {
     $ret = false;
 
-    if ( empty( $zip ) || empty( $country_code ) )
+    if (empty($zip) || empty($country_code))
         return $ret;
 
-    $country_code = strtoupper( $country_code );
+    $country_code = strtoupper($country_code);
 
     $zip_regex = array(
         "AD" => "AD\d{3}",
@@ -1406,24 +1406,24 @@ 
         "ZM" => "\d{5}"
     );
 
-    if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) )
+    if (!isset ($zip_regex[$country_code]) || preg_match("/" . $zip_regex[$country_code] . "/i", $zip))
         $ret = true;
 
-    return apply_filters( 'wpinv_is_zip_valid', $ret, $zip, $country_code );
+    return apply_filters('wpinv_is_zip_valid', $ret, $zip, $country_code);
 }
 
 function wpinv_checkout_validate_agree_to_terms() {
     // Validate agree to terms
-    if ( ! isset( $_POST['wpi_agree_to_terms'] ) || $_POST['wpi_agree_to_terms'] != 1 ) {
+    if (!isset($_POST['wpi_agree_to_terms']) || $_POST['wpi_agree_to_terms'] != 1) {
         // User did not agree
-        wpinv_set_error( 'agree_to_terms', apply_filters( 'wpinv_agree_to_terms_text', __( 'You must agree to the terms of use', 'invoicing' ) ) );
+        wpinv_set_error('agree_to_terms', apply_filters('wpinv_agree_to_terms_text', __('You must agree to the terms of use', 'invoicing')));
     }
 }
 
 function wpinv_checkout_validate_invoice_user() {
     global $wpi_cart, $user_ID;
 
-    if(empty($wpi_cart)){
+    if (empty($wpi_cart)) {
         $wpi_cart = wpinv_get_invoice_cart();
     }
 
@@ -1433,45 +1433,45 @@ 
     );
 
     // If guest checkout allowed
-    if ( !wpinv_require_login_to_checkout() ) {
+    if (!wpinv_require_login_to_checkout()) {
         return $valid_user_data;
     }
     
     // Verify there is a user_ID
-    if ( $user_ID == $invoice_user ) {
+    if ($user_ID == $invoice_user) {
         // Get the logged in user data
-        $user_data = get_userdata( $user_ID );
-        $required_fields  = wpinv_checkout_required_fields();
+        $user_data = get_userdata($user_ID);
+        $required_fields = wpinv_checkout_required_fields();
 
         // Loop through required fields and show error messages
-         if ( !empty( $required_fields ) ) {
-            foreach ( $required_fields as $field_name => $value ) {
-                if ( in_array( $value, $required_fields ) && empty( $_POST[ 'wpinv_' . $field_name ] ) ) {
-                    wpinv_set_error( $value['error_id'], $value['error_message'] );
+         if (!empty($required_fields)) {
+            foreach ($required_fields as $field_name => $value) {
+                if (in_array($value, $required_fields) && empty($_POST['wpinv_' . $field_name])) {
+                    wpinv_set_error($value['error_id'], $value['error_message']);
                 }
             }
         }
 
         // Verify data
-        if ( $user_data ) {
+        if ($user_data) {
             // Collected logged in user data
             $valid_user_data = array(
                 'user_id'     => $user_ID,
-                'email'       => isset( $_POST['wpinv_email'] ) ? sanitize_email( $_POST['wpinv_email'] ) : $user_data->user_email,
-                'first_name'  => isset( $_POST['wpinv_first_name'] ) && ! empty( $_POST['wpinv_first_name'] ) ? sanitize_text_field( $_POST['wpinv_first_name'] ) : $user_data->first_name,
-                'last_name'   => isset( $_POST['wpinv_last_name'] ) && ! empty( $_POST['wpinv_last_name']  ) ? sanitize_text_field( $_POST['wpinv_last_name']  ) : $user_data->last_name,
+                'email'       => isset($_POST['wpinv_email']) ? sanitize_email($_POST['wpinv_email']) : $user_data->user_email,
+                'first_name'  => isset($_POST['wpinv_first_name']) && !empty($_POST['wpinv_first_name']) ? sanitize_text_field($_POST['wpinv_first_name']) : $user_data->first_name,
+                'last_name'   => isset($_POST['wpinv_last_name']) && !empty($_POST['wpinv_last_name']) ? sanitize_text_field($_POST['wpinv_last_name']) : $user_data->last_name,
             );
 
-            if ( !empty( $_POST[ 'wpinv_email' ] ) && !is_email( $_POST[ 'wpinv_email' ] ) ) {
-                wpinv_set_error( 'invalid_email', __( 'Please enter a valid email address', 'invoicing' ) );
+            if (!empty($_POST['wpinv_email']) && !is_email($_POST['wpinv_email'])) {
+                wpinv_set_error('invalid_email', __('Please enter a valid email address', 'invoicing'));
             }
         } else {
             // Set invalid user error
-            wpinv_set_error( 'invalid_user', __( 'The user billing information is invalid', 'invoicing' ) );
+            wpinv_set_error('invalid_user', __('The user billing information is invalid', 'invoicing'));
         }
     } else {
         // Set invalid user error
-        wpinv_set_error( 'invalid_user_id', __( 'The invalid invoice user id', 'invoicing' ) );
+        wpinv_set_error('invalid_user_id', __('The invalid invoice user id', 'invoicing'));
     }
 
     // Return user data
@@ -1483,27 +1483,27 @@ 
 
     $data = array();
     
-    if ( is_user_logged_in() ) {
-        if ( !wpinv_require_login_to_checkout() || ( wpinv_require_login_to_checkout() && (int)$wpi_cart->get_user_id() === (int)get_current_user_id() ) ) {
+    if (is_user_logged_in()) {
+        if (!wpinv_require_login_to_checkout() || (wpinv_require_login_to_checkout() && (int)$wpi_cart->get_user_id() === (int)get_current_user_id())) {
             $data['user_id'] = (int)get_current_user_id();
         } else {
-            wpinv_set_error( 'logged_in_only', __( 'You are not allowed to pay for this invoice', 'invoicing' ) );
+            wpinv_set_error('logged_in_only', __('You are not allowed to pay for this invoice', 'invoicing'));
         }
     } else {
         // If guest checkout allowed
-        if ( !wpinv_require_login_to_checkout() ) {
+        if (!wpinv_require_login_to_checkout()) {
             $data['user_id'] = 0;
         } else {
-            wpinv_set_error( 'logged_in_only', __( 'You must be logged in to pay for this invoice', 'invoicing' ) );
+            wpinv_set_error('logged_in_only', __('You must be logged in to pay for this invoice', 'invoicing'));
         }
     }
 
     return $data;
 }
 
-function wpinv_checkout_form_get_user( $valid_data = array() ) {
+function wpinv_checkout_form_get_user($valid_data = array()) {
 
-    if ( !empty( $valid_data['current_user']['user_id'] ) ) {
+    if (!empty($valid_data['current_user']['user_id'])) {
         $user = $valid_data['current_user'];
     } else {
         // Set the valid invoice user
@@ -1511,7 +1511,7 @@ 
     }
 
     // Verify invoice have an user
-    if ( false === $user || empty( $user ) ) {
+    if (false === $user || empty($user)) {
         return false;
     }
 
@@ -1528,11 +1528,11 @@ 
         'zip',
     );
     
-    foreach ( $address_fields as $field ) {
-        $user[$field]  = !empty( $_POST['wpinv_' . $field] ) ? sanitize_text_field( $_POST['wpinv_' . $field] ) : false;
+    foreach ($address_fields as $field) {
+        $user[$field] = !empty($_POST['wpinv_' . $field]) ? sanitize_text_field($_POST['wpinv_' . $field]) : false;
         
-        if ( !empty( $user['user_id'] ) && !empty( $valid_data['current_user']['user_id'] ) && $valid_data['current_user']['user_id'] == $valid_data['invoice_user']['user_id'] ) {
-            update_user_meta( $user['user_id'], '_wpinv_' . $field, $user[$field] );
+        if (!empty($user['user_id']) && !empty($valid_data['current_user']['user_id']) && $valid_data['current_user']['user_id'] == $valid_data['invoice_user']['user_id']) {
+            update_user_meta($user['user_id'], '_wpinv_' . $field, $user[$field]);
         }
     }
 
@@ -1540,28 +1540,28 @@ 
     return $user;
 }
 
-function wpinv_set_checkout_session( $invoice_data = array() ) {
+function wpinv_set_checkout_session($invoice_data = array()) {
     global $wpi_session;
     
-    return $wpi_session->set( 'wpinv_checkout', $invoice_data );
+    return $wpi_session->set('wpinv_checkout', $invoice_data);
 }
 
 function wpinv_get_checkout_session() {
 	global $wpi_session;
     
-    return $wpi_session->get( 'wpinv_checkout' );
+    return $wpi_session->get('wpinv_checkout');
 }
 
 function wpinv_empty_cart() {
     global $wpi_session;
 
     // Remove cart contents
-    $wpi_session->set( 'wpinv_checkout', NULL );
+    $wpi_session->set('wpinv_checkout', NULL);
 
     // Remove all cart fees
-    $wpi_session->set( 'wpi_cart_fees', NULL );
+    $wpi_session->set('wpi_cart_fees', NULL);
 
-    do_action( 'wpinv_empty_cart' );
+    do_action('wpinv_empty_cart');
 }
 
 function wpinv_process_checkout() {
@@ -1570,7 +1570,7 @@ 
     wpinv_clear_errors();
     
     $invoice = wpinv_get_invoice_cart();
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
@@ -1578,42 +1578,42 @@ 
     
     $wpi_checkout_id = $invoice->ID;
     
-    do_action( 'wpinv_pre_process_checkout' );
+    do_action('wpinv_pre_process_checkout');
     
-    if ( !wpinv_get_cart_contents() ) { // Make sure the cart isn't empty
+    if (!wpinv_get_cart_contents()) { // Make sure the cart isn't empty
         $valid_data = false;
-        wpinv_set_error( 'empty_cart', __( 'Your cart is empty', 'invoicing' ) );
+        wpinv_set_error('empty_cart', __('Your cart is empty', 'invoicing'));
     } else {
         // Validate the form $_POST data
         $valid_data = wpinv_validate_checkout_fields();
         
         // Allow themes and plugins to hook to errors
-        do_action( 'wpinv_checkout_error_checks', $valid_data, $_POST );
+        do_action('wpinv_checkout_error_checks', $valid_data, $_POST);
     }
     
-    $is_ajax    = defined( 'DOING_AJAX' ) && DOING_AJAX;
+    $is_ajax = defined('DOING_AJAX') && DOING_AJAX;
     
     // Validate the user
-    $user = wpinv_checkout_form_get_user( $valid_data );
+    $user = wpinv_checkout_form_get_user($valid_data);
 
     // Let extensions validate fields after user is logged in if user has used login/registration form
-    do_action( 'wpinv_checkout_user_error_checks', $user, $valid_data, $_POST );
+    do_action('wpinv_checkout_user_error_checks', $user, $valid_data, $_POST);
     
-    if ( false === $valid_data || wpinv_get_errors() || ! $user ) {
-        if ( $is_ajax ) {
-            do_action( 'wpinv_ajax_checkout_errors' );
+    if (false === $valid_data || wpinv_get_errors() || !$user) {
+        if ($is_ajax) {
+            do_action('wpinv_ajax_checkout_errors');
             die();
         } else {
             return false;
         }
     }
 
-    if ( $is_ajax ) {
+    if ($is_ajax) {
         // Save address fields.
-        $address_fields = array( 'first_name', 'last_name', 'phone', 'address', 'city', 'country', 'state', 'zip', 'company' );
-        foreach ( $address_fields as $field ) {
-            if ( isset( $user[$field] ) ) {
-                $invoice->set( $field, $user[$field] );
+        $address_fields = array('first_name', 'last_name', 'phone', 'address', 'city', 'country', 'state', 'zip', 'company');
+        foreach ($address_fields as $field) {
+            if (isset($user[$field])) {
+                $invoice->set($field, $user[$field]);
             }
 
             $invoice->save();
@@ -1621,16 +1621,16 @@ 
 
         $response['success']            = true;
         $response['data']['subtotal']   = $invoice->get_subtotal();
-        $response['data']['subtotalf']  = $invoice->get_subtotal( true );
+        $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['discount']   = $invoice->get_discount();
-        $response['data']['discountf']  = $invoice->get_discount( true );
+        $response['data']['discountf']  = $invoice->get_discount(true);
         $response['data']['tax']        = $invoice->get_tax();
-        $response['data']['taxf']       = $invoice->get_tax( true );
+        $response['data']['taxf']       = $invoice->get_tax(true);
         $response['data']['total']      = $invoice->get_total();
-        $response['data']['totalf']     = $invoice->get_total( true );
-	    $response['data']['free']       = $invoice->is_free() && ( ! ( (float) $response['data']['total'] > 0 ) || $invoice->is_free_trial() ) ? true : false;
+        $response['data']['totalf']     = $invoice->get_total(true);
+	    $response['data']['free'] = $invoice->is_free() && (!((float)$response['data']['total'] > 0) || $invoice->is_free_trial()) ? true : false;
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     $user_info = array(
@@ -1652,42 +1652,42 @@ 
     
     // Setup invoice information
     $invoice_data = array(
-        'invoice_id'        => !empty( $invoice ) ? $invoice->ID : 0,
+        'invoice_id'        => !empty($invoice) ? $invoice->ID : 0,
         'items'             => $cart_items,
         'cart_discounts'    => $discounts,
-        'fees'              => wpinv_get_cart_fees(),        // Any arbitrary fees that have been added to the cart
-        'subtotal'          => wpinv_get_cart_subtotal( $cart_items ),    // Amount before taxes and discounts
-        'discount'          => wpinv_get_cart_items_discount_amount( $cart_items, $discounts ), // Discounted amount
-        'tax'               => wpinv_get_cart_tax( $cart_items ),               // Taxed amount
-        'price'             => wpinv_get_cart_total( $cart_items, $discounts ),    // Amount after taxes
+        'fees'              => wpinv_get_cart_fees(), // Any arbitrary fees that have been added to the cart
+        'subtotal'          => wpinv_get_cart_subtotal($cart_items), // Amount before taxes and discounts
+        'discount'          => wpinv_get_cart_items_discount_amount($cart_items, $discounts), // Discounted amount
+        'tax'               => wpinv_get_cart_tax($cart_items), // Taxed amount
+        'price'             => wpinv_get_cart_total($cart_items, $discounts), // Amount after taxes
         'invoice_key'       => $invoice->get_key() ? $invoice->get_key() : $invoice->generate_key(),
         'user_email'        => $invoice->get_email(),
-        'date'              => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
-        'user_info'         => stripslashes_deep( $user_info ),
+        'date'              => date('Y-m-d H:i:s', current_time('timestamp')),
+        'user_info'         => stripslashes_deep($user_info),
         'post_data'         => $_POST,
         'cart_details'      => $cart_items,
         'gateway'           => $valid_data['gateway'],
         'card_info'         => $valid_data['cc_info']
     );
     
-    $vat_info   = $wpinv_euvat->current_vat_data();
-    if ( is_array( $vat_info ) ) {
+    $vat_info = $wpinv_euvat->current_vat_data();
+    if (is_array($vat_info)) {
         $invoice_data['user_info']['vat_number']        = $vat_info['number'];
         $invoice_data['user_info']['vat_rate']          = wpinv_get_tax_rate($invoice_data['user_info']['country'], $invoice_data['user_info']['state']);
-        $invoice_data['user_info']['adddress_confirmed']    = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+        $invoice_data['user_info']['adddress_confirmed'] = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
 
         // Add the VAT rate to each item in the cart
-        foreach( $invoice_data['cart_details'] as $key => $item_data) {
+        foreach ($invoice_data['cart_details'] as $key => $item_data) {
             $rate = wpinv_get_tax_rate($invoice_data['user_info']['country'], $invoice_data['user_info']['state'], $item_data['id']);
-            $invoice_data['cart_details'][$key]['vat_rate'] = wpinv_round_amount( $rate, 4 );
+            $invoice_data['cart_details'][$key]['vat_rate'] = wpinv_round_amount($rate, 4);
         }
     }
     
     // Save vat fields.
-    $address_fields = array( 'vat_number', 'vat_rate', 'adddress_confirmed' );
-    foreach ( $address_fields as $field ) {
-        if ( isset( $invoice_data['user_info'][$field] ) ) {
-            $invoice->set( $field, $invoice_data['user_info'][$field] );
+    $address_fields = array('vat_number', 'vat_rate', 'adddress_confirmed');
+    foreach ($address_fields as $field) {
+        if (isset($invoice_data['user_info'][$field])) {
+            $invoice->set($field, $invoice_data['user_info'][$field]);
         }
 
         $invoice->save();
@@ -1697,55 +1697,55 @@ 
     $valid_data['user'] = $user;
     
     // Allow themes and plugins to hook before the gateway
-    do_action( 'wpinv_checkout_before_gateway', $_POST, $user_info, $valid_data );
+    do_action('wpinv_checkout_before_gateway', $_POST, $user_info, $valid_data);
     
     // If the total amount in the cart is 0, send to the manual gateway. This emulates a free invoice
-    if ( !$invoice_data['price'] ) {
+    if (!$invoice_data['price']) {
         // Revert to manual
         $invoice_data['gateway'] = 'manual';
         $_POST['wpi-gateway'] = 'manual';
     }
     
     // Allow the invoice data to be modified before it is sent to the gateway
-    $invoice_data = apply_filters( 'wpinv_data_before_gateway', $invoice_data, $valid_data );
+    $invoice_data = apply_filters('wpinv_data_before_gateway', $invoice_data, $valid_data);
     
-    if ( $invoice_data['price'] && $invoice_data['gateway'] == 'manual' ) {
+    if ($invoice_data['price'] && $invoice_data['gateway'] == 'manual') {
         $mode = 'test';
     } else {
-        $mode = wpinv_is_test_mode( $invoice_data['gateway'] ) ? 'test' : 'live';
+        $mode = wpinv_is_test_mode($invoice_data['gateway']) ? 'test' : 'live';
     }
     
     // Setup the data we're storing in the purchase session
     $session_data = $invoice_data;
     // Make sure credit card numbers are never stored in sessions
-    if ( !empty( $session_data['card_info']['card_number'] ) ) {
-        unset( $session_data['card_info']['card_number'] );
+    if (!empty($session_data['card_info']['card_number'])) {
+        unset($session_data['card_info']['card_number']);
     }
     
     // Used for showing item links to non logged-in users after purchase, and for other plugins needing purchase data.
-    wpinv_set_checkout_session( $invoice_data );
+    wpinv_set_checkout_session($invoice_data);
     
     // Set gateway
-    $invoice->update_meta( '_wpinv_gateway', $invoice_data['gateway'] );
-    $invoice->update_meta( '_wpinv_mode', $mode );
-    $invoice->update_meta( '_wpinv_checkout', date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ) );
+    $invoice->update_meta('_wpinv_gateway', $invoice_data['gateway']);
+    $invoice->update_meta('_wpinv_mode', $mode);
+    $invoice->update_meta('_wpinv_checkout', date_i18n('Y-m-d H:i:s', current_time('timestamp')));
     
-    do_action( 'wpinv_checkout_before_send_to_gateway', $invoice, $invoice_data );
+    do_action('wpinv_checkout_before_send_to_gateway', $invoice, $invoice_data);
 
     // Send info to the gateway for payment processing
-    wpinv_send_to_gateway( $invoice_data['gateway'], $invoice_data );
+    wpinv_send_to_gateway($invoice_data['gateway'], $invoice_data);
     die();
 }
-add_action( 'wpinv_payment', 'wpinv_process_checkout' );
+add_action('wpinv_payment', 'wpinv_process_checkout');
 
-function wpinv_get_invoices( $args ) {
-    $args = wp_parse_args( $args, array(
-        'status'   => array_keys( wpinv_get_invoice_statuses() ),
+function wpinv_get_invoices($args) {
+    $args = wp_parse_args($args, array(
+        'status'   => array_keys(wpinv_get_invoice_statuses()),
         'type'     => 'wpi_invoice',
         'parent'   => null,
         'user'     => null,
         'email'    => '',
-        'limit'    => get_option( 'posts_per_page' ),
+        'limit'    => get_option('posts_per_page'),
         'offset'   => null,
         'page'     => 1,
         'exclude'  => array(),
@@ -1753,7 +1753,7 @@ 
         'order'    => 'DESC',
         'return'   => 'objects',
         'paginate' => false,
-    ) );
+    ));
     
     // Handle some BW compatibility arg names where wp_query args differ in naming.
     $map_legacy = array(
@@ -1766,18 +1766,18 @@ 
         'paged'          => 'page',
     );
 
-    foreach ( $map_legacy as $from => $to ) {
-        if ( isset( $args[ $from ] ) ) {
-            $args[ $to ] = $args[ $from ];
+    foreach ($map_legacy as $from => $to) {
+        if (isset($args[$from])) {
+            $args[$to] = $args[$from];
         }
     }
 
-    if ( get_query_var( 'paged' ) )
+    if (get_query_var('paged'))
         $args['page'] = get_query_var('paged');
-    else if ( get_query_var( 'page' ) )
-        $args['page'] = get_query_var( 'page' );
-    else if ( !empty( $args[ 'page' ] ) )
-        $args['page'] = $args[ 'page' ];
+    else if (get_query_var('page'))
+        $args['page'] = get_query_var('page');
+    else if (!empty($args['page']))
+        $args['page'] = $args['page'];
     else
         $args['page'] = 1;
 
@@ -1790,49 +1790,49 @@ 
         'post_status'    => $args['status'],
         'posts_per_page' => $args['limit'],
         'meta_query'     => array(),
-        'date_query'     => !empty( $args['date_query'] ) ? $args['date_query'] : array(),
+        'date_query'     => !empty($args['date_query']) ? $args['date_query'] : array(),
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
     );
     
-    if ( !empty( $args['user'] ) ) {
-        $wp_query_args['author'] = absint( $args['user'] );
+    if (!empty($args['user'])) {
+        $wp_query_args['author'] = absint($args['user']);
     }
 
-    if ( ! is_null( $args['parent'] ) ) {
-        $wp_query_args['post_parent'] = absint( $args['parent'] );
+    if (!is_null($args['parent'])) {
+        $wp_query_args['post_parent'] = absint($args['parent']);
     }
 
-    if ( ! is_null( $args['offset'] ) ) {
-        $wp_query_args['offset'] = absint( $args['offset'] );
+    if (!is_null($args['offset'])) {
+        $wp_query_args['offset'] = absint($args['offset']);
     } else {
-        $wp_query_args['paged'] = absint( $args['page'] );
+        $wp_query_args['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;
     }
 
     $wp_query_args = apply_filters('wpinv_get_invoices_args', $wp_query_args, $args);
 
     // Get results.
-    $invoices = new WP_Query( $wp_query_args );
+    $invoices = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'wpinv_get_invoice', $invoices->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('wpinv_get_invoice', $invoices->posts);
+    } elseif ('self' === $args['return']) {
         return $invoices;
     } else {
         $return = $invoices->posts;
     }
 
-    if ( $args['paginate' ] ) {
-        return (object) array(
+    if ($args['paginate']) {
+        return (object)array(
             'invoices'      => $return,
             'total'         => $invoices->found_posts,
             'max_num_pages' => $invoices->max_num_pages,
@@ -1844,22 +1844,22 @@ 
 
 function wpinv_get_user_invoices_columns() {
     $columns = array(
-            'invoice-number'  => array( 'title' => __( 'ID', 'invoicing' ), 'class' => 'text-left' ),
-            'created-date'    => array( 'title' => __( 'Created Date', 'invoicing' ), 'class' => 'text-left' ),
-            'payment-date'    => array( 'title' => __( 'Payment Date', 'invoicing' ), 'class' => 'text-left' ),
-            'invoice-status'  => array( 'title' => __( 'Status', 'invoicing' ), 'class' => 'text-center' ),
-            'invoice-total'   => array( 'title' => __( 'Total', 'invoicing' ), 'class' => 'text-right' ),
-            'invoice-actions' => array( 'title' => '&nbsp;', 'class' => 'text-center' ),
+            'invoice-number'  => array('title' => __('ID', 'invoicing'), 'class' => 'text-left'),
+            'created-date'    => array('title' => __('Created Date', 'invoicing'), 'class' => 'text-left'),
+            'payment-date'    => array('title' => __('Payment Date', 'invoicing'), 'class' => 'text-left'),
+            'invoice-status'  => array('title' => __('Status', 'invoicing'), 'class' => 'text-center'),
+            'invoice-total'   => array('title' => __('Total', 'invoicing'), 'class' => 'text-right'),
+            'invoice-actions' => array('title' => '&nbsp;', 'class' => 'text-center'),
         );
 
-    return apply_filters( 'wpinv_user_invoices_columns', $columns );
+    return apply_filters('wpinv_user_invoices_columns', $columns);
 }
 
-function wpinv_payment_receipt( $atts, $content = null ) {
+function wpinv_payment_receipt($atts, $content = null) {
     global $wpinv_receipt_args;
 
-    $wpinv_receipt_args = shortcode_atts( array(
-        'error'           => __( 'Sorry, trouble retrieving payment receipt.', 'invoicing' ),
+    $wpinv_receipt_args = shortcode_atts(array(
+        'error'           => __('Sorry, trouble retrieving payment receipt.', 'invoicing'),
         'price'           => true,
         'discount'        => true,
         'items'           => true,
@@ -1868,197 +1868,197 @@ 
         'invoice_key'     => false,
         'payment_method'  => true,
         'invoice_id'      => true
-    ), $atts, 'wpinv_receipt' );
+    ), $atts, 'wpinv_receipt');
 
     $session = wpinv_get_checkout_session();
-    if ( isset( $_GET['invoice_key'] ) ) {
-        $invoice_key = urldecode( $_GET['invoice_key'] );
-    } else if ( $session && isset( $session['invoice_key'] ) ) {
+    if (isset($_GET['invoice_key'])) {
+        $invoice_key = urldecode($_GET['invoice_key']);
+    } else if ($session && isset($session['invoice_key'])) {
         $invoice_key = $session['invoice_key'];
-    } elseif ( isset( $wpinv_receipt_args['invoice_key'] ) && $wpinv_receipt_args['invoice_key'] ) {
+    } elseif (isset($wpinv_receipt_args['invoice_key']) && $wpinv_receipt_args['invoice_key']) {
         $invoice_key = $wpinv_receipt_args['invoice_key'];
-    } else if ( isset( $_GET['invoice-id'] ) ) {
-        $invoice_key = wpinv_get_payment_key( (int)$_GET['invoice-id'] );
+    } else if (isset($_GET['invoice-id'])) {
+        $invoice_key = wpinv_get_payment_key((int)$_GET['invoice-id']);
     }
 
     // No key found
-    if ( ! isset( $invoice_key ) ) {
+    if (!isset($invoice_key)) {
         return '<p class="alert alert-error">' . $wpinv_receipt_args['error'] . '</p>';
     }
 
-    $invoice_id    = wpinv_get_invoice_id_by_key( $invoice_key );
-    $user_can_view = wpinv_can_view_receipt( $invoice_key );
-    if ( $user_can_view && isset( $_GET['invoice-id'] ) ) {
+    $invoice_id    = wpinv_get_invoice_id_by_key($invoice_key);
+    $user_can_view = wpinv_can_view_receipt($invoice_key);
+    if ($user_can_view && isset($_GET['invoice-id'])) {
         $invoice_id     = (int)$_GET['invoice-id'];
-        $user_can_view  = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? true : false;
+        $user_can_view  = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? true : false;
     }
 
     // Key was provided, but user is logged out. Offer them the ability to login and view the receipt
-    if ( ! $user_can_view && ! empty( $invoice_key ) && ! is_user_logged_in() ) {
+    if (!$user_can_view && !empty($invoice_key) && !is_user_logged_in()) {
         // login redirect
-        return '<p class="alert alert-error">' . __( 'You are not allowed to access this section', 'invoicing' ) . '</p>';
+        return '<p class="alert alert-error">' . __('You are not allowed to access this section', 'invoicing') . '</p>';
     }
 
-    if ( ! apply_filters( 'wpinv_user_can_view_receipt', $user_can_view, $wpinv_receipt_args ) ) {
+    if (!apply_filters('wpinv_user_can_view_receipt', $user_can_view, $wpinv_receipt_args)) {
         return '<p class="alert alert-error">' . $wpinv_receipt_args['error'] . '</p>';
     }
 
     ob_start();
 
-    wpinv_get_template_part( 'wpinv-invoice-receipt' );
+    wpinv_get_template_part('wpinv-invoice-receipt');
 
     $display = ob_get_clean();
 
     return $display;
 }
 
-function wpinv_get_invoice_id_by_key( $key ) {
+function wpinv_get_invoice_id_by_key($key) {
 	global $wpdb;
 
-	$invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
+	$invoice_id = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key));
 
-	if ( $invoice_id != NULL )
+	if ($invoice_id != NULL)
 		return $invoice_id;
 
 	return 0;
 }
 
-function wpinv_can_view_receipt( $invoice_key = '' ) {
+function wpinv_can_view_receipt($invoice_key = '') {
 	$return = false;
 
-	if ( empty( $invoice_key ) ) {
+	if (empty($invoice_key)) {
 		return $return;
 	}
 
 	global $wpinv_receipt_args;
 
-	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
-	if ( isset( $_GET['invoice-id'] ) ) {
-		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
+	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key($invoice_key);
+	if (isset($_GET['invoice-id'])) {
+		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? (int)$_GET['invoice-id'] : 0;
 	}
 
-	if ( empty( $wpinv_receipt_args['id'] ) ) {
+	if (empty($wpinv_receipt_args['id'])) {
 		return $return;
 	}
 
-	$invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
-	if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
+	$invoice = wpinv_get_invoice($wpinv_receipt_args['id']);
+	if (!(!empty($invoice->ID) && $invoice->get_key() === $invoice_key)) {
 		return $return;
 	}
 
-	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()) {
 			$return = true;
 		}
 	}
 
 	$session = wpinv_get_checkout_session();
-	if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
-		$check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
+	if (isset($_GET['invoice_key']) || ($session && isset($session['invoice_key']))) {
+		$check_key = isset($_GET['invoice_key']) ? $_GET['invoice_key'] : $session['invoice_key'];
 
-		if ( wpinv_require_login_to_checkout() ) {
+		if (wpinv_require_login_to_checkout()) {
 			$return = $return && $check_key === $invoice_key;
 		} else {
 			$return = $check_key === $invoice_key;
 		}
 	}
 
-	return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
+	return (bool)apply_filters('wpinv_can_view_receipt', $return, $invoice_key);
 }
 
 function wpinv_pay_for_invoice() {
     global $wpinv_euvat;
     
-    if ( isset( $_GET['invoice_key'] ) ) {
+    if (isset($_GET['invoice_key'])) {
         $checkout_uri   = wpinv_get_checkout_uri();
-        $invoice_key    = sanitize_text_field( $_GET['invoice_key'] );
+        $invoice_key    = sanitize_text_field($_GET['invoice_key']);
         
-        if ( empty( $invoice_key ) ) {
-            wpinv_set_error( 'invalid_invoice', __( 'Invoice not found', 'invoicing' ) );
-            wp_redirect( $checkout_uri );
+        if (empty($invoice_key)) {
+            wpinv_set_error('invalid_invoice', __('Invoice not found', 'invoicing'));
+            wp_redirect($checkout_uri);
             exit();
         }
         
-        do_action( 'wpinv_check_pay_for_invoice', $invoice_key );
+        do_action('wpinv_check_pay_for_invoice', $invoice_key);
 
-        $invoice_id    = wpinv_get_invoice_id_by_key( $invoice_key );
-        $user_can_view = wpinv_can_view_receipt( $invoice_key );
-        if ( $user_can_view && isset( $_GET['invoice-id'] ) ) {
+        $invoice_id    = wpinv_get_invoice_id_by_key($invoice_key);
+        $user_can_view = wpinv_can_view_receipt($invoice_key);
+        if ($user_can_view && isset($_GET['invoice-id'])) {
             $invoice_id     = (int)$_GET['invoice-id'];
-            $user_can_view  = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? true : false;
+            $user_can_view  = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? true : false;
         }
         
-        if ( $invoice_id && $user_can_view && ( $invoice = wpinv_get_invoice( $invoice_id ) ) ) {
-            if ( $invoice->needs_payment() ) {
+        if ($invoice_id && $user_can_view && ($invoice = wpinv_get_invoice($invoice_id))) {
+            if ($invoice->needs_payment()) {
                 $data                   = array();
                 $data['invoice_id']     = $invoice_id;
-                $data['cart_discounts'] = $invoice->get_discounts( true );
+                $data['cart_discounts'] = $invoice->get_discounts(true);
                 
-                wpinv_set_checkout_session( $data );
+                wpinv_set_checkout_session($data);
                 
-                if ( wpinv_get_option( 'vat_ip_country_default' ) ) {
+                if (wpinv_get_option('vat_ip_country_default')) {
                     $_POST['country']   = $wpinv_euvat->get_country_by_ip();
                     $_POST['state']     = $_POST['country'] == $invoice->country ? $invoice->state : '';
                     
-                    wpinv_recalculate_tax( true );
+                    wpinv_recalculate_tax(true);
                 }
                 
             } else {
                 $checkout_uri = $invoice->get_view_url();
             }
         } else {
-            wpinv_set_error( 'invalid_invoice', __( 'You are not allowed to view this invoice', 'invoicing' ) );
+            wpinv_set_error('invalid_invoice', __('You are not allowed to view this invoice', 'invoicing'));
             
-            $checkout_uri = is_user_logged_in() ? wpinv_get_history_page_uri() : wp_login_url( get_permalink() );
+            $checkout_uri = is_user_logged_in() ? wpinv_get_history_page_uri() : wp_login_url(get_permalink());
         }
         
-        if(wp_redirect( $checkout_uri )){
+        if (wp_redirect($checkout_uri)) {
             exit;
         };
         wpinv_die();
     }
 }
-add_action( 'wpinv_pay_for_invoice', 'wpinv_pay_for_invoice' );
+add_action('wpinv_pay_for_invoice', 'wpinv_pay_for_invoice');
 
-function wpinv_handle_pay_via_invoice_link( $invoice_key ) {
-    if ( !empty( $invoice_key ) && !empty( $_REQUEST['_wpipay'] ) && !is_user_logged_in() && $invoice_id = wpinv_get_invoice_id_by_key( $invoice_key ) ) {
-        if ( $invoice = wpinv_get_invoice( $invoice_id ) ) {
+function wpinv_handle_pay_via_invoice_link($invoice_key) {
+    if (!empty($invoice_key) && !empty($_REQUEST['_wpipay']) && !is_user_logged_in() && $invoice_id = wpinv_get_invoice_id_by_key($invoice_key)) {
+        if ($invoice = wpinv_get_invoice($invoice_id)) {
             $user_id = $invoice->get_user_id();
-            $secret = sanitize_text_field( $_GET['_wpipay'] );
+            $secret = sanitize_text_field($_GET['_wpipay']);
             
-            if ( $secret === md5( $user_id . '::' . $invoice->get_email() . '::' . $invoice_key ) ) { // valid invoice link
-                $redirect_to = remove_query_arg( '_wpipay', get_permalink() );
+            if ($secret === md5($user_id . '::' . $invoice->get_email() . '::' . $invoice_key)) { // valid invoice link
+                $redirect_to = remove_query_arg('_wpipay', get_permalink());
                 
-                wpinv_guest_redirect( $redirect_to, $user_id );
+                wpinv_guest_redirect($redirect_to, $user_id);
                 exit();
             }
         }
     }
 }
-add_action( 'wpinv_check_pay_for_invoice', 'wpinv_handle_pay_via_invoice_link' );
+add_action('wpinv_check_pay_for_invoice', 'wpinv_handle_pay_via_invoice_link');
 
-function wpinv_set_payment_transaction_id( $invoice_id = 0, $transaction_id = '' ) {
-    $invoice_id = is_object( $invoice_id ) && !empty( $invoice_id->ID ) ? $invoice_id : $invoice_id;
+function wpinv_set_payment_transaction_id($invoice_id = 0, $transaction_id = '') {
+    $invoice_id = is_object($invoice_id) && !empty($invoice_id->ID) ? $invoice_id : $invoice_id;
     
-    if ( empty( $invoice_id ) && $invoice_id > 0 ) {
+    if (empty($invoice_id) && $invoice_id > 0) {
         return false;
     }
     
-    if ( empty( $transaction_id ) ) {
+    if (empty($transaction_id)) {
         $transaction_id = $invoice_id;
     }
 
-    $transaction_id = apply_filters( 'wpinv_set_payment_transaction_id', $transaction_id, $invoice_id );
+    $transaction_id = apply_filters('wpinv_set_payment_transaction_id', $transaction_id, $invoice_id);
     
-    return wpinv_update_invoice_meta( $invoice_id, '_wpinv_transaction_id', $transaction_id );
+    return wpinv_update_invoice_meta($invoice_id, '_wpinv_transaction_id', $transaction_id);
 }
 
-function wpinv_invoice_status_label( $status, $status_display = '' ) {
-    if ( empty( $status_display ) ) {
-        $status_display = wpinv_status_nicename( $status );
+function wpinv_invoice_status_label($status, $status_display = '') {
+    if (empty($status_display)) {
+        $status_display = wpinv_status_nicename($status);
     }
     
-    switch ( $status ) {
+    switch ($status) {
         case 'publish' :
         case 'wpi-renewal' :
             $class = 'label-success';
@@ -2083,201 +2083,201 @@ 
     
     $label = '<span class="label label-inv-' . $status . ' ' . $class . '">' . $status_display . '</span>';
     
-    return apply_filters( 'wpinv_invoice_status_label', $label, $status, $status_display );
+    return apply_filters('wpinv_invoice_status_label', $label, $status, $status_display);
 }
 
-function wpinv_format_invoice_number( $number, $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_format_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+function wpinv_format_invoice_number($number, $type = '') {
+    $check = apply_filters('wpinv_pre_format_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
 
-    if ( !empty( $number ) && !is_numeric( $number ) ) {
+    if (!empty($number) && !is_numeric($number)) {
         return $number;
     }
 
-    $padd  = wpinv_get_option( 'invoice_number_padd' );
-    $prefix  = wpinv_get_option( 'invoice_number_prefix' );
-    $postfix = wpinv_get_option( 'invoice_number_postfix' );
+    $padd = wpinv_get_option('invoice_number_padd');
+    $prefix  = wpinv_get_option('invoice_number_prefix');
+    $postfix = wpinv_get_option('invoice_number_postfix');
     
-    $padd = absint( $padd );
-    $formatted_number = absint( $number );
+    $padd = absint($padd);
+    $formatted_number = absint($number);
     
-    if ( $padd > 0 ) {
-        $formatted_number = zeroise( $formatted_number, $padd );
+    if ($padd > 0) {
+        $formatted_number = zeroise($formatted_number, $padd);
     }    
 
     $formatted_number = $prefix . $formatted_number . $postfix;
 
-    return apply_filters( 'wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd );
+    return apply_filters('wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd);
 }
 
-function wpinv_get_next_invoice_number( $type = '' ) {
-    $check = apply_filters( 'wpinv_get_pre_next_invoice_number', null, $type );
-    if ( null !== $check ) {
+function wpinv_get_next_invoice_number($type = '') {
+    $check = apply_filters('wpinv_get_pre_next_invoice_number', null, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    if ( !wpinv_sequential_number_active() ) {
+    if (!wpinv_sequential_number_active()) {
         return false;
     }
 
-    $number = $last_number = get_option( 'wpinv_last_invoice_number', 0 );
-    $start  = wpinv_get_option( 'invoice_sequence_start', 1 );
-    if ( !absint( $start ) > 0 ) {
+    $number = $last_number = get_option('wpinv_last_invoice_number', 0);
+    $start  = wpinv_get_option('invoice_sequence_start', 1);
+    if (!absint($start) > 0) {
         $start = 1;
     }
     $increment_number = true;
     $save_number = false;
 
-    if ( !empty( $number ) && !is_numeric( $number ) && $number == wpinv_format_invoice_number( $number ) ) {
-        $number = wpinv_clean_invoice_number( $number );
+    if (!empty($number) && !is_numeric($number) && $number == wpinv_format_invoice_number($number)) {
+        $number = wpinv_clean_invoice_number($number);
     }
 
-    if ( empty( $number ) ) {
-        if ( !( $last_number === 0 || $last_number === '0' ) ) {
-            $last_invoice = wpinv_get_invoices( array( 'limit' => 1, 'order' => 'DESC', 'orderby' => 'ID', 'return' => 'posts', 'fields' => 'ids', 'status' => array_keys( wpinv_get_invoice_statuses( true, true ) ) ) );
+    if (empty($number)) {
+        if (!($last_number === 0 || $last_number === '0')) {
+            $last_invoice = wpinv_get_invoices(array('limit' => 1, 'order' => 'DESC', 'orderby' => 'ID', 'return' => 'posts', 'fields' => 'ids', 'status' => array_keys(wpinv_get_invoice_statuses(true, true))));
 
-            if ( !empty( $last_invoice[0] ) && $invoice_number = wpinv_get_invoice_number( $last_invoice[0] ) ) {
-                if ( is_numeric( $invoice_number ) ) {
+            if (!empty($last_invoice[0]) && $invoice_number = wpinv_get_invoice_number($last_invoice[0])) {
+                if (is_numeric($invoice_number)) {
                     $number = $invoice_number;
                 } else {
-                    $number = wpinv_clean_invoice_number( $invoice_number );
+                    $number = wpinv_clean_invoice_number($invoice_number);
                 }
             }
 
-            if ( empty( $number ) ) {
+            if (empty($number)) {
                 $increment_number = false;
                 $number = $start;
-                $save_number = ( $number - 1 );
+                $save_number = ($number - 1);
             } else {
                 $save_number = $number;
             }
         }
     }
 
-    if ( $start > $number ) {
+    if ($start > $number) {
         $increment_number = false;
         $number = $start;
-        $save_number = ( $number - 1 );
+        $save_number = ($number - 1);
     }
 
-    if ( $save_number !== false ) {
-        update_option( 'wpinv_last_invoice_number', $save_number );
+    if ($save_number !== false) {
+        update_option('wpinv_last_invoice_number', $save_number);
     }
     
-    $increment_number = apply_filters( 'wpinv_increment_payment_number', $increment_number, $number );
+    $increment_number = apply_filters('wpinv_increment_payment_number', $increment_number, $number);
 
-    if ( $increment_number ) {
+    if ($increment_number) {
         $number++;
     }
 
-    return apply_filters( 'wpinv_get_next_invoice_number', $number );
+    return apply_filters('wpinv_get_next_invoice_number', $number);
 }
 
-function wpinv_clean_invoice_number( $number, $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_clean_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+function wpinv_clean_invoice_number($number, $type = '') {
+    $check = apply_filters('wpinv_pre_clean_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    $prefix  = wpinv_get_option( 'invoice_number_prefix' );
-    $postfix = wpinv_get_option( 'invoice_number_postfix' );
+    $prefix  = wpinv_get_option('invoice_number_prefix');
+    $postfix = wpinv_get_option('invoice_number_postfix');
 
-    $number = preg_replace( '/' . $prefix . '/', '', $number, 1 );
+    $number = preg_replace('/' . $prefix . '/', '', $number, 1);
 
-    $length      = strlen( $number );
-    $postfix_pos = strrpos( $number, $postfix );
+    $length      = strlen($number);
+    $postfix_pos = strrpos($number, $postfix);
     
-    if ( false !== $postfix_pos ) {
-        $number      = substr_replace( $number, '', $postfix_pos, $length );
+    if (false !== $postfix_pos) {
+        $number = substr_replace($number, '', $postfix_pos, $length);
     }
 
-    $number = intval( $number );
+    $number = intval($number);
 
-    return apply_filters( 'wpinv_clean_invoice_number', $number, $prefix, $postfix );
+    return apply_filters('wpinv_clean_invoice_number', $number, $prefix, $postfix);
 }
 
-function wpinv_save_number_post_saved( $post_ID, $post, $update ) {
+function wpinv_save_number_post_saved($post_ID, $post, $update) {
     global $wpdb;
 
-    if ( !$update && !get_post_meta( $post_ID, '_wpinv_number', true ) ) {
-        wpinv_update_invoice_number( $post_ID, $post->post_status != 'auto-draft', $post->post_type );
+    if (!$update && !get_post_meta($post_ID, '_wpinv_number', true)) {
+        wpinv_update_invoice_number($post_ID, $post->post_status != 'auto-draft', $post->post_type);
     }
 
-    if ( !$update ) {
-        $wpdb->update( $wpdb->posts, array( 'post_name' => wpinv_generate_post_name( $post_ID ) ), array( 'ID' => $post_ID ) );
-        clean_post_cache( $post_ID );
+    if (!$update) {
+        $wpdb->update($wpdb->posts, array('post_name' => wpinv_generate_post_name($post_ID)), array('ID' => $post_ID));
+        clean_post_cache($post_ID);
     }
 }
-add_action( 'save_post_wpi_invoice', 'wpinv_save_number_post_saved', 1, 3 );
+add_action('save_post_wpi_invoice', 'wpinv_save_number_post_saved', 1, 3);
 
-function wpinv_save_number_post_updated( $post_ID, $post_after, $post_before ) {
-    if ( !empty( $post_after->post_type ) && $post_after->post_type == 'wpi_invoice' && $post_before->post_status == 'auto-draft' && $post_after->post_status != $post_before->post_status ) {
-        wpinv_update_invoice_number( $post_ID, true, $post_after->post_type );
+function wpinv_save_number_post_updated($post_ID, $post_after, $post_before) {
+    if (!empty($post_after->post_type) && $post_after->post_type == 'wpi_invoice' && $post_before->post_status == 'auto-draft' && $post_after->post_status != $post_before->post_status) {
+        wpinv_update_invoice_number($post_ID, true, $post_after->post_type);
     }
 }
-add_action( 'post_updated', 'wpinv_save_number_post_updated', 1, 3 );
+add_action('post_updated', 'wpinv_save_number_post_updated', 1, 3);
 
-function wpinv_update_invoice_number( $post_ID, $save_sequential = false, $type = '' ) {
+function wpinv_update_invoice_number($post_ID, $save_sequential = false, $type = '') {
     global $wpdb;
     
-    $check = apply_filters( 'wpinv_pre_update_invoice_number', null, $post_ID, $save_sequential, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_pre_update_invoice_number', null, $post_ID, $save_sequential, $type);
+    if (null !== $check) {
         return $check;
     }
 
-    if ( wpinv_sequential_number_active() ) {
+    if (wpinv_sequential_number_active()) {
         $number = wpinv_get_next_invoice_number();
 
-        if ( $save_sequential ) {
-            update_option( 'wpinv_last_invoice_number', $number );
+        if ($save_sequential) {
+            update_option('wpinv_last_invoice_number', $number);
         }
     } else {
         $number = $post_ID;
     }
 
-    $number = wpinv_format_invoice_number( $number );
+    $number = wpinv_format_invoice_number($number);
 
-    update_post_meta( $post_ID, '_wpinv_number', $number );
+    update_post_meta($post_ID, '_wpinv_number', $number);
 
-    $wpdb->update( $wpdb->posts, array( 'post_title' => $number ), array( 'ID' => $post_ID ) );
+    $wpdb->update($wpdb->posts, array('post_title' => $number), array('ID' => $post_ID));
 
-    clean_post_cache( $post_ID );
+    clean_post_cache($post_ID);
 
     return $number;
 }
 
-function wpinv_post_name_prefix( $post_type = 'wpi_invoice' ) {
-    return apply_filters( 'wpinv_post_name_prefix', 'inv-', $post_type );
+function wpinv_post_name_prefix($post_type = 'wpi_invoice') {
+    return apply_filters('wpinv_post_name_prefix', 'inv-', $post_type);
 }
 
-function wpinv_generate_post_name( $post_ID ) {
-    $prefix = wpinv_post_name_prefix( get_post_type( $post_ID ) );
-    $post_name = sanitize_title( $prefix . $post_ID );
+function wpinv_generate_post_name($post_ID) {
+    $prefix = wpinv_post_name_prefix(get_post_type($post_ID));
+    $post_name = sanitize_title($prefix . $post_ID);
 
-    return apply_filters( 'wpinv_generate_post_name', $post_name, $post_ID, $prefix );
+    return apply_filters('wpinv_generate_post_name', $post_name, $post_ID, $prefix);
 }
 
-function wpinv_is_invoice_viewed( $invoice_id ) {
-    if ( empty( $invoice_id ) ) {
+function wpinv_is_invoice_viewed($invoice_id) {
+    if (empty($invoice_id)) {
         return false;
     }
 
-    $viewed_meta = get_post_meta( $invoice_id, '_wpinv_is_viewed', true );
+    $viewed_meta = get_post_meta($invoice_id, '_wpinv_is_viewed', true);
 
-    return apply_filters( 'wpinv_is_invoice_viewed', 1 === (int)$viewed_meta, $invoice_id );
+    return apply_filters('wpinv_is_invoice_viewed', 1 === (int)$viewed_meta, $invoice_id);
 }
 
 function wpinv_mark_invoice_viewed() {
 
-    if ( isset( $_GET['invoice_key'] ) || is_singular( 'wpi_invoice' ) || is_singular( 'wpi_quote' ) ) {
-        $invoice_key = isset( $_GET['invoice_key'] ) ? urldecode($_GET['invoice_key']) : '';
+    if (isset($_GET['invoice_key']) || is_singular('wpi_invoice') || is_singular('wpi_quote')) {
+        $invoice_key = isset($_GET['invoice_key']) ? urldecode($_GET['invoice_key']) : '';
 	    global $post;
 
-        if(!empty($invoice_key)){
+        if (!empty($invoice_key)) {
 	        $invoice_id = wpinv_get_invoice_id_by_key($invoice_key);
-        } else if(!empty( $post ) && ($post->post_type == 'wpi_invoice' || $post->post_type == 'wpi_quote')) {
+        } else if (!empty($post) && ($post->post_type == 'wpi_invoice' || $post->post_type == 'wpi_quote')) {
 			$invoice_id = $post->ID;
         } else {
         	return;
@@ -2285,60 +2285,60 @@ 
 
         $invoice = new WPInv_Invoice($invoice_id);
 
-        if(!$invoice_id){
+        if (!$invoice_id) {
             return;
         }
 
-	    if ( is_user_logged_in() ) {
-		    if ( (int)$invoice->get_user_id() === get_current_user_id() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+	    if (is_user_logged_in()) {
+		    if ((int)$invoice->get_user_id() === get_current_user_id()) {
+			    update_post_meta($invoice_id, '_wpinv_is_viewed', 1);
+		    } else if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+			    update_post_meta($invoice_id, '_wpinv_is_viewed', 1);
 		    }
 	    } else {
-		    if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+		    if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+			    update_post_meta($invoice_id, '_wpinv_is_viewed', 1);
 		    }
 	    }
     }
 
 }
-add_action( 'template_redirect', 'wpinv_mark_invoice_viewed' );
+add_action('template_redirect', 'wpinv_mark_invoice_viewed');
 
-function wpinv_get_subscription( $invoice, $by_parent = false ) {
-    if ( empty( $invoice ) ) {
+function wpinv_get_subscription($invoice, $by_parent = false) {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( ! is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( !( is_object( $invoice ) && ! empty( $invoice->ID ) && $invoice->is_recurring() ) ) {
+    if (!(is_object($invoice) && !empty($invoice->ID) && $invoice->is_recurring())) {
         return false;
     }
     
-    $invoice_id = ! $by_parent && ! empty( $invoice->parent_invoice ) ? $invoice->parent_invoice : $invoice->ID;
+    $invoice_id = !$by_parent && !empty($invoice->parent_invoice) ? $invoice->parent_invoice : $invoice->ID;
     
     $subs_db    = new WPInv_Subscriptions_DB;
-    $subs       = $subs_db->get_subscriptions( array( 'parent_payment_id' => $invoice_id, 'number' => 1 ) );
+    $subs       = $subs_db->get_subscriptions(array('parent_payment_id' => $invoice_id, 'number' => 1));
     
-    if ( ! empty( $subs ) ) {
-        return reset( $subs );
+    if (!empty($subs)) {
+        return reset($subs);
     }
     
     return false;
 }
 
-function wpinv_filter_posts_clauses( $clauses, $wp_query ) {
+function wpinv_filter_posts_clauses($clauses, $wp_query) {
     global $wpdb;
 
-    if ( ! empty( $wp_query->query_vars['orderby'] ) && $wp_query->query_vars['orderby'] == 'invoice_date' ) {
-        if ( !empty( $clauses['join'] ) ) {
+    if (!empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'invoice_date') {
+        if (!empty($clauses['join'])) {
             $clauses['join'] .= " ";
         }
 
-        if ( !empty( $clauses['fields'] ) ) {
+        if (!empty($clauses['fields'])) {
             $clauses['fields'] .= ", ";
         }
 
@@ -2349,4 +2349,4 @@ 
 
     return $clauses;
 }
-add_filter( 'posts_clauses', 'wpinv_filter_posts_clauses', 10, 2 );
\ No newline at end of file
+add_filter('posts_clauses', 'wpinv_filter_posts_clauses', 10, 2);
\ No newline at end of file

includes/class-wpinv-cli.php

Spacing +16 added lines, -16 removed lines

@@ -7,7 +7,7 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -24,40 +24,40 @@ 
      *  @param Array $assoc_args Key value arguments stored in associated array format.
      *  @since 1.0.13
      */
-    public function insert_invoice( $args, $assoc_args ) {
+    public function insert_invoice($args, $assoc_args) {
 
         // Fetch invoice data from the args
-        $invoice_data = wp_unslash( $assoc_args );
+        $invoice_data = wp_unslash($assoc_args);
 
         // Abort if no invoice data is provided
-        if( empty( $invoice_data ) ) {
-            return WP_CLI::error( __( 'Invoice data not provided', 'invoicing' ) );
+        if (empty($invoice_data)) {
+            return WP_CLI::error(__('Invoice data not provided', 'invoicing'));
         }
 
         //Cart details
-        if( !empty( $invoice_data['cart_details'] ) ) {
-            $invoice_data['cart_details'] = json_decode( $invoice_data['cart_details'], true );
+        if (!empty($invoice_data['cart_details'])) {
+            $invoice_data['cart_details'] = json_decode($invoice_data['cart_details'], true);
         }
 
         //User details
-        if( !empty( $invoice_data['user_info'] ) ) {
-            $invoice_data['user_info'] = json_decode( $invoice_data['user_info'], true );
+        if (!empty($invoice_data['user_info'])) {
+            $invoice_data['user_info'] = json_decode($invoice_data['user_info'], true);
         }
 
         //Payment info
-        if( !empty( $invoice_data['payment_details'] ) ) {
-            $invoice_data['payment_details'] = json_decode( $invoice_data['payment_details'], true );
+        if (!empty($invoice_data['payment_details'])) {
+            $invoice_data['payment_details'] = json_decode($invoice_data['payment_details'], true);
         }
 
         // Try creating the invoice
-        $invoice = wpinv_insert_invoice( $invoice_data, true );
+        $invoice = wpinv_insert_invoice($invoice_data, true);
 
-        if ( is_wp_error( $invoice ) ) {
-            return WP_CLI::error( $invoice->get_error_message() );
+        if (is_wp_error($invoice)) {
+            return WP_CLI::error($invoice->get_error_message());
         }
 
-        $message = sprintf( __( 'Invoice %s created', 'invoicing' ), $invoice->ID );
-        WP_CLI::success( $message );
+        $message = sprintf(__('Invoice %s created', 'invoicing'), $invoice->ID);
+        WP_CLI::success($message);
     }
     
     

includes/class-wpinv-api.php

Indentation +7 added lines, -7 removed lines

@@ -46,15 +46,15 @@
     }
 
 
-	/**
-	 * Registers routes
-	 *
+    /**
+     * Registers routes
+     *
      * @since 1.0.13
-	 */
-	public function register_rest_routes() {
+     */
+    public function register_rest_routes() {
 
-		//Invoices
-		$this->invoices_controller->register_routes();
+        //Invoices
+        $this->invoices_controller->register_routes();
         
     }
 

Spacing +7 added lines, -7 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
@@ -32,17 +32,17 @@ 
      * @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->api_namespace       = apply_filters('wpinv_rest_api_namespace', $api_namespace);
+        $this->invoices_controller = new WPInv_REST_Invoice_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'));
     }
 
 
@@ -67,7 +67,7 @@ 
     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');
 
     }
     

includes/class-wpinv.php

Spacing +203 added lines, -203 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // 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__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -32,31 +32,31 @@ 
     }
     
     public function define_constants() {
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
     }
     
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        if ( class_exists( 'BuddyPress' ) ) {
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        if (class_exists('BuddyPress')) {
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
+        add_action('widgets_init', array(&$this, 'register_widgets'));
 
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_action('admin_body_class', array(&$this, 'admin_body_class'));
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -66,19 +66,19 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
     
     public function plugins_loaded() {
         /* Internationalize the text strings used. */
         $this->load_textdomain();
 
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
 
         // Fix oxygen page builder conflict
-        if ( function_exists( 'ct_css_output' ) ) {
+        if (function_exists('ct_css_output')) {
             wpinv_oxygen_fix_conflict();
         }
     }
@@ -88,228 +88,228 @@ 
      *
      * @since 1.0
      */
-    public function load_textdomain( $locale = NULL ) {
-        if ( empty( $locale ) ) {
-            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+    public function load_textdomain($locale = NULL) {
+        if (empty($locale)) {
+            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
         }
 
-        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+        $locale = apply_filters('plugin_locale', $locale, 'invoicing');
         
-        unload_textdomain( 'invoicing' );
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        unload_textdomain('invoicing');
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
         
         /**
          * Define language constants.
          */
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
     }
         
     public function includes() {
         global $wpinv_options;
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
         
-        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-
-        if ( !class_exists( 'WPInv_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+
+        if (!class_exists('WPInv_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
         
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
         
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
             // load the user class only on the users.php page
             global $pagenow;
-            if($pagenow=='users.php'){
+            if ($pagenow == 'users.php') {
                 new WPInv_Admin_Users();
             }
         }
 
         // Register cli commands
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        if (defined('WP_CLI') && WP_CLI) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+            WP_CLI::add_command('invoicing', 'WPInv_CLI');
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
     
     public function init() {
     }
     
     public function admin_init() {
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_front_style' );
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_front_style');
                
         // Register scripts
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  WPINV_VERSION );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), WPINV_VERSION);
 
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_separator();
         $localize['decimal_sep']          = wpinv_decimal_separator();
         $localize['decimals']             = wpinv_decimals();
-        $localize['txtComplete']          = __( 'Complete', 'invoicing' );
+        $localize['txtComplete']          = __('Complete', 'invoicing');
         $localize['UseTaxes']             = wpinv_use_taxes();
-        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
 
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
+        wp_enqueue_script('jquery-blockui');
         $autofill_api = wpinv_get_option('address_autofill_api');
         $autofill_active = wpinv_get_option('address_autofill_active');
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-                wp_dequeue_script( 'google-maps-api' );
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+            if (wp_script_is('google-maps-api', 'enqueued')) {
+                wp_dequeue_script('google-maps-api');
             }
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('wpinv-front-script');
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
     }
 
     public function admin_enqueue_scripts() {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
+        $suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
 
         $jquery_ui_css = false;
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $jquery_ui_css = true;
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
             $jquery_ui_css = true;
         }
-        if ( $jquery_ui_css ) {
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-            wp_enqueue_style( 'jquery-ui-css' );
+        if ($jquery_ui_css) {
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+            wp_enqueue_style('jquery-ui-css');
         }
 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_admin_style' );
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_admin_style');
 
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
+        if ($page == 'wpinv-subscriptions') {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
 
         if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $autofill_api = wpinv_get_option('address_autofill_api');
@@ -320,20 +320,20 @@ 
             }
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  WPINV_VERSION );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), WPINV_VERSION);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -341,69 +341,69 @@ 
         $localize['thousand_sep']               = wpinv_thousands_separator();
         $localize['decimal_sep']                = wpinv_decimal_separator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
-
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
-
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
-
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
+        $localize['action_edit']                = __('Edit', 'invoicing');
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
+
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
+
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
+
+        if ($page == 'wpinv-subscriptions') {
+            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION);
+            wp_enqueue_script('wpinv-sub-admin-script');
         }
     }
     
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow, $post, $current_screen;
         
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote' ) ) {
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote')) {
             $classes .= ' wpinv-cpt';
         }
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
-        if ( $add_class ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
+        if ($add_class) {
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
             return $classes .= ' wpinv';
         }
         
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
             $classes .= ' wpi-editable-n';
         }
 
@@ -415,21 +415,21 @@ 
     }
     
     public function wpinv_actions() {
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        if (isset($_REQUEST['wpi_action'])) {
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         return $wp_query;
     }
     
     public function bp_invoicing_init() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
     }
 
 	/**
@@ -437,11 +437,11 @@ 
 	 *
 	 */
 	public function register_widgets() {
-		register_widget( "WPInv_Checkout_Widget" );
-		register_widget( "WPInv_History_Widget" );
-		register_widget( "WPInv_Receipt_Widget" );
-		register_widget( "WPInv_Subscriptions_Widget" );
-		register_widget( "WPInv_Buy_Item_Widget" );
-		register_widget( "WPInv_Messages_Widget" );
+		register_widget("WPInv_Checkout_Widget");
+		register_widget("WPInv_History_Widget");
+		register_widget("WPInv_Receipt_Widget");
+		register_widget("WPInv_Subscriptions_Widget");
+		register_widget("WPInv_Buy_Item_Widget");
+		register_widget("WPInv_Messages_Widget");
 	}
 }
\ No newline at end of file

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

Indentation +1041 added lines, -1041 removed lines

@@ -20,23 +20,23 @@ 
 class WPInv_REST_Invoice_Controller extends WP_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
+     * Post type.
+     *
+     * @var string
+     */
     protected $post_type = 'wpi_invoice';
 
     /**
-	 * Constructor.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $namespace Api Namespace
-	 */
-	public function __construct( $namespace ) {
+     * Constructor.
+     *
+     * @since 1.0.13
+     *
+     * @param string $namespace Api Namespace
+     */
+    public function __construct( $namespace ) {
         
         // Set api namespace...
-		$this->namespace = $namespace;
+        $this->namespace = $namespace;
 
         // ... and the rest base
         $this->rest_base = 'invoices';
@@ -44,39 +44,39 @@ 
     }
     
     /**
-	 * Checks if a given request has access to read invoices.
+     * Checks if a given request has access to read invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
 	
         $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 invoices.', '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 invoices.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
 
-		// Read checks will be evaluated on a per invoice basis
+        // Read checks will be evaluated on a per invoice basis
 
-		return true;
+        return true;
 
     }
     
     /**
-	 * Retrieves a collection of invoices.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
+     * Retrieves a collection of invoices.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
 		
-		// Retrieve the list of registered invoice query parameters.
+        // Retrieve the list of registered invoice query parameters.
         $registered = $this->get_collection_params();
         
         $args       = array();
@@ -89,54 +89,54 @@ 
 
         }
 
-		/**
-		 * Filters the wpinv_get_invoices arguments for invoices requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $args    Key value array of query var to query value.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        /**
+         * Filters the wpinv_get_invoices arguments for invoices requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $args    Key value array of query var to query value.
+         * @param WP_REST_Request $request The request used.
+         */
         $args       = apply_filters( "wpinv_rest_get_invoices_arguments", $args, $request, $this );
 		
-		// Special args
-		$args[ 'return' ]   = 'objects';
-		$args[ 'paginate' ] = true;
+        // Special args
+        $args[ 'return' ]   = 'objects';
+        $args[ 'paginate' ] = true;
 
         // Run the query.
-		$query = wpinv_get_invoices( $args );
+        $query = wpinv_get_invoices( $args );
 		
-		// Prepare the retrieved invoices
-		$invoices = array();
-		foreach( $query->invoices as $invoice ) {
-
-			if ( ! $this->check_read_permission( $invoice ) ) {
-				continue;
-			}
-
-			$data       = $this->prepare_item_for_response( $invoice, $request );
-			$invoices[] = $this->prepare_response_for_collection( $data );
-
-		}
-
-		// Prepare the response.
-		$response = rest_ensure_response( $invoices );
-		$response->header( 'X-WP-Total', (int) $query->total );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
-
-		/**
-		 * Filters the responses for invoices requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param arrWP_REST_Response $response    Response object.
-		 * @param WP_REST_Request     $request The request used.
+        // Prepare the retrieved invoices
+        $invoices = array();
+        foreach( $query->invoices as $invoice ) {
+
+            if ( ! $this->check_read_permission( $invoice ) ) {
+                continue;
+            }
+
+            $data       = $this->prepare_item_for_response( $invoice, $request );
+            $invoices[] = $this->prepare_response_for_collection( $data );
+
+        }
+
+        // Prepare the response.
+        $response = rest_ensure_response( $invoices );
+        $response->header( 'X-WP-Total', (int) $query->total );
+        $response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+
+        /**
+         * Filters the responses for invoices requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param arrWP_REST_Response $response    Response object.
+         * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the invoices
-		 */
+         */
         $response       = apply_filters( "rest_wpinv_invoices_response", $response, $request, $args );
 
         return rest_ensure_response( $response );
@@ -144,25 +144,25 @@ 
     }
 
     /**
-	 * Get the post, if the ID is valid.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
+     * Get the post, if the ID is valid.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
 		
-		$error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid invoice ID.', 'invoicing' ), array( 'status' => 404 ) );
+        $error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid invoice ID.', 'invoicing' ), array( 'status' => 404 ) );
 
         // Ids start from 1
         if ( (int) $invoice_id <= 0 ) {
-			return $error;
-		}
+            return $error;
+        }
 
-		$invoice = wpinv_get_invoice( (int) $invoice_id );
-		if ( empty( $invoice ) ) {
-			return $error;
+        $invoice = wpinv_get_invoice( (int) $invoice_id );
+        if ( empty( $invoice ) ) {
+            return $error;
         }
 
         return $invoice;
@@ -170,88 +170,88 @@ 
     }
 
     /**
-	 * Checks if a given request has access to read an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
+     * Checks if a given request has access to read an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
 
         // Retrieve the invoice object.
         $invoice = $this->get_post( $request['id'] );
         
         // Ensure it is valid.
-		if ( is_wp_error( $invoice ) ) {
-			return $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;
+        return true;
     }
     
     /**
-	 * Checks if an invoice can be read.
-	 * 
-	 * An invoice can be read by site admins and owners of the invoice
-	 *
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @return bool Whether the post can be read.
-	 */
-	public function check_read_permission( $invoice ) {
-
-		// An invoice can be read by an admin...
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'view_invoices' ) ) {
-			return true;
-		}
+     * Checks if an invoice can be read.
+     * 
+     * An invoice can be read by site admins and owners of the invoice
+     *
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @return bool Whether the post can be read.
+     */
+    public function check_read_permission( $invoice ) {
+
+        // An invoice can be read by an admin...
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'view_invoices' ) ) {
+            return true;
+        }
 
         // ... and the owner of the invoice
-		if( get_current_user_id() ===(int) $invoice->get_user_id() ) {
-			return true;
-		}
+        if( get_current_user_id() ===(int) $invoice->get_user_id() ) {
+            return true;
+        }
 
-		return false;
+        return false;
     }
     
     /**
-	 * Retrieves a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
+     * Retrieves a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
 
         // Fetch the invoice.
         $invoice = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		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' ) );
-
-		/**
-		 * Filters the responses for single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 * @var WP_HTTP_Response
-		 *
-		 * @param WP_HTTP_Response $response Response.
-		 * @param WP_REST_Request  $request The request used.
-		 */
+        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' ) );
+
+        /**
+         * Filters the responses for single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         * @var WP_HTTP_Response
+         *
+         * @param WP_HTTP_Response $response Response.
+         * @param WP_REST_Request  $request The request used.
+         */
         $response       = apply_filters( "rest_wpinv_get_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
@@ -259,23 +259,23 @@ 
     }
     
     /**
-	 * Checks if a given request has access to create an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
+     * Checks if a given request has access to create an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', '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 ) ) {
-			return new WP_Error( 
+        if ( ! current_user_can( $post_type->cap->create_posts ) ) {
+            return new WP_Error( 
                 'rest_cannot_create', 
                 __( 'Sorry, you are not allowed to create invoices as this user.', 'invoicing' ), 
                 array( 
@@ -284,88 +284,88 @@ 
             );
         }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Creates a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
-
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+     * Creates a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
+
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing invoice.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$invoice_data = wp_unslash( $this->prepare_item_for_database( $request ) );
+        // Prepare the updated data.
+        $invoice_data = wp_unslash( $this->prepare_item_for_database( $request ) );
 
-		if ( is_wp_error( $invoice_data ) ) {
-			return $invoice_data;
-		}
+        if ( is_wp_error( $invoice_data ) ) {
+            return $invoice_data;
+        }
 
-		// Try creating the invoice
+        // Try creating the invoice
         $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 );
-
-		/**
-		 * Fires after a single invoice is created or updated via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPinv_Invoice   $invoice  Inserted or updated invoice object.
-		 * @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 );
-
-		/**
-		 * Filters the responses for creating single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $invoice_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $invoice, $request );
+
+        /**
+         * Fires after a single invoice is created or updated via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param WPinv_Invoice   $invoice  Inserted or updated invoice object.
+         * @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 );
+
+        /**
+         * Filters the responses for creating single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $invoice_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "rest_wpinv_create_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to update an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
-
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
-
-		$post_type = get_post_type_object( $this->post_type );
-
-		if ( ! current_user_can(  $post_type->cap->edit_post, $invoice->ID  ) ) {
-			return new WP_Error( 
+    }
+
+    /**
+     * Checks if a given request has access to update an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
+
+        // Retrieve the invoice.
+        $invoice = $this->get_post( $request['id'] );
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
+
+        $post_type = get_post_type_object( $this->post_type );
+
+        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 invoice.', 'invoicing' ), 
                 array( 
@@ -374,162 +374,162 @@ 
             );
         }
 
-		return true;
-	}
-
-	/**
-	 * Updates a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
+        return true;
+    }
+
+    /**
+     * Updates a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
 		
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         $valid_check = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
-			return $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 = wp_unslash( $this->prepare_item_for_database( $request ) );
+        // Prepare the updated data.
+        $data_to_update = wp_unslash( $this->prepare_item_for_database( $request ) );
 
-		if ( is_wp_error( $data_to_update ) ) {
-			return $data_to_update;
-		}
+        if ( is_wp_error( $data_to_update ) ) {
+            return $data_to_update;
+        }
 
-		// Abort if no invoice data is provided
+        // 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' ) );
         }
 
-		// Include the invoice ID
-		$data_to_update['ID'] = $request['id'];
-
-		// Update the invoice
-		$updated_invoice = wpinv_update_invoice( $data_to_update, true );
-
-		// Incase the update operation failed...
-		if ( is_wp_error( $updated_invoice ) ) {
-			return $updated_invoice;
-		}
-
-		// Prepare the response
-		$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 );
-
-		/**
-		 * Filters the responses for updating single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $invoice_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        // Include the invoice ID
+        $data_to_update['ID'] = $request['id'];
+
+        // Update the invoice
+        $updated_invoice = wpinv_update_invoice( $data_to_update, true );
+
+        // Incase the update operation failed...
+        if ( is_wp_error( $updated_invoice ) ) {
+            return $updated_invoice;
+        }
+
+        // Prepare the response
+        $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 );
+
+        /**
+         * Filters the responses for updating single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $invoice_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_update_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to delete an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
-
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
-
-		// Ensure the current user can delete invoices
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'delete_invoices' ) ) {
-			return new WP_Error( 
+    }
+
+    /**
+     * Checks if a given request has access to delete an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
+
+        // Retrieve the invoice.
+        $invoice = $this->get_post( $request['id'] );
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
+
+        // Ensure the current user can delete invoices
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'delete_invoices' ) ) {
+            return new WP_Error( 
                 'rest_cannot_delete', 
                 __( 'Sorry, you are not allowed to delete this invoice.', 'invoicing' ), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
             );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
 		
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
+        // Retrieve the 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;
+        // Prepare the invoice id
+        $id    = $invoice->ID;
 
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $invoice, $request );
 
-		// Check if the user wants to bypass the trash...
-		$force_delete = (bool) $request['force'];
+        // 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 );
+        // Try deleting the invoice.
+        $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 invoice cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
-		}
+        // Abort early if we can't delete the invoice.
+        if ( ! $deleted ) {
+            return new WP_Error( 'rest_cannot_delete', __( 'The invoice cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+        }
 
-		/**
-		 * Fires immediately after a single invoice is deleted or trashed via the REST API.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @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 );
+        /**
+         * Fires immediately after a single invoice is deleted or trashed via the REST API.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @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 );
 
-		return $response;
+        return $response;
 
-	}
+    }
     
     
     /**
-	 * Retrieves the query params for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
+     * Retrieves the query params for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
         
         $query_params               = array(
 
@@ -547,22 +547,22 @@ 
 
             // User.
             'user'                  => array(
-				'description'       => __( 'Limit result set to invoices for a specif user.', 'invoicing' ),
-				'type'              => 'integer',
+                'description'       => __( 'Limit result set to invoices for a specif user.', 'invoicing' ),
+                'type'              => 'integer',
             ),
             
             // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of invoices to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+                'description'       => __( 'Number of invoices to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => (int) get_option( 'posts_per_page' ),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => 1,
+                'description'       => __( 'Current page to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => 1,
             ),
 
             // Exclude certain invoices
@@ -598,721 +598,721 @@ 
             ),
         );
 
-		/**
-		 * Filter collection parameters for the invoices controller.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $query_params JSON Schema-formatted collection parameters.
-		 * @param WP_Post_Type $post_type    Post type object.
-		 */
-		return apply_filters( "rest_invoices_collection_params", $query_params, 'wpi-invoice' );
+        /**
+         * Filter collection parameters for the invoices controller.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param array        $query_params JSON Schema-formatted collection parameters.
+         * @param WP_Post_Type $post_type    Post type object.
+         */
+        return apply_filters( "rest_invoices_collection_params", $query_params, 'wpi-invoice' );
     }
     
     /**
-	 * Checks if a given post type can be viewed or managed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @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 ) {
-		return true;
-	}
-
-	/**
-	 * Prepares a single invoice for create or update.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array|WP_Error Invoice Properties or WP_Error.
-	 */
-	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 ) ) {
-				return $existing_invoice;
-			}
-
-			$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'] ) ) {
-			$prepared_invoice->user_id = (int) $request['user_id'];
-		}
-
-		// 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 ( in_array( $request['status'], array_keys( wpinv_get_invoice_statuses( true, true ) ), true ) ) {
-				$prepared_invoice->status = $request['status'];
-			}
-
-		}
-
-		// 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 ) {
-
-				if ( ! empty( $schema['properties']['user_info']['properties'][$prop] ) ) {
-
-					$prepared_invoice->user_info[$prop] = $value;
+     * Checks if a given post type can be viewed or managed.
+     *
+     * @since 1.0.13
+     *
+     * @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 ) {
+        return true;
+    }
+
+    /**
+     * Prepares a single invoice for create or update.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array|WP_Error Invoice Properties or WP_Error.
+     */
+    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 ) ) {
+                return $existing_invoice;
+            }
+
+            $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'] ) ) {
+            $prepared_invoice->user_id = (int) $request['user_id'];
+        }
+
+        // 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 ( in_array( $request['status'], array_keys( wpinv_get_invoice_statuses( true, true ) ), true ) ) {
+                $prepared_invoice->status = $request['status'];
+            }
+
+        }
+
+        // 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 ) {
+
+                if ( ! empty( $schema['properties']['user_info']['properties'][$prop] ) ) {
+
+                    $prepared_invoice->user_info[$prop] = $value;
 		
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		// IP
-		if ( ! empty( $schema['properties']['ip'] ) && isset( $request['ip'] ) ) {
-			$prepared_invoice->ip = $request['ip'];
-		}
+        // IP
+        if ( ! empty( $schema['properties']['ip'] ) && isset( $request['ip'] ) ) {
+            $prepared_invoice->ip = $request['ip'];
+        }
 
-		// Payment details
-		$prepared_invoice->payment_details = array();
+        // Payment details
+        $prepared_invoice->payment_details = array();
 
-		if ( ! empty( $schema['properties']['gateway'] ) && isset( $request['gateway'] ) ) {
-			$prepared_invoice->payment_details['gateway'] = $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'] ) ) {
-			$prepared_invoice->payment_details['gateway_title'] = $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'] ) ) {
-			$prepared_invoice->payment_details['currency'] = $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'] ) ) {
-			$prepared_invoice->payment_details['transaction_id'] = $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'] );
+        // Dates
+        if ( ! empty( $schema['properties']['date'] ) && isset( $request['date'] ) ) {
+            $post_date = rest_get_date_with_gmt( $request['date'] );
 
-			if ( ! empty( $post_date ) ) {
-				$prepared_invoice->post_date = $post_date[0];
-			}
+            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( $due_date ) ) {
+                $prepared_invoice->due_date = $due_date[0];
+            }
+
+        }
+
+        $invoice_data = (array) $prepared_invoice;
+
+        /**
+         * Filters an invoice before it is inserted via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @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 );
+
+    }
+
+    /**
+     * Prepares a single invoice output for response.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice   $invoice    Invoice object.
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response Response object.
+     */
+    public function prepare_item_for_response( $invoice, $request ) {
 
-		if ( ! empty( $schema['properties']['due_date'] ) && isset( $request['due_date'] ) ) {
-			$due_date = rest_get_date_with_gmt( $request['due_date'] );
+        $GLOBALS['post'] = get_post( $invoice->ID );
 
-			if ( ! empty( $due_date ) ) {
-				$prepared_invoice->due_date = $due_date[0];
-			}
+        setup_postdata( $invoice->ID );
 
-		}
+        // Fetch the fields to include in this response.
+        $fields = $this->get_fields_for_response( $request );
 
-		$invoice_data = (array) $prepared_invoice;
+        // Base fields for every invoice.
+        $data = array();
 
-		/**
-		 * Filters an invoice before it is inserted via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @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 );
+        // Set up ID
+        if ( rest_is_field_included( 'id', $fields ) ) {
+            $data['id'] = $invoice->ID;
+        }
+
+
+        // Basic properties
+        $invoice_properties = array(
+            'title', 'email', 'ip', 
+            'key', 'number', 'transaction_id', 'mode',
+            'gateway', 'gateway_title',
+            'total', 'discount', 'discount_code', 
+            'tax', 'fees_total', 'subtotal', 'currency',
+            'status', 'status_nicename', 'post_type'
+        );
 
-	}
+        foreach( $invoice_properties as $property ) {
 
-	/**
-	 * Prepares a single invoice output for response.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice   $invoice    Invoice object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response Response object.
-	 */
-	public function prepare_item_for_response( $invoice, $request ) {
+            if ( rest_is_field_included( $property, $fields ) ) {
+                $data[$property] = $invoice->get( $property );
+            }
+
+        }
 
-		$GLOBALS['post'] = get_post( $invoice->ID );
+        // Cart details
+        if ( rest_is_field_included( 'cart_details', $fields ) ) {
+            $data['cart_details'] = $invoice->get( 'cart_details' );
+        }
 
-		setup_postdata( $invoice->ID );
+        //Dates
+        $invoice_properties = array( 'date', 'due_date', 'completed_date' );
 
-		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
+        foreach( $invoice_properties as $property ) {
 
-		// Base fields for every invoice.
-		$data = array();
+            if ( rest_is_field_included( $property, $fields ) ) {
+                $data[$property] = $this->prepare_date_response( '0000-00-00 00:00:00', $invoice->get( $property ) );
+            }
 
-		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
-			$data['id'] = $invoice->ID;
-		}
+        }
 
+        // User id
+        if ( rest_is_field_included( 'user_id', $fields ) ) {
+            $data['user_id'] = (int) $invoice->get( 'user_id' );
+        }
 
-		// Basic properties
-		$invoice_properties = array(
-			'title', 'email', 'ip', 
-			'key', 'number', 'transaction_id', 'mode',
-			'gateway', 'gateway_title',
-			'total', 'discount', 'discount_code', 
-			'tax', 'fees_total', 'subtotal', 'currency',
-			'status', 'status_nicename', 'post_type'
-		);
+        // User info
+        $user_info = array( 'first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone' );
 
-		foreach( $invoice_properties as $property ) {
+        foreach( $user_info as $property ) {
 
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $invoice->get( $property );
-			}
+            if ( rest_is_field_included( "user_info.$property", $fields ) ) {
+                $data['user_info'][$property] = $invoice->get( $property );
+            }
 
-		}
+        }
 
-		// Cart details
-		if ( rest_is_field_included( 'cart_details', $fields ) ) {
-			$data['cart_details'] = $invoice->get( 'cart_details' );
-		}
+        // Slug
+        if ( rest_is_field_included( 'slug', $fields ) ) {
+            $data['slug'] = $invoice->get( 'post_name' );
+        }
 
-		//Dates
-		$invoice_properties = array( 'date', 'due_date', 'completed_date' );
-
-		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 ) );
-			}
-
-		}
-
-		// 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' );
-
-		foreach( $user_info as $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' );
-		}
-
-		// View invoice link
-		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 );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-
-		$links = $this->prepare_links( $invoice );
-		$response->add_links( $links );
-
-		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 );
-			}
-		}
-
-		/**
-		 * Filters the invoice data for a response.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WP_REST_Response $response The response object.
-		 * @param WPInv_Invoice    $invoice  The invoice object.
-		 * @param WP_REST_Request  $request  Request object.
-		 */
-		return apply_filters( "wpinv_rest_prepare_invoice", $response, $invoice, $request );
-	}
-
-	/**
-	 * Retrieves the invoice's schema, conforming to JSON Schema.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Invoice schema data.
-	 */
-	public function get_item_schema() {
-
-		// Maybe retrieve the schema from cache.
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
-		}
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => $this->post_type,
-			'type'       => 'object',
-
-			// Base properties for every Invoice.
-			'properties' 		  => array(
-
-				'title'			  => array(
-					'description' => __( 'The title for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'user_id'		  => array(
-					'description' => __( 'The ID of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'email'		  	  => array(
-					'description' => __( 'The email of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'ip'			  => array(
-					'description' => __( 'The IP of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'user_info'       => array(
-					'description' => __( 'Information about the owner of the invoice.', 'invoicing' ),
-					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'properties'  => array(
-
-						'first_name'      => array(
-							'description' => __( 'The first name of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'last_name'       => array(
-							'description' => __( 'The last name of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'company'         => array(
-							'description' => __( 'The company of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'vat_number'      => array(
-							'description' => __( 'The VAT number of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'vat_rate'        => array(
-							'description' => __( 'The VAT rate applied on the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'address'        => array(
-							'description' => __( 'The address of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'city'            => array(
-							'description' => __( 'The city of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'country'         => array(
-							'description' => __( 'The country of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'state'           => array(
-							'description' => __( 'The state of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'zip'             => array(
-							'description' => __( 'The zip code of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'phone'             => array(
-							'description' => __( 'The phone number of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-					),
-				),
-
-				'id'           => array(
-					'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'key'			  => array(
-					'description' => __( 'A unique key for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'number'		  => array(
-					'description' => __( 'The invoice number.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'transaction_id'  => array(
-					'description' => __( 'The transaction id of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'gateway'		  => array(
-					'description' => __( 'The gateway used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'gateway_title'	  => array(
-					'description' => __( 'The title of the gateway used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'total'	  		  => array(
-					'description' => __( 'The total amount of the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'discount'		  => array(
-					'description' => __( 'The discount applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'discount_code'	  => array(
-					'description' => __( 'The discount code applied to the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'tax'	  		  => array(
-					'description' => __( 'The tax applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'fees_total'	  => array(
-					'description' => __( 'The total fees applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'subtotal'	  	  => array(
-					'description' => __( 'The sub-total for the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'currency'	  	  => array(
-					'description' => __( 'The currency used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'cart_details'	  => array(
-					'description' => __( 'The cart details for invoice.', 'invoicing' ),
-					'type'        => 'array',
-					'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' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'due_date'     => array(
-					'description' => __( 'The due date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'completed_date'  => array(
-					'description' => __( 'The completed date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
+        // View invoice link
+        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 );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+
+        $links = $this->prepare_links( $invoice );
+        $response->add_links( $links );
+
+        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 );
+            }
+        }
+
+        /**
+         * Filters the invoice data for a response.
+         *
+         * @since 1.0.13
+         *
+         * @param WP_REST_Response $response The response object.
+         * @param WPInv_Invoice    $invoice  The invoice object.
+         * @param WP_REST_Request  $request  Request object.
+         */
+        return apply_filters( "wpinv_rest_prepare_invoice", $response, $invoice, $request );
+    }
+
+    /**
+     * Retrieves the invoice's schema, conforming to JSON Schema.
+     *
+     * @since 1.0.13
+     *
+     * @return array Invoice schema data.
+     */
+    public function get_item_schema() {
+
+        // Maybe retrieve the schema from cache.
+        if ( $this->schema ) {
+            return $this->add_additional_fields_schema( $this->schema );
+        }
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+
+            // Base properties for every Invoice.
+            'properties' 		  => array(
+
+                'title'			  => array(
+                    'description' => __( 'The title for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'user_id'		  => array(
+                    'description' => __( 'The ID of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'email'		  	  => array(
+                    'description' => __( 'The email of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'ip'			  => array(
+                    'description' => __( 'The IP of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'user_info'       => array(
+                    'description' => __( 'Information about the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'object',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'properties'  => array(
+
+                        'first_name'      => array(
+                            'description' => __( 'The first name of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'last_name'       => array(
+                            'description' => __( 'The last name of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'company'         => array(
+                            'description' => __( 'The company of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'vat_number'      => array(
+                            'description' => __( 'The VAT number of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'vat_rate'        => array(
+                            'description' => __( 'The VAT rate applied on the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'address'        => array(
+                            'description' => __( 'The address of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'city'            => array(
+                            'description' => __( 'The city of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'country'         => array(
+                            'description' => __( 'The country of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'state'           => array(
+                            'description' => __( 'The state of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'zip'             => array(
+                            'description' => __( 'The zip code of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'phone'             => array(
+                            'description' => __( 'The phone number of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+                    ),
+                ),
+
+                'id'           => array(
+                    'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'key'			  => array(
+                    'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'number'		  => array(
+                    'description' => __( 'The invoice number.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'transaction_id'  => array(
+                    'description' => __( 'The transaction id of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'gateway'		  => array(
+                    'description' => __( 'The gateway used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'gateway_title'	  => array(
+                    'description' => __( 'The title of the gateway used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'total'	  		  => array(
+                    'description' => __( 'The total amount of the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'discount'		  => array(
+                    'description' => __( 'The discount applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'discount_code'	  => array(
+                    'description' => __( 'The discount code applied to the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'tax'	  		  => array(
+                    'description' => __( 'The tax applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'fees_total'	  => array(
+                    'description' => __( 'The total fees applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'subtotal'	  	  => array(
+                    'description' => __( 'The sub-total for the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'currency'	  	  => array(
+                    'description' => __( 'The currency used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'cart_details'	  => array(
+                    'description' => __( 'The cart details for invoice.', 'invoicing' ),
+                    'type'        => 'array',
+                    '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' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'due_date'     => array(
+                    'description' => __( 'The due date for the invoice.', 'invoicing' ),
+                    'type'        => array( 'string', 'null' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'completed_date'  => array(
+                    'description' => __( 'The completed date for the invoice.', 'invoicing' ),
+                    'type'        => array( 'string', 'null' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
 				
-				'link'         => array(
-					'description' => __( 'URL to the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'format'      => 'uri',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'mode'       	  => array(
-					'description' => __( 'The mode used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array( 'live', 'test' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'slug'       	  => array(
-					'description' => __( 'An alphanumeric identifier for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'arg_options' => array(
-						'sanitize_callback' => array( $this, 'sanitize_slug' ),
-					),
-					'readonly'    => true,
-				),
-
-				'status'       	  => array(
-					'description' => __( 'A named status for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array_keys( wpinv_get_invoice_statuses( true, true ) ),
-					'context'     => array( 'view', 'edit' ),
-					'default'	  => 'wpi-pending',
-				),
-
-				'status_nicename' => array(
-					'description' => __( 'A human-readable status name for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'post_type'       => array(
-					'description' => __( 'The post type for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		// Add helpful links to the invoice schem.
-		$schema['links'] = $this->get_schema_links();
-
-		/**
-		 * Filters the invoice schema for the REST API.
-		 *
-		 * Enables adding extra properties to invoices.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $schema    The invoice schema.
-		 */
+                'link'         => array(
+                    'description' => __( 'URL to the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'format'      => 'uri',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'mode'       	  => array(
+                    'description' => __( 'The mode used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array( 'live', 'test' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'slug'       	  => array(
+                    'description' => __( 'An alphanumeric identifier for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'arg_options' => array(
+                        'sanitize_callback' => array( $this, 'sanitize_slug' ),
+                    ),
+                    'readonly'    => true,
+                ),
+
+                'status'       	  => array(
+                    'description' => __( 'A named status for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array_keys( wpinv_get_invoice_statuses( true, true ) ),
+                    'context'     => array( 'view', 'edit' ),
+                    'default'	  => 'wpi-pending',
+                ),
+
+                'status_nicename' => array(
+                    'description' => __( 'A human-readable status name for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'post_type'       => array(
+                    'description' => __( 'The post type for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        // Add helpful links to the invoice schem.
+        $schema['links'] = $this->get_schema_links();
+
+        /**
+         * Filters the invoice schema for the REST API.
+         *
+         * Enables adding extra properties to invoices.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $schema    The invoice schema.
+         */
         $schema = apply_filters( "wpinv_rest_invoice_schema", $schema );
 
-		// Cache the invoice schema.
-		$this->schema = $schema;
+        // Cache the invoice schema.
+        $this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
-	}
-
-	/**
-	 * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array
-	 */
-	protected function get_schema_links() {
-
-		$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' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties' => array(
-					'status' => array(
-						'type' => 'string',
-						'enum' => array( 'publish', 'wpi-renewal' ),
-					),
-				),
-			),
-		);
-
-		$links[] = array(
-			'rel'          => 'https://api.w.org/action-assign-author',
-			'title'        => __( 'The current user can change the owner of this invoice.', 'invoicing' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties'   => array(
-					'user_id'  => array(
-						'type' => 'integer',
-					),
-				),
-			),
-		);
-
-		return $links;
-	}
-
-	/**
-	 * Prepares links for the request.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice $invoice Invoice Object.
-	 * @return array Links for the given invoice.
-	 */
-	protected function prepare_links( $invoice ) {
-
-		// Prepare the base REST API endpoint for invoices.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
-
-		// Entity meta.
-		$links = array(
-			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $invoice->ID ),
-			),
-			'collection' => array(
-				'href' => rest_url( $base ),
-			),
-		);
-
-		if ( ! empty( $invoice->user_id ) ) {
-			$links['user'] = array(
-				'href'       => rest_url( 'wp/v2/users/' . $invoice->user_id ),
-				'embeddable' => true,
-			);
-		}
-
-		/**
-		 * Filters the returned invoice links for the REST API.
-		 *
-		 * Enables adding extra links to invoice API responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $links    Rest links.
-		 */
-		return apply_filters( "wpinv_invoice_rest_links", $links );
-
-	}
-
-	/**
-	 * Get the link relations available for the post and current user.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice   $invoice    Invoice object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array List of link relations.
-	 */
-	protected function get_available_actions( $invoice, $request ) {
-
-		if ( 'edit' !== $request['context'] ) {
-			return array();
-		}
-
-		$rels = array();
-
-		// Retrieve the post type object.
-		$post_type = get_post_type_object( $invoice->post_type );
-
-		// Mark invoice as completed.
-		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 ) ) {
-			$rels[] = 'https://api.w.org/action-assign-author';
-		}
-
-		/**
-		 * Filters the available invoice link relations for the REST API.
-		 *
-		 * Enables adding extra link relation for the current user and request to invoice responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $rels    Available link relations.
-		 */
-		return apply_filters( "wpinv_invoice_rest_link_relations", $rels );
-	}
-
-	/**
-	 * Sanitizes and validates the list of post statuses.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string|array    $statuses  One or more post statuses.
-	 * @param WP_REST_Request $request   Full details about the request.
-	 * @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 ) {
-
-		$statuses 	  = wp_parse_slug_list( $statuses );
-		$valid_statuses = array_keys( wpinv_get_invoice_statuses( true, true ) );
-		return array_intersect( $statuses, $valid_statuses );
+        return $this->add_additional_fields_schema( $this->schema );
+    }
+
+    /**
+     * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array
+     */
+    protected function get_schema_links() {
+
+        $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' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties' => array(
+                    'status' => array(
+                        'type' => 'string',
+                        'enum' => array( 'publish', 'wpi-renewal' ),
+                    ),
+                ),
+            ),
+        );
+
+        $links[] = array(
+            'rel'          => 'https://api.w.org/action-assign-author',
+            'title'        => __( 'The current user can change the owner of this invoice.', 'invoicing' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties'   => array(
+                    'user_id'  => array(
+                        'type' => 'integer',
+                    ),
+                ),
+            ),
+        );
+
+        return $links;
+    }
+
+    /**
+     * Prepares links for the request.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice $invoice Invoice Object.
+     * @return array Links for the given invoice.
+     */
+    protected function prepare_links( $invoice ) {
+
+        // Prepare the base REST API endpoint for invoices.
+        $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+
+        // Entity meta.
+        $links = array(
+            'self'       => array(
+                'href' => rest_url( trailingslashit( $base ) . $invoice->ID ),
+            ),
+            'collection' => array(
+                'href' => rest_url( $base ),
+            ),
+        );
+
+        if ( ! empty( $invoice->user_id ) ) {
+            $links['user'] = array(
+                'href'       => rest_url( 'wp/v2/users/' . $invoice->user_id ),
+                'embeddable' => true,
+            );
+        }
+
+        /**
+         * Filters the returned invoice links for the REST API.
+         *
+         * Enables adding extra links to invoice API responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $links    Rest links.
+         */
+        return apply_filters( "wpinv_invoice_rest_links", $links );
+
+    }
+
+    /**
+     * Get the link relations available for the post and current user.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice   $invoice    Invoice object.
+     * @param WP_REST_Request $request Request object.
+     * @return array List of link relations.
+     */
+    protected function get_available_actions( $invoice, $request ) {
+
+        if ( 'edit' !== $request['context'] ) {
+            return array();
+        }
+
+        $rels = array();
+
+        // Retrieve the post type object.
+        $post_type = get_post_type_object( $invoice->post_type );
+
+        // Mark invoice as completed.
+        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 ) ) {
+            $rels[] = 'https://api.w.org/action-assign-author';
+        }
+
+        /**
+         * Filters the available invoice link relations for the REST API.
+         *
+         * Enables adding extra link relation for the current user and request to invoice responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $rels    Available link relations.
+         */
+        return apply_filters( "wpinv_invoice_rest_link_relations", $rels );
+    }
+
+    /**
+     * Sanitizes and validates the list of post statuses.
+     *
+     * @since 1.0.13
+     *
+     * @param string|array    $statuses  One or more post statuses.
+     * @param WP_REST_Request $request   Full details about the request.
+     * @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 ) {
+
+        $statuses 	  = wp_parse_slug_list( $statuses );
+        $valid_statuses = array_keys( wpinv_get_invoice_statuses( true, true ) );
+        return array_intersect( $statuses, $valid_statuses );
 		
-	}
+    }
     
 }
\ No newline at end of file

Spacing +283 added lines, -283 removed lines

@@ -8,7 +8,7 @@ 
  * @since    1.0.13
  */
 
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -33,7 +33,7 @@ 
 	 *
 	 * @param string $namespace Api Namespace
 	 */
-	public function __construct( $namespace ) {
+	public function __construct($namespace) {
         
         // Set api namespace...
 		$this->namespace = $namespace;
@@ -52,12 +52,12 @@ 
 	 * @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 invoices.', '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 invoices.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		// Read checks will be evaluated on a per invoice basis
@@ -74,17 +74,17 @@ 
 	 * @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 the list of registered invoice query parameters.
         $registered = $this->get_collection_params();
         
         $args       = array();
 
-        foreach( array_keys( $registered ) as $key ) {
+        foreach (array_keys($registered) as $key) {
 
-            if( isset( $request[ $key] ) ) {
-                $args[ $key ] = $request[ $key];
+            if (isset($request[$key])) {
+                $args[$key] = $request[$key];
             }
 
         }
@@ -99,32 +99,32 @@ 
 		 * @param array           $args    Key value array of query var to query value.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $args       = apply_filters( "wpinv_rest_get_invoices_arguments", $args, $request, $this );
+        $args = apply_filters("wpinv_rest_get_invoices_arguments", $args, $request, $this);
 		
 		// Special args
-		$args[ 'return' ]   = 'objects';
-		$args[ 'paginate' ] = true;
+		$args['return']   = 'objects';
+		$args['paginate'] = true;
 
         // Run the query.
-		$query = wpinv_get_invoices( $args );
+		$query = wpinv_get_invoices($args);
 		
 		// Prepare the retrieved invoices
 		$invoices = array();
-		foreach( $query->invoices as $invoice ) {
+		foreach ($query->invoices as $invoice) {
 
-			if ( ! $this->check_read_permission( $invoice ) ) {
+			if (!$this->check_read_permission($invoice)) {
 				continue;
 			}
 
-			$data       = $this->prepare_item_for_response( $invoice, $request );
-			$invoices[] = $this->prepare_response_for_collection( $data );
+			$data       = $this->prepare_item_for_response($invoice, $request);
+			$invoices[] = $this->prepare_response_for_collection($data);
 
 		}
 
 		// Prepare the response.
-		$response = rest_ensure_response( $invoices );
-		$response->header( 'X-WP-Total', (int) $query->total );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+		$response = rest_ensure_response($invoices);
+		$response->header('X-WP-Total', (int)$query->total);
+		$response->header('X-WP-TotalPages', (int)$query->max_num_pages);
 
 		/**
 		 * Filters the responses for invoices requests.
@@ -137,9 +137,9 @@ 
 		 * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the invoices
 		 */
-        $response       = apply_filters( "rest_wpinv_invoices_response", $response, $request, $args );
+        $response = apply_filters("rest_wpinv_invoices_response", $response, $request, $args);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
         
     }
 
@@ -151,17 +151,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 invoice ID.', 'invoicing' ), array( 'status' => 404 ) );
+		$error = new WP_Error('rest_invoice_invalid_id', __('Invalid invoice 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 ) ) {
+		$invoice = wpinv_get_invoice((int)$invoice_id);
+		if (empty($invoice)) {
 			return $error;
         }
 
@@ -177,18 +177,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;
@@ -205,15 +205,15 @@ 
 	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
 	 * @return bool Whether the post can be read.
 	 */
-	public function check_read_permission( $invoice ) {
+	public function check_read_permission($invoice) {
 
 		// An invoice can be read by an admin...
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'view_invoices' ) ) {
+		if (current_user_can('manage_options') || current_user_can('view_invoices')) {
 			return true;
 		}
 
         // ... and the owner of the invoice
-		if( get_current_user_id() ===(int) $invoice->get_user_id() ) {
+		if (get_current_user_id() === (int)$invoice->get_user_id()) {
 			return true;
 		}
 
@@ -228,19 +228,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.
@@ -252,9 +252,9 @@ 
 		 * @param WP_HTTP_Response $response Response.
 		 * @param WP_REST_Request  $request The request used.
 		 */
-        $response       = apply_filters( "rest_wpinv_get_invoice_response", $response, $request );
+        $response = apply_filters("rest_wpinv_get_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 
     }
     
@@ -266,18 +266,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 invoice.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_invoice_exists', __('Cannot create existing invoice.', '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 ) ) {
+		if (!current_user_can($post_type->cap->create_posts)) {
 			return new WP_Error( 
                 'rest_cannot_create', 
-                __( 'Sorry, you are not allowed to create invoices as this user.', 'invoicing' ), 
+                __('Sorry, you are not allowed to create invoices as this user.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -295,30 +295,30 @@ 
 	 * @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 invoice.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!empty($request['id'])) {
+			return new WP_Error('rest_invoice_exists', __('Cannot create existing invoice.', 'invoicing'), array('status' => 400));
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the updated data.
-		$invoice_data = wp_unslash( $this->prepare_item_for_database( $request ) );
+		$invoice_data = wp_unslash($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 = wpinv_insert_invoice( $invoice_data, true );
+        $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.
@@ -329,7 +329,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.
@@ -341,9 +341,9 @@ 
 		 * @param array           $invoice_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $response       = apply_filters( "rest_wpinv_create_invoice_response", $response, $request );
+        $response = apply_filters("rest_wpinv_create_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 	}
 
 	/**
@@ -354,20 +354,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 invoice.', 'invoicing' ), 
+                __('Sorry, you are not allowed to update this invoice.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -385,46 +385,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 = wp_unslash( $this->prepare_item_for_database( $request ) );
+		$data_to_update = wp_unslash($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.
@@ -436,9 +436,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);
 	}
 
 	/**
@@ -449,19 +449,19 @@ 
 	 * @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 ( current_user_can( 'manage_options' ) ||  current_user_can( 'delete_invoices' ) ) {
+		if (current_user_can('manage_options') || current_user_can('delete_invoices')) {
 			return new WP_Error( 
                 'rest_cannot_delete', 
-                __( 'Sorry, you are not allowed to delete this invoice.', 'invoicing' ), 
+                __('Sorry, you are not allowed to delete this invoice.', 'invoicing'), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
@@ -479,31 +479,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'];
+		$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 invoice cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+		if (!$deleted) {
+			return new WP_Error('rest_cannot_delete', __('The invoice cannot be deleted.', 'invoicing'), array('status' => 500));
 		}
 
 		/**
@@ -515,7 +515,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;
 
@@ -531,43 +531,43 @@ 
 	 */
 	public function get_collection_params() {
         
-        $query_params               = array(
+        $query_params = array(
 
             // Invoice status.
             'status'                => array(
                 'default'           => 'publish',
-                'description'       => __( 'Limit result set to invoices assigned one or more statuses.', 'invoicing' ),
+                'description'       => __('Limit result set to invoices assigned one or more statuses.', 'invoicing'),
                 'type'              => 'array',
                 'items'             => array(
-                    'enum'          => array_keys( wpinv_get_invoice_statuses( true, true ) ),
+                    'enum'          => array_keys(wpinv_get_invoice_statuses(true, true)),
                     'type'          => 'string',
                 ),
-                'sanitize_callback' => array( $this, 'sanitize_post_statuses' ),
+                'sanitize_callback' => array($this, 'sanitize_post_statuses'),
             ),
 
             // User.
             'user'                  => array(
-				'description'       => __( 'Limit result set to invoices for a specif user.', 'invoicing' ),
+				'description'       => __('Limit result set to invoices for a specif user.', 'invoicing'),
 				'type'              => 'integer',
             ),
             
             // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of invoices to fetch.', 'invoicing' ),
+				'description'       => __('Number of invoices 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,
             ),
 
             // Exclude certain invoices
             'exclude'  => array(
-                'description' => __( 'Ensure result set excludes specific IDs.', 'invoicing' ),
+                'description' => __('Ensure result set excludes specific IDs.', 'invoicing'),
                 'type'        => 'array',
                 'items'       => array(
                     'type' => 'integer',
@@ -577,7 +577,7 @@ 
 
             // Order invoices by
             'orderby'  => array(
-                'description' => __( 'Sort invoices by object attribute.', 'invoicing' ),
+                'description' => __('Sort invoices by object attribute.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'date',
                 'enum'        => array(
@@ -591,10 +591,10 @@ 
 
             // How to order
             'order'    => array(
-                'description' => __( 'Order sort attribute ascending or descending.', 'invoicing' ),
+                'description' => __('Order sort attribute ascending or descending.', 'invoicing'),
                 'type'        => 'string',
                 'default'     => 'DESC',
-                'enum'        => array( 'ASC', 'DESC' ),
+                'enum'        => array('ASC', 'DESC'),
             ),
         );
 
@@ -607,7 +607,7 @@ 
 		 * @param array        $query_params JSON Schema-formatted collection parameters.
 		 * @param WP_Post_Type $post_type    Post type object.
 		 */
-		return apply_filters( "rest_invoices_collection_params", $query_params, 'wpi-invoice' );
+		return apply_filters("rest_invoices_collection_params", $query_params, 'wpi-invoice');
     }
     
     /**
@@ -618,7 +618,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;
 	}
 
@@ -630,49 +630,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'] ) ) {
-			$prepared_invoice->user_id = (int) $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'] ) ) {
-			$prepared_invoice->cart_details = (array) $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'], array_keys( wpinv_get_invoice_statuses( true, true ) ), true ) ) {
+			if (in_array($request['status'], array_keys(wpinv_get_invoice_statuses(true, true)), 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'];
+			$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;
 		
@@ -683,49 +683,49 @@ 
 		}
 
 		// 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];
 			}
 
 		}
 
-		$invoice_data = (array) $prepared_invoice;
+		$invoice_data = (array)$prepared_invoice;
 
 		/**
 		 * Filters an invoice before it is inserted via the REST API.
@@ -735,7 +735,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);
 
 	}
 
@@ -748,20 +748,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;
 		}
 
@@ -776,74 +776,74 @@ 
 			'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);
 			}
 
 		}
 
 		// 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);
 			}
 		}
 
@@ -856,7 +856,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);
 	}
 
 	/**
@@ -869,8 +869,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(
@@ -882,266 +882,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'        => array_keys( wpinv_get_invoice_statuses( true, true ) ),
-					'context'     => array( 'view', 'edit' ),
+					'enum'        => array_keys(wpinv_get_invoice_statuses(true, true)),
+					'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,
 				),
 			),
@@ -1159,12 +1159,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);
 	}
 
 	/**
@@ -1176,20 +1176,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'),
 					),
 				),
 			),
@@ -1197,7 +1197,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',
@@ -1220,24 +1220,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,
 			);
 		}
@@ -1251,7 +1251,7 @@ 
 		 *
 		 * @param array   $links    Rest links.
 		 */
-		return apply_filters( "wpinv_invoice_rest_links", $links );
+		return apply_filters("wpinv_invoice_rest_links", $links);
 
 	}
 
@@ -1264,24 +1264,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';
 		}
 
@@ -1294,7 +1294,7 @@ 
 		 *
 		 * @param array   $rels    Available link relations.
 		 */
-		return apply_filters( "wpinv_invoice_rest_link_relations", $rels );
+		return apply_filters("wpinv_invoice_rest_link_relations", $rels);
 	}
 
 	/**
@@ -1307,11 +1307,11 @@ 
 	 * @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 ) {
+	public function sanitize_post_statuses($statuses, $request, $parameter) {
 
-		$statuses 	  = wp_parse_slug_list( $statuses );
-		$valid_statuses = array_keys( wpinv_get_invoice_statuses( true, true ) );
-		return array_intersect( $statuses, $valid_statuses );
+		$statuses = wp_parse_slug_list($statuses);
+		$valid_statuses = array_keys(wpinv_get_invoice_statuses(true, true));
+		return array_intersect($statuses, $valid_statuses);
 		
 	}