AyeCode / invoicing

includes/class-wpinv-bp-core.php

Spacing +125 added lines, -125 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -9,42 +9,42 @@ 
     
     public function __construct() {
 
-        if ( !defined( 'WPINV_BP_SLUG' ) ) {
-            define( 'WPINV_BP_SLUG', 'invoices' );
+        if (!defined('WPINV_BP_SLUG')) {
+            define('WPINV_BP_SLUG', 'invoices');
         }
 
-        add_action( 'wp_ajax_invoicing_filter', array( $this, 'invoices_content' ) );
-        add_action( 'wp_ajax_nopriv_invoicing_filter', array( $this, 'invoices_content' ) );
-        add_filter( 'wpinv_settings_sections_general', array( $this, 'bp_section' ), 10, 1 );
-        add_filter( 'wpinv_settings_general', array( $this, 'bp_settings' ), 10, 1 );
-        add_filter( 'wp_nav_menu_objects', array( $this, 'wp_nav_menu_objects' ), 10, 2 );
+        add_action('wp_ajax_invoicing_filter', array($this, 'invoices_content'));
+        add_action('wp_ajax_nopriv_invoicing_filter', array($this, 'invoices_content'));
+        add_filter('wpinv_settings_sections_general', array($this, 'bp_section'), 10, 1);
+        add_filter('wpinv_settings_general', array($this, 'bp_settings'), 10, 1);
+        add_filter('wp_nav_menu_objects', array($this, 'wp_nav_menu_objects'), 10, 2);
         add_action('bp_setup_nav', array($this, 'setup_nav'), 15);
         
-        $position       = wpinv_get_option( 'wpinv_menu_position' );
+        $position       = wpinv_get_option('wpinv_menu_position');
         $position       = $position !== '' && $position !== false ? $position : 91;
-        $this->position = apply_filters( 'wpinv_bp_nav_position', $position );
-        $this->id     = WPINV_BP_SLUG;
+        $this->position = apply_filters('wpinv_bp_nav_position', $position);
+        $this->id = WPINV_BP_SLUG;
     }
 
     public function setup_nav() {
 
-        if ( wpinv_get_option( 'wpinv_bp_hide_menu' ) || !is_user_logged_in()) {
+        if (wpinv_get_option('wpinv_bp_hide_menu') || !is_user_logged_in()) {
             return;
         }
 
-        if(bp_displayed_user_id() != bp_loggedin_user_id() && !current_user_can('administrator')){
+        if (bp_displayed_user_id() != bp_loggedin_user_id() && !current_user_can('administrator')) {
             return;
         }
 
         $count = $this->get_invoice_count();
-        $class = ( 0 === $count ) ? 'no-count' : 'count';
+        $class = (0 === $count) ? 'no-count' : 'count';
 
         $main_nav_name = sprintf(
-            __( 'My Invoices %s', 'invoicing' ),
+            __('My Invoices %s', 'invoicing'),
             sprintf(
                 '<span class="%s">%s</span>',
-                esc_attr( $class ),
-                bp_core_number_format( $count )
+                esc_attr($class),
+                bp_core_number_format($count)
             )
         );
 
@@ -52,31 +52,31 @@ 
             'name'                => $main_nav_name,
             'slug'                => WPINV_BP_SLUG,
             'position'            => $this->position,
-            'screen_function'     => array( $this, 'invoices_screen' ),
+            'screen_function'     => array($this, 'invoices_screen'),
             'default_subnav_slug' => 'invoices',
             'item_css_id'         => $this->id
         );
 
-        bp_core_new_nav_item( $main_nav );
+        bp_core_new_nav_item($main_nav);
     }
     
     public function invoices_screen() {
-        if ( wpinv_get_option( 'wpinv_bp_hide_menu' ) ) {
+        if (wpinv_get_option('wpinv_bp_hide_menu')) {
             return;
         }
         
-        add_action( 'bp_template_content', array( $this, 'invoices_content' ) );
+        add_action('bp_template_content', array($this, 'invoices_content'));
 
-        $template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+        $template = apply_filters('bp_core_template_plugin', 'members/single/plugins');
         
-        bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
+        bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template));
     }
     
     public function invoices_content() {
-        if ( $this->has_invoices( bp_ajax_querystring( 'invoices' ) ) ) {
+        if ($this->has_invoices(bp_ajax_querystring('invoices'))) {
             global $invoices_template;
             
-            do_action( 'wpinv_bp_invoices_before_content' );
+            do_action('wpinv_bp_invoices_before_content');
             ?>
             <div class="wpi-g wpi-bp-invoices invoices invoicing" style="position:relative">
                 <div id="pag-top" class="pagination">
@@ -90,61 +90,61 @@ 
                 <table class="table table-bordered table-hover table-responsive wpi-user-invoices" style="margin:0">
                     <thead>
                         <tr>
-                            <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-                                <th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th>
+                            <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+                                <th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th>
                             <?php endforeach; ?>
                         </tr>
                     </thead>
                     <tbody>
-                        <?php foreach ( $invoices_template->invoices as $invoice ) {
+                        <?php foreach ($invoices_template->invoices as $invoice) {
                             ?>
                             <tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
-                                <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-                                    <td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
-                                        <?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?>
-                                            <?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?>
-
-                                        <?php elseif ( 'invoice-number' === $column_id ) : ?>
-                                            <a href="<?php echo esc_url( $invoice->get_view_url() ); ?>">
-                                                <?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?>
+                                <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+                                    <td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>">
+                                        <?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?>
+                                            <?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?>
+
+                                        <?php elseif ('invoice-number' === $column_id) : ?>
+                                            <a href="<?php echo esc_url($invoice->get_view_url()); ?>">
+                                                <?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?>
                                             </a>
 
-                                        <?php elseif ( 'created-date' === $column_id ) : $date = wpinv_get_date_created( $invoice->ID ); $dateYMD = wpinv_get_date_created( $invoice->ID, 'Y-m-d H:i:s' ); ?>
-                                            <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+                                        <?php elseif ('created-date' === $column_id) : $date = wpinv_get_date_created($invoice->ID); $dateYMD = wpinv_get_date_created($invoice->ID, 'Y-m-d H:i:s'); ?>
+                                            <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-                                        <?php elseif ( 'payment-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID, '', false ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s', false ); ?>
-                                            <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+                                        <?php elseif ('payment-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID, '', false); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s', false); ?>
+                                            <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-                                        <?php elseif ( 'invoice-status' === $column_id ) : ?>
-                                            <?php echo wpinv_invoice_status_label( $invoice_status, $invoice->get_status( true ) ) ; ?>
+                                        <?php elseif ('invoice-status' === $column_id) : ?>
+                                            <?php echo wpinv_invoice_status_label($invoice_status, $invoice->get_status(true)); ?>
 
-                                        <?php elseif ( 'invoice-total' === $column_id ) : ?>
-                                            <?php echo $invoice->get_total( true ); ?>
+                                        <?php elseif ('invoice-total' === $column_id) : ?>
+                                            <?php echo $invoice->get_total(true); ?>
 
-                                        <?php elseif ( 'invoice-actions' === $column_id ) : ?>
+                                        <?php elseif ('invoice-actions' === $column_id) : ?>
                                             <?php
                                                 $actions = array(
                                                     'pay'    => array(
                                                         'url'  => $invoice->get_checkout_payment_url(),
-                                                        'name' => __( 'Pay Now', 'invoicing' ),
+                                                        'name' => __('Pay Now', 'invoicing'),
                                                         'class' => 'btn-success'
                                                     ),
                                                     'print'   => array(
                                                         'url'  => $invoice->get_view_url(),
-                                                        'name' => __( 'Print', 'invoicing' ),
+                                                        'name' => __('Print', 'invoicing'),
                                                         'class' => 'btn-primary',
                                                         'attrs' => 'target="_blank"'
                                                     )
                                                 );
 
-                                                if ( ! $invoice->needs_payment() ) {
-                                                    unset( $actions['pay'] );
+                                                if (!$invoice->needs_payment()) {
+                                                    unset($actions['pay']);
                                                 }
 
-                                                if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-                                                    foreach ( $actions as $key => $action ) {
+                                                if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) {
+                                                    foreach ($actions as $key => $action) {
                                                         $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-                                                        echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                                        echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
                                                     }
                                                 }
                                             ?>
@@ -172,64 +172,64 @@ 
             </div>
             <?php
         
-            do_action( 'wpinv_bp_invoices_after_content' );
+            do_action('wpinv_bp_invoices_after_content');
         } else {
             ?>
             <div id="message" class="info">
-                <p><?php _e( 'No invoice has been made yet.', 'invoicing' ); ?></p>
+                <p><?php _e('No invoice has been made yet.', 'invoicing'); ?></p>
             </div>
             <?php
         }
         
-        if ( defined( 'DOING_AJAX' ) ) {
+        if (defined('DOING_AJAX')) {
             exit;
         }
     }
     
-    public function has_invoices( $args = '' ) {
+    public function has_invoices($args = '') {
         global $invoices_template;
 
-        $per_page = absint( wpinv_get_option( 'wpinv_bp_per_page' ) );
+        $per_page = absint(wpinv_get_option('wpinv_bp_per_page'));
         // Parse arguments.
-        $r = bp_parse_args( $args, array(
+        $r = bp_parse_args($args, array(
             'status'            => 'all',
             'page_arg'          => 'bpage',
             'page'              => 1,
             'per_page'          => $per_page > 0 ? $per_page : 20,
             'max'               => false,
             'user_id'           => bp_displayed_user_id(),
-        ), 'has_invoices' );
+        ), 'has_invoices');
 
 
-        if ( ! empty( $r['max'] ) && ( (int)$r['per_page'] > (int)$r['max'] ) ) {
-            $r['per_page'] = (int)$r['max'];
+        if (!empty($r['max']) && ((int) $r['per_page'] > (int) $r['max'])) {
+            $r['per_page'] = (int) $r['max'];
         }
 
         // Get the invoices.
-        $invoices_template = new WPInv_BP_Invoices_Template( $r['status'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['page_arg'] );
+        $invoices_template = new WPInv_BP_Invoices_Template($r['status'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['page_arg']);
 
-        return apply_filters( 'wpinv_bp_has_invoices', $invoices_template->has_invoices(), $invoices_template, $r );
+        return apply_filters('wpinv_bp_has_invoices', $invoices_template->has_invoices(), $invoices_template, $r);
     }
     
     public function get_invoice_count() {
-        $query      = apply_filters( 'wpinv_user_invoices_count_query', array( 'status' => 'all','user' => bp_displayed_user_id(), 'limit' => '-1', 'return' => 'ids', 'paginate' => false ) );
-        $invoices   = wpinv_get_invoices( $query );
+        $query      = apply_filters('wpinv_user_invoices_count_query', array('status' => 'all', 'user' => bp_displayed_user_id(), 'limit' => '-1', 'return' => 'ids', 'paginate' => false));
+        $invoices   = wpinv_get_invoices($query);
         
-        return !empty( $invoices ) ? count( $invoices ) : 0;
+        return !empty($invoices) ? count($invoices) : 0;
     }
     
     public function pagination_count() {
         global $invoices_template;
 
-        $start_num = intval( ( $invoices_template->pag_page - 1 ) * $invoices_template->pag_num ) + 1;
-        $from_num  = bp_core_number_format( $start_num );
-        $to_num    = bp_core_number_format( ( $start_num + ( $invoices_template->pag_num - 1 ) > $invoices_template->total_invoice_count ) ? $invoices_template->total_invoice_count : $start_num + ( $invoices_template->pag_num - 1 ) );
-        $total     = bp_core_number_format( $invoices_template->total_invoice_count );
+        $start_num = intval(($invoices_template->pag_page - 1) * $invoices_template->pag_num) + 1;
+        $from_num  = bp_core_number_format($start_num);
+        $to_num    = bp_core_number_format(($start_num + ($invoices_template->pag_num - 1) > $invoices_template->total_invoice_count) ? $invoices_template->total_invoice_count : $start_num + ($invoices_template->pag_num - 1));
+        $total     = bp_core_number_format($invoices_template->total_invoice_count);
 
-        if ( 1 == $invoices_template->total_invoice_count ) {
-            $message = __( 'Viewing 1 invoice', 'invoicing' );
+        if (1 == $invoices_template->total_invoice_count) {
+            $message = __('Viewing 1 invoice', 'invoicing');
         } else {
-            $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s invoice', 'Viewing %1$s - %2$s of %3$s invoices', $invoices_template->total_invoice_count, 'invoicing' ), $from_num, $to_num, $total );
+            $message = sprintf(_n('Viewing %1$s - %2$s of %3$s invoice', 'Viewing %1$s - %2$s of %3$s invoices', $invoices_template->total_invoice_count, 'invoicing'), $from_num, $to_num, $total);
         }
 
         return $message;
@@ -238,32 +238,32 @@ 
     function pagination_links() {
         global $invoices_template;
 
-        return apply_filters( 'wpinv_bp_get_pagination_links', $invoices_template->pag_links );
+        return apply_filters('wpinv_bp_get_pagination_links', $invoices_template->pag_links);
     }
     
-    public function bp_section( $settings = array() ) {
-        $settings['wpinv_bp'] = __( 'BuddyPress Integration', 'invoicing' );
+    public function bp_section($settings = array()) {
+        $settings['wpinv_bp'] = __('BuddyPress Integration', 'invoicing');
         return $settings;
     }
     
-    public function bp_settings( $settings = array() ) {
+    public function bp_settings($settings = array()) {
         $settings['wpinv_bp'] = array(
             'wpinv_bp_labels' => array(
                 'id'   => 'wpinv_bp_settings',
-                'name' => '<h3>' . __( 'BuddyPress Integration', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('BuddyPress Integration', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
             ),
             'wpinv_bp_hide_menu' => array(
                 'id'   => 'wpinv_bp_hide_menu',
-                'name' => __( 'Hide Invoices link', 'invoicing' ),
-                'desc' => __( 'Hide Invoices link from BP Profile menu.', 'invoicing' ),
+                'name' => __('Hide Invoices link', 'invoicing'),
+                'desc' => __('Hide Invoices link from BP Profile menu.', 'invoicing'),
                 'type' => 'checkbox',
             ),
             'wpinv_menu_position' => array(
                 'id'   => 'wpinv_menu_position',
-                'name' => __( 'Menu position', 'invoicing' ),
-                'desc' => __( 'Menu position for the Invoices link in BP Profile menu.', 'invoicing' ),
+                'name' => __('Menu position', 'invoicing'),
+                'desc' => __('Menu position for the Invoices link in BP Profile menu.', 'invoicing'),
                 'type' => 'number',
                 'size' => 'small',
                 'min'  => '1',
@@ -273,8 +273,8 @@ 
             ),
             'wpinv_bp_per_page' => array(
                 'id'   => 'wpinv_bp_per_page',
-                'name' => __( 'Max invoices per page', 'invoicing' ),
-                'desc' => __( 'Enter a number to lists the invoices for each page.', 'invoicing' ),
+                'name' => __('Max invoices per page', 'invoicing'),
+                'desc' => __('Enter a number to lists the invoices for each page.', 'invoicing'),
                 'type' => 'number',
                 'size' => 'small',
                 'min'  => '1',
@@ -287,20 +287,20 @@ 
         return $settings;
     }
 
-    public function wp_nav_menu_objects($items, $args){
-        if(!is_user_logged_in()){
+    public function wp_nav_menu_objects($items, $args) {
+        if (!is_user_logged_in()) {
             return $items;
         }
 
-        if(!apply_filters('wpinv_bp_invoice_history_redirect', true, $items, $args)){
+        if (!apply_filters('wpinv_bp_invoice_history_redirect', true, $items, $args)) {
             return $items;
         }
 
         $user_id = get_current_user_id();
-        $link = bp_core_get_user_domain( $user_id ).WPINV_BP_SLUG;
+        $link = bp_core_get_user_domain($user_id) . WPINV_BP_SLUG;
         $history_link = wpinv_get_history_page_uri();
-        foreach ( $items as $item ) {
-            $item->url = str_replace( $history_link, $link, $item->url );
+        foreach ($items as $item) {
+            $item->url = str_replace($history_link, $link, $item->url);
         }
 
         return $items;
@@ -318,78 +318,78 @@ 
     public $pag_links = '';
     public $total_invoice_count = 0;
     
-    public function __construct( $status, $page, $per_page, $max, $user_id, $page_arg = 'bpage' ) {
-        $this->invoices = array( 'invoices' => array(), 'total' => 0 );
+    public function __construct($status, $page, $per_page, $max, $user_id, $page_arg = 'bpage') {
+        $this->invoices = array('invoices' => array(), 'total' => 0);
         
-        $this->pag_arg  = sanitize_key( $page_arg );
-        $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $page );
-        $this->pag_num  = bp_sanitize_pagination_arg( 'num', $per_page );
+        $this->pag_arg  = sanitize_key($page_arg);
+        $this->pag_page = bp_sanitize_pagination_arg($this->pag_arg, $page);
+        $this->pag_num  = bp_sanitize_pagination_arg('num', $per_page);
 
-        $query_args     = array( 'user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true );
-        if ( !empty( $status ) && $status != 'all' ) {
+        $query_args     = array('user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true);
+        if (!empty($status) && $status != 'all') {
            $query_args['status'] = $status;
         }
-        $invoices  = wpinv_get_invoices( apply_filters( 'wpinv_bp_user_invoices_query', $query_args ) );
+        $invoices = wpinv_get_invoices(apply_filters('wpinv_bp_user_invoices_query', $query_args));
         
-        if ( !empty( $invoices ) && !empty( $invoices->found_posts ) ) {
-            $this->invoices['invoices'] = array_map( 'wpinv_get_invoice', $invoices->posts );
+        if (!empty($invoices) && !empty($invoices->found_posts)) {
+            $this->invoices['invoices'] = array_map('wpinv_get_invoice', $invoices->posts);
             $this->invoices['total']    = $invoices->found_posts;
         }
 
-        if ( empty( $max ) || ( $max >= (int)$this->invoices['total'] ) ) {
-            $this->total_invoice_count = (int)$this->invoices['total'];
+        if (empty($max) || ($max >= (int) $this->invoices['total'])) {
+            $this->total_invoice_count = (int) $this->invoices['total'];
         } else {
-            $this->total_invoice_count = (int)$max;
+            $this->total_invoice_count = (int) $max;
         }
 
         $this->invoices = $this->invoices['invoices'];
 
-        $invoice_count = count( $this->invoices );
+        $invoice_count = count($this->invoices);
 
-        if ( empty( $max ) || ( $max >= (int)$invoice_count ) ) {
-            $this->invoice_count = (int)$invoice_count;
+        if (empty($max) || ($max >= (int) $invoice_count)) {
+            $this->invoice_count = (int) $invoice_count;
         } else {
-            $this->invoice_count = (int)$max;
+            $this->invoice_count = (int) $max;
         }
         
-        if ( ! empty( $this->total_invoice_count ) && ! empty( $this->pag_num ) ) {
-            $this->pag_links = paginate_links( array(
-                'base'      => add_query_arg( $this->pag_arg, '%#%' ),
+        if (!empty($this->total_invoice_count) && !empty($this->pag_num)) {
+            $this->pag_links = paginate_links(array(
+                'base'      => add_query_arg($this->pag_arg, '%#%'),
                 'format'    => '',
-                'total'     => ceil( (int)$this->total_invoice_count / (int)$this->pag_num ),
-                'current'   => (int)$this->pag_page,
-                'prev_text' => _x( '&larr;', 'Invoice pagination previous text', 'invoicing' ),
-                'next_text' => _x( '&rarr;', 'Invoice pagination next text',     'invoicing' ),
+                'total'     => ceil((int) $this->total_invoice_count / (int) $this->pag_num),
+                'current'   => (int) $this->pag_page,
+                'prev_text' => _x('&larr;', 'Invoice pagination previous text', 'invoicing'),
+                'next_text' => _x('&rarr;', 'Invoice pagination next text', 'invoicing'),
                 'mid_size'  => 1,
                 'add_args'  => array(),
-            ) );
+            ));
         }
     }
 
     public function has_invoices() {
-        return (bool) ! empty( $this->invoice_count );
+        return (bool) !empty($this->invoice_count);
     }
 
     public function next_invoice() {
         $this->current_invoice++;
-        $this->invoice = $this->invoices[ $this->current_invoice ];
+        $this->invoice = $this->invoices[$this->current_invoice];
 
         return $this->invoice;
     }
 
     public function rewind_invoices() {
         $this->current_invoice = -1;
-        if ( $this->invoice_count > 0 ) {
+        if ($this->invoice_count > 0) {
             $this->invoice = $this->invoices[0];
         }
     }
 
     public function invoices() {
-        if ( ( $this->current_invoice + 1 ) < $this->invoice_count ) {
+        if (($this->current_invoice + 1) < $this->invoice_count) {
             return true;
-        } elseif ( ( $this->current_invoice + 1 ) === $this->invoice_count ) {
+        } elseif (($this->current_invoice + 1) === $this->invoice_count) {
 
-            do_action( 'wpinv_bp_invoice_loop_end' );
+            do_action('wpinv_bp_invoice_loop_end');
             
             $this->rewind_invoices();
         }
@@ -403,19 +403,19 @@ 
         $this->in_the_loop = true;
         $this->invoice     = $this->next_invoice();
 
-        if ( 0 === $this->current_invoice ) {
-            do_action( 'wpinv_bp_invoice_loop_start' );
+        if (0 === $this->current_invoice) {
+            do_action('wpinv_bp_invoice_loop_start');
         }
     }
 }
 
 function wpinv_bp_setup_component() {
 
-    if(!class_exists( 'BuddyPress' )){
+    if (!class_exists('BuddyPress')) {
         return;
     }
 
     new WPInv_BP_Component();
 
 }
-add_action( 'bp_loaded', 'wpinv_bp_setup_component' );
\ No newline at end of file
+add_action('bp_loaded', 'wpinv_bp_setup_component');
\ No newline at end of file

includes/class-wpinv-notes.php

Spacing +42 added lines, -42 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,74 +14,74 @@ 
     }
     
     public function init() {
-        do_action( 'wpinv_class_notes_init', $this );
+        do_action('wpinv_class_notes_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_notes_includes', $this );
+        do_action('wpinv_class_notes_includes', $this);
     }
     
     public function actions() {
         // Secure inovice notes
-        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
-        add_action( 'comment_feed_where', array( $this, 'wpinv_comment_feed_where' ), 10, 1 );
+        add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
+        add_action('comment_feed_where', array($this, 'wpinv_comment_feed_where'), 10, 1);
         
         // Count comments
-        add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 11, 2 );
+        add_filter('wp_count_comments', array($this, 'wp_count_comments'), 11, 2);
         
         // Delete comments count cache whenever there is a new comment or a comment status changes
-        add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-        add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+        add_action('wp_insert_comment', array($this, 'delete_comments_count_cache'));
+        add_action('wp_set_comment_status', array($this, 'delete_comments_count_cache'));
         
-        do_action( 'wpinv_class_notes_actions', $this );
+        do_action('wpinv_class_notes_actions', $this);
     }
         
-    public function set_invoice_note_type( $query ) {
-        $post_ID        = !empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+    public function set_invoice_note_type($query) {
+        $post_ID = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
         
-        if ( $post_ID && in_array(get_post_type( $post_ID ), array($this->invoice_post_type, 'wpi_quote' )) ) {
+        if ($post_ID && in_array(get_post_type($post_ID), array($this->invoice_post_type, 'wpi_quote'))) {
             $query->query_vars['type__in']      = $this->comment_type;
             $query->query_vars['type__not_in']  = '';
         } else {        
-            if ( isset( $query->query_vars['type__in'] ) && $type_in = $query->query_vars['type__in'] ) {
-                if ( is_array( $type_in ) && in_array( $this->comment_type, $type_in ) ) {
-                    $key = array_search( $this->comment_type, $type_in );
-                    unset( $query->query_vars['type__in'][$key] );
-                } else if ( !is_array( $type_in ) && $type_in == $this->comment_type ) {
+            if (isset($query->query_vars['type__in']) && $type_in = $query->query_vars['type__in']) {
+                if (is_array($type_in) && in_array($this->comment_type, $type_in)) {
+                    $key = array_search($this->comment_type, $type_in);
+                    unset($query->query_vars['type__in'][$key]);
+                } else if (!is_array($type_in) && $type_in == $this->comment_type) {
                     $query->query_vars['type__in'] = '';
                 }
             }
             
-            if ( isset( $query->query_vars['type__not_in'] ) && $type_not_in = $query->query_vars['type__not_in'] ) {
-                if ( is_array( $type_not_in ) && !in_array( $this->comment_type, $type_not_in ) ) {
+            if (isset($query->query_vars['type__not_in']) && $type_not_in = $query->query_vars['type__not_in']) {
+                if (is_array($type_not_in) && !in_array($this->comment_type, $type_not_in)) {
                     $query->query_vars['type__not_in'][] = $this->comment_type;
-                } else if ( !is_array( $type_not_in ) && $type_not_in != $this->comment_type ) {
-                    $query->query_vars['type__not_in'] = (array)$query->query_vars['type__not_in'];
+                } else if (!is_array($type_not_in) && $type_not_in != $this->comment_type) {
+                    $query->query_vars['type__not_in'] = (array) $query->query_vars['type__not_in'];
                     $query->query_vars['type__not_in'][] = $this->comment_type;
                 }
             } else {
-                $query->query_vars['type__not_in']  = $this->comment_type;
+                $query->query_vars['type__not_in'] = $this->comment_type;
             }
         }
         
         return $query;
     }
     
-    public function get_invoice_notes( $invoice_id = 0, $type = '' ) {
+    public function get_invoice_notes($invoice_id = 0, $type = '') {
         $args = array( 
             'post_id'   => $invoice_id,
             'orderby'   => 'comment_ID',
             'order'     => 'ASC',
         );
         
-        if ( $type == 'customer' ) {
+        if ($type == 'customer') {
             $args['meta_key']   = '_wpi_customer_note';
             $args['meta_value'] = 1;
         }
         
-        $args   = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+        $args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
         
-        return get_comments( $args );
+        return get_comments($args);
     }
     
     /**
@@ -92,7 +92,7 @@ 
      * @return void
      */
     public function delete_comments_count_cache() {
-        delete_transient( 'wpinv_count_comments' );
+        delete_transient('wpinv_count_comments');
     }
     
     /**
@@ -103,16 +103,16 @@ 
      * @param  int    $post_id Post ID.
      * @return object
      */
-    public function wp_count_comments( $stats, $post_id ) {
+    public function wp_count_comments($stats, $post_id) {
         global $wpdb;
 
-        if ( 0 === $post_id ) {
-            $stats = get_transient( 'wpinv_count_comments' );
+        if (0 === $post_id) {
+            $stats = get_transient('wpinv_count_comments');
 
-            if ( ! $stats ) {
+            if (!$stats) {
                 $stats = array();
 
-                $count = $wpdb->get_results( "SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A );
+                $count = $wpdb->get_results("SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A);
 
                 $total = 0;
                 $approved = array(
@@ -123,33 +123,33 @@ 
                     'post-trashed' => 'post-trashed',
                 );
 
-                foreach ( (array) $count as $row ) {
+                foreach ((array) $count as $row) {
                     // Do not count post-trashed toward totals.
-                    if ( 'post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved'] ) {
+                    if ('post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved']) {
                         $total += $row['num_comments'];
                     }
-                    if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-                        $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+                    if (isset($approved[$row['comment_approved']])) {
+                        $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
                     }
                 }
 
                 $stats['total_comments'] = $total;
                 $stats['all'] = $total;
-                foreach ( $approved as $key ) {
-                    if ( empty( $stats[ $key ] ) ) {
-                        $stats[ $key ] = 0;
+                foreach ($approved as $key) {
+                    if (empty($stats[$key])) {
+                        $stats[$key] = 0;
                     }
                 }
 
                 $stats = (object) $stats;
-                set_transient( 'wpinv_count_comments', $stats );
+                set_transient('wpinv_count_comments', $stats);
             }
         }
 
         return $stats;
     }
 
-    function wpinv_comment_feed_where($where){
-        return $where . ( $where ? ' AND ' : '' ) . " comment_type != 'wpinv_note' ";
+    function wpinv_comment_feed_where($where) {
+        return $where . ($where ? ' AND ' : '') . " comment_type != 'wpinv_note' ";
     }
 }

includes/class-wpinv-session-handler.php

Spacing +56 added lines, -56 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Session handler class.
@@ -52,11 +52,11 @@ 
 	 */
 	public function __construct() {
 
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
-        add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+	    $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
+        add_action('init', array($this, 'init'), -1);
+		add_action('wp_logout', array($this, 'destroy_session'));
+		add_action('wp', array($this, 'set_customer_session_cookie'), 10);
+		add_action('shutdown', array($this, 'save_data'), 20);
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	public function init() {
 		$this->init_session_cookie();
 
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
+		if (!is_user_logged_in()) {
+			add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'));
 		}
 	}
 
@@ -80,7 +80,7 @@ 
 	public function init_session_cookie() {
 		$cookie = $this->get_session_cookie();
 
-		if ( $cookie ) {
+		if ($cookie) {
 			$this->_customer_id        = $cookie[0];
 			$this->_session_expiration = $cookie[1];
 			$this->_session_expiring   = $cookie[2];
@@ -88,17 +88,17 @@ 
 			$this->_data               = $this->get_session_data();
 
 			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+			if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
 				$this->_customer_id = get_current_user_id();
 				$this->_dirty       = true;
 				$this->save_data();
-				$this->set_customer_session_cookie( true );
+				$this->set_customer_session_cookie(true);
 			}
 
 			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
+			if (time() > $this->_session_expiring) {
 				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+				$this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
 			}
 		} else {
 			$this->set_session_expiration();
@@ -116,25 +116,25 @@ 
 	 *
 	 * @param bool $set Should the session cookie be set.
 	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
+	public function set_customer_session_cookie($set) {
+		if ($set) {
 			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+			$cookie_hash       = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
 			$this->_has_cookie = true;
 
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+			if (!isset($_COOKIE[$this->_cookie]) || $_COOKIE[$this->_cookie] !== $cookie_value) {
+				$this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
 			}
 		}
 	}
 
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
-        if ( ! headers_sent() ) {
-            setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
-        } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-            headers_sent( $file, $line );
-            trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
+	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
+        if (!headers_sent()) {
+            setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
+        } elseif (defined('WP_DEBUG') && WP_DEBUG) {
+            headers_sent($file, $line);
+            trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
         }
     }
 
@@ -145,8 +145,8 @@ 
 	 * @return bool
 	 */
 	protected function use_secure_cookie() {
-        $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+        $is_https = false !== strstr(get_option('home'), 'https:');
+		return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
 	}
 
 	/**
@@ -155,15 +155,15 @@ 
 	 * @return bool
 	 */
 	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+		return isset($_COOKIE[$this->_cookie]) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
 	}
 
 	/**
 	 * Set session expiration.
 	 */
 	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+		$this->_session_expiring   = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
+		$this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
 	}
 
 	/**
@@ -176,11 +176,11 @@ 
 	public function generate_customer_id() {
 		$customer_id = '';
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			$customer_id = get_current_user_id();
 		}
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
             $customer_id = wp_create_nonce('wpinv-session-customer-id');
 		}
 
@@ -195,27 +195,27 @@ 
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+		$cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
 
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+		if (empty($cookie_value) || !is_string($cookie_value)) {
 			return false;
 		}
 
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+		list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('||', $cookie_value);
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		// Validate hash.
 		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+		$hash    = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+		if (empty($cookie_hash) || !hash_equals($hash, $cookie_hash)) {
 			return false;
 		}
 
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+		return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
 	}
 
 	/**
@@ -224,15 +224,15 @@ 
 	 * @return array
 	 */
 	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+		return $this->has_session() ? (array) $this->get_session($this->_customer_id) : array();
 	}
 
-	public function generate_key($customer_id){
-        if(!$customer_id){
+	public function generate_key($customer_id) {
+        if (!$customer_id) {
             return;
         }
 
-        return 'wpi_trans_'.$customer_id;
+        return 'wpi_trans_' . $customer_id;
     }
 
 	/**
@@ -240,9 +240,9 @@ 
 	 */
 	public function save_data() {
 		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+		if ($this->_dirty && $this->has_session()) {
 
-            set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
+            set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
 			$this->_dirty = false;
 		}
@@ -252,7 +252,7 @@ 
 	 * Destroy all session data.
 	 */
 	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
+		$this->delete_session($this->_customer_id);
 		$this->forget_session();
 	}
 
@@ -260,7 +260,7 @@ 
 	 * Forget all session data without destroying it.
 	 */
 	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+		$this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
 
 		wpinv_empty_cart();
 
@@ -275,7 +275,7 @@ 
 	 * @param int $uid User ID.
 	 * @return string
 	 */
-	public function nonce_user_logged_out( $uid ) {
+	public function nonce_user_logged_out($uid) {
 		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
 	}
 
@@ -286,14 +286,14 @@ 
 	 * @param mixed  $default Default session value.
 	 * @return string|array
 	 */
-	public function get_session( $customer_id, $default = false ) {
+	public function get_session($customer_id, $default = false) {
 
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return array();
 		}
 
-        if ( !is_user_logged_in() ) {
-            if(!wp_verify_nonce( $customer_id, 'wpinv-session-customer-id' )){
+        if (!is_user_logged_in()) {
+            if (!wp_verify_nonce($customer_id, 'wpinv-session-customer-id')) {
                 return array();
             }
         }
@@ -301,11 +301,11 @@ 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
 
-        if ( !$value ) {
+        if (!$value) {
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
+		return maybe_unserialize($value);
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 *
 	 * @param int $customer_id Customer ID.
 	 */
-	public function delete_session( $customer_id ) {
+	public function delete_session($customer_id) {
 
         $key = $this->generate_key($customer_id);
 
@@ -326,9 +326,9 @@ 
 	 * @param string $customer_id Customer ID.
 	 * @param int    $timestamp Timestamp to expire the cookie.
 	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+	public function update_session_timestamp($customer_id, $timestamp) {
 
-        set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
+        set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
 
 	}
 }

includes/wpinv-item-functions.php

Spacing +302 added lines, -302 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-function wpinv_get_item_by_id( $id ) {
-    return wpinv_get_item_by( 'id', $id );
+function wpinv_get_item_by_id($id) {
+    return wpinv_get_item_by('id', $id);
 }
 
-function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_item_by($field = '', $value = '', $type = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
     
     $posts = array();
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
         case 'id':
-            $item = new WPInv_Item( $value );
+            $item = new WPInv_Item($value);
 
-            if ( !empty( $item ) && $item->post_type == 'wpi_item' ) {
+            if (!empty($item) && $item->post_type == 'wpi_item') {
                 return $item;
             }
             return false;
@@ -26,16 +26,16 @@ 
 
         case 'slug':
         case 'name':
-            $posts = get_posts( array(
+            $posts = get_posts(array(
                 'post_type'      => 'wpi_item',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
             break;
         case 'custom_id':
-            if ( empty( $value ) || empty( $type ) ) {
+            if (empty($value) || empty($type)) {
                 return false;
             }
             
@@ -55,10 +55,10 @@ 
                 'post_status'    => 'any',
                 'orderby'        => 'ID',
                 'order'          => 'ASC',
-                'meta_query'     => array( $meta_query )
+                'meta_query'     => array($meta_query)
             );
             
-            $posts = get_posts( $args );
+            $posts = get_posts($args);
 
             break;
 
@@ -66,10 +66,10 @@ 
             return false;
     }
     
-    if ( !empty( $posts[0] ) ) {
-        $item = new WPInv_Item( $posts[0]->ID );
+    if (!empty($posts[0])) {
+        $item = new WPInv_Item($posts[0]->ID);
 
-        if ( !empty( $item ) && $item->post_type == 'wpi_item' ) {
+        if (!empty($item) && $item->post_type == 'wpi_item') {
             return $item;
         }
     }
@@ -77,10 +77,10 @@ 
     return false;
 }
 
-function wpinv_get_item( $item = 0 ) {
-    if ( is_numeric( $item ) ) {
-        $item = get_post( $item );
-        if ( ! $item || 'wpi_item' !== $item->post_type )
+function wpinv_get_item($item = 0) {
+    if (is_numeric($item)) {
+        $item = get_post($item);
+        if (!$item || 'wpi_item' !== $item->post_type)
             return null;
         return $item;
     }
@@ -93,18 +93,18 @@ 
 
     $item = get_posts($args);
 
-    if ( $item ) {
+    if ($item) {
         return $item[0];
     }
 
     return null;
 }
 
-function wpinv_get_all_items( $args = array() ) {
+function wpinv_get_all_items($args = array()) {
 
-    $args = wp_parse_args( $args, array(
-        'status'         => array( 'publish' ),
-        'limit'          => get_option( 'posts_per_page' ),
+    $args = wp_parse_args($args, array(
+        'status'         => array('publish'),
+        'limit'          => get_option('posts_per_page'),
         'page'           => 1,
         'exclude'        => array(),
         'orderby'        => 'date',
@@ -113,7 +113,7 @@ 
         'meta_query'     => array(),
         'return'         => 'objects',
         'paginate'       => false,
-    ) );
+    ));
 
     $wp_query_args = array(
         'post_type'      => 'wpi_item',
@@ -123,26 +123,26 @@ 
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
-        'paged'          => absint( $args['page'] ),
+        'paged'          => absint($args['page']),
     );
 
-    if ( ! empty( $args['exclude'] ) ) {
-        $wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+    if (!empty($args['exclude'])) {
+        $wp_query_args['post__not_in'] = array_map('absint', $args['exclude']);
     }
 
-    if ( ! $args['paginate' ] ) {
+    if (!$args['paginate']) {
         $wp_query_args['no_found_rows'] = true;
     }
 
-    if ( ! empty( $args['search'] ) ) {
+    if (!empty($args['search'])) {
         $wp_query_args['s'] = $args['search'];
     }
 
-    if ( ! empty( $args['type'] ) && $args['type'] !== wpinv_item_types() ) {
-        $types = wpinv_parse_list( $args['type'] );
+    if (!empty($args['type']) && $args['type'] !== wpinv_item_types()) {
+        $types = wpinv_parse_list($args['type']);
         $wp_query_args['meta_query'][] = array(
             'key'     => '_wpinv_type',
-            'value'   => implode( ',', $types ),
+            'value'   => implode(',', $types),
             'compare' => 'IN',
         );
     }
@@ -150,17 +150,17 @@ 
     $wp_query_args = apply_filters('wpinv_get_items_args', $wp_query_args, $args);
 
     // Get results.
-    $items = new WP_Query( $wp_query_args );
+    $items = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'wpinv_get_item_by_id', $items->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('wpinv_get_item_by_id', $items->posts);
+    } elseif ('self' === $args['return']) {
         return $items;
     } else {
         $return = $items->posts;
     }
 
-    if ( $args['paginate' ] ) {
+    if ($args['paginate']) {
         return (object) array(
             'items'      => $return,
             'total'         => $items->found_posts,
@@ -172,143 +172,143 @@ 
 
 }
 
-function wpinv_is_free_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_free_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_free();
 }
 
-function wpinv_item_is_editable( $item = 0 ) {
-    if ( !empty( $item ) && is_a( $item, 'WP_Post' ) ) {
+function wpinv_item_is_editable($item = 0) {
+    if (!empty($item) && is_a($item, 'WP_Post')) {
         $item = $item->ID;
     }
         
-    if ( empty( $item ) ) {
+    if (empty($item)) {
         return true;
     }
 
-    $item = new WPInv_Item( $item );
+    $item = new WPInv_Item($item);
     
     return (bool) $item->is_editable();
 }
 
-function wpinv_get_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_price();
 }
 
-function wpinv_is_recurring_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_recurring_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_recurring();
 }
 
-function wpinv_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $price = wpinv_get_item_price( $item_id );
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_get_item_price($item_id);
+    $price = wpinv_price(wpinv_format_amount($price));
     
-    return apply_filters( 'wpinv_item_price', $price, $item_id );
+    return apply_filters('wpinv_item_price', $price, $item_id);
 }
 
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
+    if (empty($item_id)) {
         $item_id = get_the_ID();
     }
 
-    $price = wpinv_item_price( $item_id );
+    $price = wpinv_item_price($item_id);
 
-    $price           = apply_filters( 'wpinv_item_price', wpinv_sanitize_amount( $price ), $item_id );
+    $price           = apply_filters('wpinv_item_price', wpinv_sanitize_amount($price), $item_id);
     $formatted_price = '<span class="wpinv_price" id="wpinv_item_' . $item_id . '">' . $price . '</span>';
-    $formatted_price = apply_filters( 'wpinv_item_price_after_html', $formatted_price, $item_id, $price );
+    $formatted_price = apply_filters('wpinv_item_price_after_html', $formatted_price, $item_id, $price);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $formatted_price;
     } else {
         return $formatted_price;
     }
 }
 
-function wpinv_get_item_final_price( $item_id = 0, $amount_override = null ) {
-    if ( is_null( $amount_override ) ) {
-        $original_price = get_post_meta( $item_id, '_wpinv_price', true );
+function wpinv_get_item_final_price($item_id = 0, $amount_override = null) {
+    if (is_null($amount_override)) {
+        $original_price = get_post_meta($item_id, '_wpinv_price', true);
     } else {
         $original_price = $amount_override;
     }
     
     $price = $original_price;
 
-    return apply_filters( 'wpinv_get_item_final_price', $price, $item_id );
+    return apply_filters('wpinv_get_item_final_price', $price, $item_id);
 }
 
-function wpinv_item_custom_singular_name( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_custom_singular_name($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_custom_singular_name();
 }
 
 function wpinv_get_item_types() {
     $item_types = array(
-            'custom'    => __( 'Standard', 'invoicing' ),
-            'fee'       => __( 'Fee', 'invoicing' ),
+            'custom'    => __('Standard', 'invoicing'),
+            'fee'       => __('Fee', 'invoicing'),
         );
-    return apply_filters( 'wpinv_get_item_types', $item_types );
+    return apply_filters('wpinv_get_item_types', $item_types);
 }
 
 function wpinv_item_types() {
     $item_types = wpinv_get_item_types();
     
-    return ( !empty( $item_types ) ? array_keys( $item_types ) : array() );
+    return (!empty($item_types) ? array_keys($item_types) : array());
 }
 
-function wpinv_get_item_type( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_type($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_type();
 }
 
-function wpinv_item_type( $item_id ) {
+function wpinv_item_type($item_id) {
     $item_types = wpinv_get_item_types();
     
-    $item_type = wpinv_get_item_type( $item_id );
+    $item_type = wpinv_get_item_type($item_id);
     
-    if ( empty( $item_type ) ) {
+    if (empty($item_type)) {
         $item_type = '-';
     }
     
-    $item_type = isset( $item_types[$item_type] ) ? $item_types[$item_type] : __( $item_type, 'invoicing' );
+    $item_type = isset($item_types[$item_type]) ? $item_types[$item_type] : __($item_type, 'invoicing');
 
-    return apply_filters( 'wpinv_item_type', $item_type, $item_id );
+    return apply_filters('wpinv_item_type', $item_type, $item_id);
 }
 
-function wpinv_record_item_in_log( $item_id = 0, $file_id, $user_info, $ip, $invoice_id ) {
+function wpinv_record_item_in_log($item_id = 0, $file_id, $user_info, $ip, $invoice_id) {
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
@@ -317,264 +317,264 @@ 
         'log_type'		=> 'wpi_item'
     );
 
-    $user_id = isset( $user_info['user_id'] ) ? $user_info['user_id'] : (int) -1;
+    $user_id = isset($user_info['user_id']) ? $user_info['user_id'] : (int) -1;
 
     $log_meta = array(
         'user_info'	=> $user_info,
         'user_id'	=> $user_id,
-        'file_id'	=> (int)$file_id,
+        'file_id'	=> (int) $file_id,
         'ip'		=> $ip,
         'invoice_id'=> $invoice_id,
     );
 
-    $wpinv_logs->insert_log( $log_data, $log_meta );
+    $wpinv_logs->insert_log($log_data, $log_meta);
 }
 
-function wpinv_remove_item_logs_on_delete( $item_id = 0 ) {
-    if ( 'wpi_item' !== get_post_type( $item_id ) )
+function wpinv_remove_item_logs_on_delete($item_id = 0) {
+    if ('wpi_item' !== get_post_type($item_id))
         return;
 
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
     // Remove all log entries related to this item
-    $wpinv_logs->delete_logs( $item_id );
+    $wpinv_logs->delete_logs($item_id);
 }
-add_action( 'delete_post', 'wpinv_remove_item_logs_on_delete' );
+add_action('delete_post', 'wpinv_remove_item_logs_on_delete');
 
-function wpinv_get_random_item( $post_ids = true ) {
-    wpinv_get_random_items( 1, $post_ids );
+function wpinv_get_random_item($post_ids = true) {
+    wpinv_get_random_items(1, $post_ids);
 }
 
-function wpinv_get_random_items( $num = 3, $post_ids = true ) {
-    if ( $post_ids ) {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids' );
+function wpinv_get_random_items($num = 3, $post_ids = true) {
+    if ($post_ids) {
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids');
     } else {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num );
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num);
     }
     
-    $args  = apply_filters( 'wpinv_get_random_items', $args );
+    $args = apply_filters('wpinv_get_random_items', $args);
     
-    return get_posts( $args );
+    return get_posts($args);
 }
 
-function wpinv_get_item_token( $url = '' ) {
+function wpinv_get_item_token($url = '') {
     $args    = array();
-    $hash    = apply_filters( 'wpinv_get_url_token_algorithm', 'sha256' );
-    $secret  = apply_filters( 'wpinv_get_url_token_secret', hash( $hash, wp_salt() ) );
+    $hash    = apply_filters('wpinv_get_url_token_algorithm', 'sha256');
+    $secret  = apply_filters('wpinv_get_url_token_secret', hash($hash, wp_salt()));
 
-    $parts   = parse_url( $url );
+    $parts   = parse_url($url);
     $options = array();
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        if ( ! empty( $query_args['o'] ) ) {
-            $options = explode( ':', rawurldecode( $query_args['o'] ) );
+        if (!empty($query_args['o'])) {
+            $options = explode(':', rawurldecode($query_args['o']));
 
-            if ( in_array( 'ip', $options ) ) {
+            if (in_array('ip', $options)) {
                 $args['ip'] = wpinv_get_ip();
             }
 
-            if ( in_array( 'ua', $options ) ) {
+            if (in_array('ua', $options)) {
                 $ua = wpinv_get_user_agent();
-                $args['user_agent'] = rawurlencode( $ua );
+                $args['user_agent'] = rawurlencode($ua);
             }
         }
     }
 
-    $args = apply_filters( 'wpinv_get_url_token_args', $args, $url, $options );
+    $args = apply_filters('wpinv_get_url_token_args', $args, $url, $options);
 
     $args['secret'] = $secret;
     $args['token']  = false;
 
-    $url   = add_query_arg( $args, $url );
-    $parts = parse_url( $url );
+    $url   = add_query_arg($args, $url);
+    $parts = parse_url($url);
 
-    if ( ! isset( $parts['path'] ) ) {
+    if (!isset($parts['path'])) {
         $parts['path'] = '';
     }
 
-    $token = md5( $parts['path'] . '?' . $parts['query'] );
+    $token = md5($parts['path'] . '?' . $parts['query']);
 
     return $token;
 }
 
-function wpinv_validate_url_token( $url = '' ) {
+function wpinv_validate_url_token($url = '') {
     $ret   = false;
-    $parts = parse_url( $url );
+    $parts = parse_url($url);
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        $allowed = apply_filters( 'wpinv_url_token_allowed_params', array(
+        $allowed = apply_filters('wpinv_url_token_allowed_params', array(
             'item',
             'ttl',
             'token'
-        ) );
+        ));
 
         $remove = array();
 
-        foreach( $query_args as $key => $value ) {
-            if( false === in_array( $key, $allowed ) ) {
+        foreach ($query_args as $key => $value) {
+            if (false === in_array($key, $allowed)) {
                 $remove[] = $key;
             }
         }
 
-        if( ! empty( $remove ) ) {
-            $url = remove_query_arg( $remove, $url );
+        if (!empty($remove)) {
+            $url = remove_query_arg($remove, $url);
         }
 
-        if ( isset( $query_args['ttl'] ) && current_time( 'timestamp' ) > $query_args['ttl'] ) {
-            wp_die( apply_filters( 'wpinv_item_link_expired_text', __( 'Sorry but your item link has expired.', 'invoicing' ) ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+        if (isset($query_args['ttl']) && current_time('timestamp') > $query_args['ttl']) {
+            wp_die(apply_filters('wpinv_item_link_expired_text', __('Sorry but your item link has expired.', 'invoicing')), __('Error', 'invoicing'), array('response' => 403));
         }
 
-        if ( isset( $query_args['token'] ) && $query_args['token'] == wpinv_get_item_token( $url ) ) {
+        if (isset($query_args['token']) && $query_args['token'] == wpinv_get_item_token($url)) {
             $ret = true;
         }
 
     }
 
-    return apply_filters( 'wpinv_validate_url_token', $ret, $url, $query_args );
+    return apply_filters('wpinv_validate_url_token', $ret, $url, $query_args);
 }
 
-function wpinv_item_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_item_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
     $ret = false;
 
-    if ( is_array( $cart_items ) ) {
-        foreach ( $cart_items as $item ) {
-            if ( $item['id'] == $item_id ) {
+    if (is_array($cart_items)) {
+        foreach ($cart_items as $item) {
+            if ($item['id'] == $item_id) {
                 $ret = true;
                 break;
             }
         }
     }
 
-    return (bool) apply_filters( 'wpinv_item_in_cart', $ret, $item_id, $options );
+    return (bool) apply_filters('wpinv_item_in_cart', $ret, $item_id, $options);
 }
 
-function wpinv_get_cart_item_tax( $item_id = 0, $subtotal = '', $options = array() ) {
+function wpinv_get_cart_item_tax($item_id = 0, $subtotal = '', $options = array()) {
     $tax = 0;
-    if ( ! wpinv_item_is_tax_exclusive( $item_id ) ) {
-        $country = !empty( $_POST['country'] ) ? $_POST['country'] : false;
-        $state   = isset( $_POST['state'] ) ? $_POST['state'] : '';
+    if (!wpinv_item_is_tax_exclusive($item_id)) {
+        $country = !empty($_POST['country']) ? $_POST['country'] : false;
+        $state   = isset($_POST['state']) ? $_POST['state'] : '';
 
-        $tax = wpinv_calculate_tax( $subtotal, $country, $state, $item_id );
+        $tax = wpinv_calculate_tax($subtotal, $country, $state, $item_id);
     }
 
-    return apply_filters( 'wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options );
+    return apply_filters('wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options);
 }
 
-function wpinv_cart_item_price( $item ) {
-    $item_id    = isset( $item['id'] ) ? $item['id'] : 0;
-    $price      = isset( $item['item_price'] ) ? wpinv_round_amount( $item['item_price'] ) : 0;
-    $tax        = wpinv_price( wpinv_format_amount( $item['tax'] ) );
+function wpinv_cart_item_price($item) {
+    $item_id    = isset($item['id']) ? $item['id'] : 0;
+    $price      = isset($item['item_price']) ? wpinv_round_amount($item['item_price']) : 0;
+    $tax        = wpinv_price(wpinv_format_amount($item['tax']));
     
-    if ( !wpinv_is_free_item( $item_id ) && !wpinv_item_is_tax_exclusive( $item_id ) ) {
-        if ( wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax() ) {
+    if (!wpinv_is_free_item($item_id) && !wpinv_item_is_tax_exclusive($item_id)) {
+        if (wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax()) {
             $price += $tax;
         }
         
-        if( !wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax() ) {
+        if (!wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax()) {
             $price -= $tax;
         }        
     }
 
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_price(wpinv_format_amount($price));
 
-    return apply_filters( 'wpinv_cart_item_price_label', $price, $item );
+    return apply_filters('wpinv_cart_item_price_label', $price, $item);
 }
 
-function wpinv_cart_item_subtotal( $item ) {
-    $subtotal   = isset( $item['subtotal'] ) ? $item['subtotal'] : 0;
-    $subtotal   = wpinv_price( wpinv_format_amount( $subtotal ) );
+function wpinv_cart_item_subtotal($item) {
+    $subtotal   = isset($item['subtotal']) ? $item['subtotal'] : 0;
+    $subtotal   = wpinv_price(wpinv_format_amount($subtotal));
 
-    return apply_filters( 'wpinv_cart_item_subtotal_label', $subtotal, $item );
+    return apply_filters('wpinv_cart_item_subtotal_label', $subtotal, $item);
 }
 
-function wpinv_cart_item_tax( $item ) {
+function wpinv_cart_item_tax($item) {
     $tax        = '';
     $tax_rate   = '';
     
-    if ( isset( $item['tax'] ) && $item['tax'] > 0 && $item['subtotal'] > 0 ) {
-        $tax      = wpinv_price( wpinv_format_amount( $item['tax'] ) );
-        $tax_rate = !empty( $item['vat_rate'] ) ? $item['vat_rate'] : ( $item['tax'] / $item['subtotal'] ) * 100;
-        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+    if (isset($item['tax']) && $item['tax'] > 0 && $item['subtotal'] > 0) {
+        $tax      = wpinv_price(wpinv_format_amount($item['tax']));
+        $tax_rate = !empty($item['vat_rate']) ? $item['vat_rate'] : ($item['tax'] / $item['subtotal']) * 100;
+        $tax_rate = $tax_rate > 0 ? (float) wpinv_round_amount($tax_rate, 4) : '';
         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate normal small">(' . $tax_rate . '%)</small>' : '';
     }
     
-    $tax        = $tax . $tax_rate;
+    $tax = $tax . $tax_rate;
     
-    if ( $tax === '' ) {
+    if ($tax === '') {
         $tax = 0; // Zero tax
     }
 
-    return apply_filters( 'wpinv_cart_item_tax_label', $tax, $item );
+    return apply_filters('wpinv_cart_item_tax_label', $tax, $item);
 }
 
-function wpinv_get_cart_item_price( $item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false ) {
+function wpinv_get_cart_item_price($item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false) {
     $price = 0;
     
     // Set custom price
-    if ( isset( $cart_item['custom_price'] ) && $cart_item['custom_price'] !== '' ) {
+    if (isset($cart_item['custom_price']) && $cart_item['custom_price'] !== '') {
         $price = $cart_item['custom_price'];
     } else {
-        $variable_prices = wpinv_has_variable_prices( $item_id );
+        $variable_prices = wpinv_has_variable_prices($item_id);
 
-        if ( $variable_prices ) {
-            $prices = wpinv_get_variable_prices( $item_id );
+        if ($variable_prices) {
+            $prices = wpinv_get_variable_prices($item_id);
 
-            if ( $prices ) {
-                if( ! empty( $options ) ) {
-                    $price = isset( $prices[ $options['price_id'] ] ) ? $prices[ $options['price_id'] ]['amount'] : false;
+            if ($prices) {
+                if (!empty($options)) {
+                    $price = isset($prices[$options['price_id']]) ? $prices[$options['price_id']]['amount'] : false;
                 } else {
                     $price = false;
                 }
             }
         }
 
-        if( ! $variable_prices || false === $price ) {
-            if($cart_item['item_price'] > 0){
+        if (!$variable_prices || false === $price) {
+            if ($cart_item['item_price'] > 0) {
                 $price = $cart_item['item_price'];
             } else {
                 // Get the standard Item price if not using variable prices
-                $price = wpinv_get_item_price( $item_id );
+                $price = wpinv_get_item_price($item_id);
             }
         }
     }
 
-    if ( $remove_tax_from_inclusive && wpinv_prices_include_tax() ) {
-        $price -= wpinv_get_cart_item_tax( $item_id, $price, $options );
+    if ($remove_tax_from_inclusive && wpinv_prices_include_tax()) {
+        $price -= wpinv_get_cart_item_tax($item_id, $price, $options);
     }
 
-    return apply_filters( 'wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive );
+    return apply_filters('wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive);
 }
 
-function wpinv_get_cart_item_price_id( $item = array() ) {
-    if( isset( $item['item_number'] ) ) {
-        $price_id = isset( $item['item_number']['options']['price_id'] ) ? $item['item_number']['options']['price_id'] : null;
+function wpinv_get_cart_item_price_id($item = array()) {
+    if (isset($item['item_number'])) {
+        $price_id = isset($item['item_number']['options']['price_id']) ? $item['item_number']['options']['price_id'] : null;
     } else {
-        $price_id = isset( $item['options']['price_id'] ) ? $item['options']['price_id'] : null;
+        $price_id = isset($item['options']['price_id']) ? $item['options']['price_id'] : null;
     }
     return $price_id;
 }
 
-function wpinv_get_cart_item_price_name( $item = array() ) {
-    $price_id = (int)wpinv_get_cart_item_price_id( $item );
-    $prices   = wpinv_get_variable_prices( $item['id'] );
-    $name     = ! empty( $prices[ $price_id ] ) ? $prices[ $price_id ]['name'] : '';
-    return apply_filters( 'wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item );
+function wpinv_get_cart_item_price_name($item = array()) {
+    $price_id = (int) wpinv_get_cart_item_price_id($item);
+    $prices   = wpinv_get_variable_prices($item['id']);
+    $name     = !empty($prices[$price_id]) ? $prices[$price_id]['name'] : '';
+    return apply_filters('wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item);
 }
 
-function wpinv_get_cart_item_name( $item = array() ) {
-    $item_title = !empty( $item['name'] ) ? $item['name'] : get_the_title( $item['id'] );
+function wpinv_get_cart_item_name($item = array()) {
+    $item_title = !empty($item['name']) ? $item['name'] : get_the_title($item['id']);
 
-    if ( empty( $item_title ) ) {
+    if (empty($item_title)) {
         $item_title = $item['id'];
     }
 
@@ -584,23 +584,23 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_get_cart_item_name', $item_title, $item['id'], $item );
+    return apply_filters('wpinv_get_cart_item_name', $item_title, $item['id'], $item);
 }
 
-function wpinv_has_variable_prices( $item_id = 0 ) {
+function wpinv_has_variable_prices($item_id = 0) {
     return false;
 }
 
-function wpinv_get_item_position_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_get_item_position_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
-    if ( !is_array( $cart_items ) ) {
+    if (!is_array($cart_items)) {
         return false; // Empty cart
     } else {
-        foreach ( $cart_items as $position => $item ) {
-            if ( $item['id'] == $item_id ) {
-                if ( isset( $options['price_id'] ) && isset( $item['options']['price_id'] ) ) {
-                    if ( (int) $options['price_id'] == (int) $item['options']['price_id'] ) {
+        foreach ($cart_items as $position => $item) {
+            if ($item['id'] == $item_id) {
+                if (isset($options['price_id']) && isset($item['options']['price_id'])) {
+                    if ((int) $options['price_id'] == (int) $item['options']['price_id']) {
                         return $position;
                     }
                 } else {
@@ -613,80 +613,80 @@ 
     return false; // Not found
 }
 
-function wpinv_get_cart_item_quantity( $item ) {
-    if ( wpinv_item_quantities_enabled() ) {
-        $quantity = !empty( $item['quantity'] ) && (int)$item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
+function wpinv_get_cart_item_quantity($item) {
+    if (wpinv_item_quantities_enabled()) {
+        $quantity = !empty($item['quantity']) && (int) $item['quantity'] > 0 ? absint($item['quantity']) : 1;
     } else {
         $quantity = 1;
     }
     
-    if ( $quantity < 1 ) {
+    if ($quantity < 1) {
         $quantity = 1;
     }
     
-    return apply_filters( 'wpinv_get_cart_item_quantity', $quantity, $item );
+    return apply_filters('wpinv_get_cart_item_quantity', $quantity, $item);
 }
 
-function wpinv_get_item_suffix( $item, $html = true ) {
-    if ( empty( $item ) ) {
+function wpinv_get_item_suffix($item, $html = true) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '';
+    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '';
     
-    if ( !$html && $suffix ) {
-        $suffix = strip_tags( $suffix );
+    if (!$html && $suffix) {
+        $suffix = strip_tags($suffix);
     }
     
-    return apply_filters( 'wpinv_get_item_suffix', $suffix, $item, $html );
+    return apply_filters('wpinv_get_item_suffix', $suffix, $item, $html);
 }
 
-function wpinv_remove_item( $item = 0, $force_delete = false ) {
-    if ( empty( $item ) ) {
+function wpinv_remove_item($item = 0, $force_delete = false) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    do_action( 'wpinv_pre_delete_item', $item );
+    do_action('wpinv_pre_delete_item', $item);
 
-    wp_delete_post( $item->ID, $force_delete );
+    wp_delete_post($item->ID, $force_delete);
 
-    do_action( 'wpinv_post_delete_item', $item );
+    do_action('wpinv_post_delete_item', $item);
 }
 
-function wpinv_can_delete_item( $post_id ) {
+function wpinv_can_delete_item($post_id) {
     $return = wpinv_current_user_can_manage_invoicing() ? true : false;
     
-    if ( $return && wpinv_item_in_use( $post_id ) ) {
+    if ($return && wpinv_item_in_use($post_id)) {
         $return = false; // Don't delete item already use in invoices.
     }
     
-    return apply_filters( 'wpinv_can_delete_item', $return, $post_id );
+    return apply_filters('wpinv_can_delete_item', $return, $post_id);
 }
 
 function wpinv_admin_action_delete() {
     $screen = get_current_screen();
     
-    if ( !empty( $screen->post_type ) && $screen->post_type == 'wpi_item' && !empty( $_REQUEST['post'] ) && is_array( $_REQUEST['post'] ) ) {
+    if (!empty($screen->post_type) && $screen->post_type == 'wpi_item' && !empty($_REQUEST['post']) && is_array($_REQUEST['post'])) {
         $post_ids = array();
         
-        foreach ( $_REQUEST['post'] as $post_id ) {
-            if ( !wpinv_can_delete_item( $post_id ) ) {
+        foreach ($_REQUEST['post'] as $post_id) {
+            if (!wpinv_can_delete_item($post_id)) {
                 continue;
             }
             
@@ -696,88 +696,88 @@ 
         $_REQUEST['post'] = $post_ids;
     }
 }
-add_action( 'admin_action_trash', 'wpinv_admin_action_delete', -10 );
-add_action( 'admin_action_delete', 'wpinv_admin_action_delete', -10 );
+add_action('admin_action_trash', 'wpinv_admin_action_delete', -10);
+add_action('admin_action_delete', 'wpinv_admin_action_delete', -10);
 
-function wpinv_check_delete_item( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_item' ) {
-        if ( $force_delete && !wpinv_can_delete_item( $post->ID ) ) {
+function wpinv_check_delete_item($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_item') {
+        if ($force_delete && !wpinv_can_delete_item($post->ID)) {
             return true;
         }
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_item', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_item', 10, 3);
 
-function wpinv_item_in_use( $item_id ) {
+function wpinv_item_in_use($item_id) {
     global $wpdb, $wpi_items_in_use;
     
-    if ( !$item_id > 0 ) {
+    if (!$item_id > 0) {
         return false;
     }
     
-    if ( !empty( $wpi_items_in_use ) ) {
-        if ( isset( $wpi_items_in_use[$item_id] ) ) {
+    if (!empty($wpi_items_in_use)) {
+        if (isset($wpi_items_in_use[$item_id])) {
             return $wpi_items_in_use[$item_id];
         }
     } else {
         $wpi_items_in_use = array();
     }
     
-    $statuses   = array_keys( wpinv_get_invoice_statuses( true, true ) );
+    $statuses = array_keys(wpinv_get_invoice_statuses(true, true));
     
-    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode( "','", $statuses ) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
-    $in_use = $wpdb->get_var( $query ) > 0 ? true : false;
+    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode("','", $statuses) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int) $item_id . "', pm.meta_value )";
+    $in_use = $wpdb->get_var($query) > 0 ? true : false;
     
     $wpi_items_in_use[$item_id] = $in_use;
     
     return $in_use;
 }
 
-function wpinv_create_item( $args = array(), $wp_error = false, $force_update = false ) {
+function wpinv_create_item($args = array(), $wp_error = false, $force_update = false) {
     // Set some defaults
     $defaults = array(
-        'type'                 => 'custom',                                                // Optional. Item type. Default 'custom'.
-        'title'                => '',                                                      // Required. Item title.
-        'custom_id'            => 0,                                                       // Optional. Any integer or non numeric id. Must be unique within item type.
-        'price'                => '0.00',                                                  // Optional. Item price. Default '0.00'.
-        'status'               => 'pending',                                               // Optional. pending, publish
-        'custom_name'          => '',                                                      // Optional. Plural sub title for item.
-        'custom_singular_name' => '',                                                      // Optional. Singular sub title for item.
-        'vat_rule'             => 'digital',                                               // Optional. digital => Digital item, physical => Physical item
-        'editable'             => true,                                                    // Optional. Item editable from Items list page? Default true.
-        'excerpt'              => '',                                                      // Optional. Item short description
+        'type'                 => 'custom', // Optional. Item type. Default 'custom'.
+        'title'                => '', // Required. Item title.
+        'custom_id'            => 0, // Optional. Any integer or non numeric id. Must be unique within item type.
+        'price'                => '0.00', // Optional. Item price. Default '0.00'.
+        'status'               => 'pending', // Optional. pending, publish
+        'custom_name'          => '', // Optional. Plural sub title for item.
+        'custom_singular_name' => '', // Optional. Singular sub title for item.
+        'vat_rule'             => 'digital', // Optional. digital => Digital item, physical => Physical item
+        'editable'             => true, // Optional. Item editable from Items list page? Default true.
+        'excerpt'              => '', // Optional. Item short description
         /* Recurring item fields */
-        'is_recurring'         => 0,                                                       // Optional. 1 => Allow recurring or 0 => Don't allow recurring
-        'recurring_period'     => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'recurring_interval'   => 0,                                                       // Optional. Integer value between 1 - 90.
-        'recurring_limit'      => 0,                                                       // Optional. Any integer number. 0 for recurring forever until cancelled.
-        'free_trial'           => 0,                                                       // Optional. 1 => Allow free trial or 0 => Don't free trial
-        'trial_period'         => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'trial_interval'       => 0,                                                       // Optional. Any integer number.
-        'minimum_price'        => '0.00',                                                  // Optional. Minimum allowed prices for items with dynamic pricing.
-        'dynamic_pricing'      => 0,                                                       // Optional. Whether or not the item supports dynamic prices.
+        'is_recurring'         => 0, // Optional. 1 => Allow recurring or 0 => Don't allow recurring
+        'recurring_period'     => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'recurring_interval'   => 0, // Optional. Integer value between 1 - 90.
+        'recurring_limit'      => 0, // Optional. Any integer number. 0 for recurring forever until cancelled.
+        'free_trial'           => 0, // Optional. 1 => Allow free trial or 0 => Don't free trial
+        'trial_period'         => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'trial_interval'       => 0, // Optional. Any integer number.
+        'minimum_price'        => '0.00', // Optional. Minimum allowed prices for items with dynamic pricing.
+        'dynamic_pricing'      => 0, // Optional. Whether or not the item supports dynamic prices.
     );
 
-    $data = wp_parse_args( $args, $defaults );
+    $data = wp_parse_args($args, $defaults);
 
-    if ( empty( $data['type'] ) ) {
+    if (empty($data['type'])) {
         $data['type'] = 'custom';
     }
 
-    if ( !empty( $data['custom_id'] ) ) {
-        $item = wpinv_get_item_by( 'custom_id', $data['custom_id'], $data['type'] );
+    if (!empty($data['custom_id'])) {
+        $item = wpinv_get_item_by('custom_id', $data['custom_id'], $data['type']);
     } else {
         $item = NULL;
     }
 
-    if ( !empty( $item ) ) {
-        if ( $force_update ) {
-            if ( empty( $args['ID'] ) ) {
+    if (!empty($item)) {
+        if ($force_update) {
+            if (empty($args['ID'])) {
                 $args['ID'] = $item->ID;
             }
-            return wpinv_update_item( $args, $wp_error );
+            return wpinv_update_item($args, $wp_error);
         }
 
         return $item;
@@ -788,21 +788,21 @@ 
     $meta['custom_id']              = $data['custom_id'];
     $meta['custom_singular_name']   = $data['custom_singular_name'];
     $meta['custom_name']            = $data['custom_name'];
-    $meta['price']                  = wpinv_round_amount( $data['price'] );
-    $meta['editable']               = (int)$data['editable'];
+    $meta['price']                  = wpinv_round_amount($data['price']);
+    $meta['editable']               = (int) $data['editable'];
     $meta['vat_rule']               = $data['vat_rule'];
     $meta['vat_class']              = '_standard';
     $meta['dynamic_pricing']        = (int) $data['dynamic_pricing'];
-    $meta['minimum_price']          = wpinv_round_amount( $data['minimum_price'] );
+    $meta['minimum_price']          = wpinv_round_amount($data['minimum_price']);
     
-    if ( !empty( $data['is_recurring'] ) ) {
+    if (!empty($data['is_recurring'])) {
         $meta['is_recurring']       = $data['is_recurring'];
         $meta['recurring_period']   = $data['recurring_period'];
-        $meta['recurring_interval'] = absint( $data['recurring_interval'] );
-        $meta['recurring_limit']    = absint( $data['recurring_limit'] );
+        $meta['recurring_interval'] = absint($data['recurring_interval']);
+        $meta['recurring_limit']    = absint($data['recurring_limit']);
         $meta['free_trial']         = $data['free_trial'];
         $meta['trial_period']       = $data['trial_period'];
-        $meta['trial_interval']     = absint( $data['trial_interval'] );
+        $meta['trial_interval']     = absint($data['trial_interval']);
     } else {
         $meta['is_recurring']       = 0;
         $meta['recurring_period']   = '';
@@ -813,7 +813,7 @@ 
         $meta['trial_interval']     = '';
     }
     
-    $post_data  = array( 
+    $post_data = array( 
         'post_title'    => $data['title'],
         'post_excerpt'  => $data['excerpt'],
         'post_status'   => $data['status'],
@@ -821,34 +821,34 @@ 
     );
 
     $item = new WPInv_Item();
-    $return = $item->create( $post_data, $wp_error );
+    $return = $item->create($post_data, $wp_error);
 
-    if ( $return && !empty( $item ) && !is_wp_error( $return ) ) {
+    if ($return && !empty($item) && !is_wp_error($return)) {
         return $item;
     }
 
-    if ( $wp_error && is_wp_error( $return ) ) {
+    if ($wp_error && is_wp_error($return)) {
         return $return;
     }
     return 0;
 }
 
-function wpinv_update_item( $args = array(), $wp_error = false ) {
-    $item = !empty( $args['ID'] ) ? new WPInv_Item( $args['ID'] ) : NULL;
+function wpinv_update_item($args = array(), $wp_error = false) {
+    $item = !empty($args['ID']) ? new WPInv_Item($args['ID']) : NULL;
 
-    if ( empty( $item ) || !( !empty( $item->post_type ) && $item->post_type == 'wpi_item' ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'wpinv_invalid_item', __( 'Invalid item.', 'invoicing' ) );
+    if (empty($item) || !(!empty($item->post_type) && $item->post_type == 'wpi_item')) {
+        if ($wp_error) {
+            return new WP_Error('wpinv_invalid_item', __('Invalid item.', 'invoicing'));
         }
         return 0;
     }
     
-    if ( !empty( $args['custom_id'] ) ) {
-        $item_exists = wpinv_get_item_by( 'custom_id', $args['custom_id'], ( !empty( $args['type'] ) ? $args['type'] : $item->type ) );
+    if (!empty($args['custom_id'])) {
+        $item_exists = wpinv_get_item_by('custom_id', $args['custom_id'], (!empty($args['type']) ? $args['type'] : $item->type));
         
-        if ( !empty( $item_exists ) && $item_exists->ID != $args['ID'] ) {
-            if ( $wp_error ) {
-                return new WP_Error( 'wpinv_invalid_custom_id', __( 'Item with custom id already exists.', 'invoicing' ) );
+        if (!empty($item_exists) && $item_exists->ID != $args['ID']) {
+            if ($wp_error) {
+                return new WP_Error('wpinv_invalid_custom_id', __('Item with custom id already exists.', 'invoicing'));
             }
             return 0;
         }
@@ -875,54 +875,54 @@ 
     );
 
     $post_data = array();
-    if ( isset( $args['title'] ) ) { 
+    if (isset($args['title'])) { 
         $post_data['post_title'] = $args['title'];
     }
-    if ( isset( $args['excerpt'] ) ) { 
+    if (isset($args['excerpt'])) { 
         $post_data['post_excerpt'] = $args['excerpt'];
     }
-    if ( isset( $args['status'] ) ) { 
+    if (isset($args['status'])) { 
         $post_data['post_status'] = $args['status'];
     }
     
-    foreach ( $meta_fields as $meta_field ) {
-        if ( isset( $args[ $meta_field ] ) ) { 
-            $value = $args[ $meta_field ];
+    foreach ($meta_fields as $meta_field) {
+        if (isset($args[$meta_field])) { 
+            $value = $args[$meta_field];
 
-            switch ( $meta_field ) {
+            switch ($meta_field) {
                 case 'price':
                 case 'minimum_price':
-                    $value = wpinv_round_amount( $value );
+                    $value = wpinv_round_amount($value);
                 break;
                 case 'recurring_interval':
                 case 'recurring_limit':
                 case 'trial_interval':
-                    $value = absint( $value );
+                    $value = absint($value);
                 break;
 				case 'editable':
                     $value = (int) $value;
                 break;
             }
 
-            $post_data['meta'][ $meta_field ] = $value;
+            $post_data['meta'][$meta_field] = $value;
         };
     }
 
-    if ( empty( $post_data ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'wpinv_invalid_item_data', __( 'Invalid item data.', 'invoicing' ) );
+    if (empty($post_data)) {
+        if ($wp_error) {
+            return new WP_Error('wpinv_invalid_item_data', __('Invalid item data.', 'invoicing'));
         }
         return 0;
     }
     $post_data['ID'] = $args['ID'];
 
-    $return = $item->update( $post_data, $wp_error );
+    $return = $item->update($post_data, $wp_error);
 
-    if ( $return && !empty( $item ) && !is_wp_error( $return ) ) {
+    if ($return && !empty($item) && !is_wp_error($return)) {
         return $item;
     }
 
-    if ( $wp_error && is_wp_error( $return ) ) {
+    if ($wp_error && is_wp_error($return)) {
         return $return;
     }
     return 0;

includes/wpinv-payment-functions.php

Spacing +78 added lines, -78 removed lines

@@ -1,155 +1,155 @@ 
 <?php
-function wpinv_is_subscription_payment( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+    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 ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
         
-    if ( $invoice->is_renewal() ) {
+    if ($invoice->is_renewal()) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+    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 ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
-    $interval   = (int)$interval > 0 ? (int)$interval : 1;
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
+    $interval   = (int) $interval > 0 ? (int) $interval : 1;
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
-        $amount = __( 'Free', 'invoicing' );
+    if ($trial_interval > 0 && !empty($trial_period)) {
+        $amount = __('Free', 'invoicing');
         $interval = $trial_interval;
         $period = $trial_period;
     }
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'W' :
         case 'week' :
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'M' :
         case 'month' :
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'Y' :
         case 'year' :
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
-    $interval   = (int)$interval > 0 ? (int)$interval : 1;
-    $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
+    $interval   = (int) $interval > 0 ? (int) $interval : 1;
+    $bill_times = (int) $bill_times > 0 ? (int) $bill_times : 0;
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'W' :
         case 'week' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'M' :
         case 'month' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'Y' :
         case 'year' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $description = '';
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-        if ( $item->has_free_trial() ) {
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+        if ($item->has_free_trial()) {
             $trial_period = $item->get_trial_period();
             $trial_interval = $item->get_trial_interval();
         } else {
@@ -157,45 +157,45 @@ 
             $trial_interval = 0;
         }
         
-        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+        $description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
     }
     
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-    $initial_total      = wpinv_round_amount( $initial );
-    $recurring_total    = wpinv_round_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+    $initial_total      = wpinv_round_amount($initial);
+    $recurring_total    = wpinv_round_amount($recurring);
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
+    if ($trial_interval > 0 && !empty($trial_period)) {
         // Free trial
     } else {
-        if ( $bill_times == 1 ) {
+        if ($bill_times == 1) {
             $recurring_total = $initial_total;
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
             $bill_times--;
         }
     }
     
-    $initial_amount     = wpinv_price( wpinv_format_amount( $initial_total ), $currency );
-    $recurring_amount   = wpinv_price( wpinv_format_amount( $recurring_total ), $currency );
+    $initial_amount     = wpinv_price(wpinv_format_amount($initial_total), $currency);
+    $recurring_amount   = wpinv_price(wpinv_format_amount($recurring_total), $currency);
     
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
         
-    if ( $initial_total != $recurring_total ) {
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ($initial_total != $recurring_total) {
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
         
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
     } else {
         $description    = $recurring;
     }
     
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
-function wpinv_recurring_send_payment_failed( $invoice ) {
-    if ( !empty( $invoice->ID ) ) {
-        wpinv_failed_invoice_notification( $invoice->ID );
+function wpinv_recurring_send_payment_failed($invoice) {
+    if (!empty($invoice->ID)) {
+        wpinv_failed_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1 );
\ No newline at end of file
+add_action('wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1);
\ No newline at end of file

includes/class-wpinv-item.php

Spacing +133 added lines, -133 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 class WPInv_Item {
     public $ID = 0;
@@ -49,26 +49,26 @@ 
     public $filter;
 
 
-    public function __construct( $_id = false, $_args = array() ) {
-        $item = WP_Post::get_instance( $_id );
-        return $this->setup_item( $item );
+    public function __construct($_id = false, $_args = array()) {
+        $item = WP_Post::get_instance($_id);
+        return $this->setup_item($item);
     }
 
-    private function setup_item( $item ) {
-        if( ! is_object( $item ) ) {
+    private function setup_item($item) {
+        if (!is_object($item)) {
             return false;
         }
 
-        if( ! is_a( $item, 'WP_Post' ) ) {
+        if (!is_a($item, 'WP_Post')) {
             return false;
         }
 
-        if( 'wpi_item' !== $item->post_type ) {
+        if ('wpi_item' !== $item->post_type) {
             return false;
         }
 
-        foreach ( $item as $key => $value ) {
-            switch ( $key ) {
+        foreach ($item as $key => $value) {
+            switch ($key) {
                 default:
                     $this->$key = $value;
                     break;
@@ -78,38 +78,38 @@ 
         return true;
     }
 
-    public function __get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            return call_user_func( array( $this, 'get_' . $key ) );
+    public function __get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            return call_user_func(array($this, 'get_' . $key));
         } else {
-            return new WP_Error( 'wpinv-item-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error('wpinv-item-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
         }
     }
 
-    public function create( $data = array(), $wp_error = false ) {
-        if ( $this->ID != 0 ) {
+    public function create($data = array(), $wp_error = false) {
+        if ($this->ID != 0) {
             return false;
         }
 
         $defaults = array(
             'post_type'   => 'wpi_item',
             'post_status' => 'draft',
-            'post_title'  => __( 'New Invoice Item', 'invoicing' )
+            'post_title'  => __('New Invoice Item', 'invoicing')
         );
 
-        $args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args($data, $defaults);
 
-        do_action( 'wpinv_item_pre_create', $args );
+        do_action('wpinv_item_pre_create', $args);
 
-        $id = wp_insert_post( $args, $wp_error );
+        $id = wp_insert_post($args, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
         
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
@@ -117,47 +117,47 @@ 
         }
         
         // Set custom id if not set.
-        if ( empty( $data['meta']['custom_id'] ) && !$this->get_custom_id() ) {
-            $this->save_metas( array( 'custom_id' => $id ) );
+        if (empty($data['meta']['custom_id']) && !$this->get_custom_id()) {
+            $this->save_metas(array('custom_id' => $id));
         }
 
-        do_action( 'wpinv_item_create', $id, $args );
+        do_action('wpinv_item_create', $id, $args);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
     
-    public function update( $data = array(), $wp_error = false ) {
-        if ( !$this->ID > 0 ) {
+    public function update($data = array(), $wp_error = false) {
+        if (!$this->ID > 0) {
             return false;
         }
         
         $data['ID'] = $this->ID;
 
-        do_action( 'wpinv_item_pre_update', $data );
+        do_action('wpinv_item_pre_update', $data);
         
-        $id = wp_update_post( $data, $wp_error );
+        $id = wp_update_post($data, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
         
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
 
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
             $this->save_metas($data['meta']);
         }
 
         // Set custom id if not set.
-        if ( empty( $data['meta']['custom_id'] ) && !$this->get_custom_id() ) {
-            $this->save_metas( array( 'custom_id' => $id ) );
+        if (empty($data['meta']['custom_id']) && !$this->get_custom_id()) {
+            $this->save_metas(array('custom_id' => $id));
         }
 
-        do_action( 'wpinv_item_update', $id, $data );
+        do_action('wpinv_item_update', $id, $data);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
 
     public function get_ID() {
@@ -165,111 +165,111 @@ 
     }
 
     public function get_name() {
-        return get_the_title( $this->ID );
+        return get_the_title($this->ID);
     }
     
     public function get_title() {
-        return get_the_title( $this->ID );
+        return get_the_title($this->ID);
     }
     
     public function get_status() {
-        return get_post_status( $this->ID );
+        return get_post_status($this->ID);
     }
     
     public function get_summary() {
-        $post = get_post( $this->ID );
-        return !empty( $post->post_excerpt ) ? $post->post_excerpt : '';
+        $post = get_post($this->ID);
+        return !empty($post->post_excerpt) ? $post->post_excerpt : '';
     }
 
     public function get_price() {
-        if ( ! isset( $this->price ) ) {
-            $this->price = get_post_meta( $this->ID, '_wpinv_price', true );
+        if (!isset($this->price)) {
+            $this->price = get_post_meta($this->ID, '_wpinv_price', true);
             
-            if ( $this->price ) {
-                $this->price = wpinv_sanitize_amount( $this->price );
+            if ($this->price) {
+                $this->price = wpinv_sanitize_amount($this->price);
             } else {
                 $this->price = 0;
             }
         }
         
-        return apply_filters( 'wpinv_get_item_price', $this->price, $this->ID );
+        return apply_filters('wpinv_get_item_price', $this->price, $this->ID);
     }
     
     public function get_vat_rule() {
         global $wpinv_euvat;
         
-        if( !isset( $this->vat_rule ) ) {
-            $this->vat_rule = get_post_meta( $this->ID, '_wpinv_vat_rule', true );
+        if (!isset($this->vat_rule)) {
+            $this->vat_rule = get_post_meta($this->ID, '_wpinv_vat_rule', true);
 
-            if ( empty( $this->vat_rule ) ) {        
+            if (empty($this->vat_rule)) {        
                 $this->vat_rule = $wpinv_euvat->allow_vat_rules() ? 'digital' : 'physical';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_rule', $this->vat_rule, $this->ID );
+        return apply_filters('wpinv_get_item_vat_rule', $this->vat_rule, $this->ID);
     }
     
     public function get_vat_class() {
-        if( !isset( $this->vat_class ) ) {
-            $this->vat_class = get_post_meta( $this->ID, '_wpinv_vat_class', true );
+        if (!isset($this->vat_class)) {
+            $this->vat_class = get_post_meta($this->ID, '_wpinv_vat_class', true);
 
-            if ( empty( $this->vat_class ) ) {        
+            if (empty($this->vat_class)) {        
                 $this->vat_class = '_standard';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_class', $this->vat_class, $this->ID );
+        return apply_filters('wpinv_get_item_vat_class', $this->vat_class, $this->ID);
     }
 
     public function get_type() {
-        if( ! isset( $this->type ) ) {
-            $this->type = get_post_meta( $this->ID, '_wpinv_type', true );
+        if (!isset($this->type)) {
+            $this->type = get_post_meta($this->ID, '_wpinv_type', true);
 
-            if ( empty( $this->type ) ) {
+            if (empty($this->type)) {
                 $this->type = 'custom';
             }
         }
 
-        return apply_filters( 'wpinv_get_item_type', $this->type, $this->ID );
+        return apply_filters('wpinv_get_item_type', $this->type, $this->ID);
     }
     
     public function get_custom_id() {
-        $custom_id = get_post_meta( $this->ID, '_wpinv_custom_id', true );
+        $custom_id = get_post_meta($this->ID, '_wpinv_custom_id', true);
 
-        return apply_filters( 'wpinv_get_item_custom_id', $custom_id, $this->ID );
+        return apply_filters('wpinv_get_item_custom_id', $custom_id, $this->ID);
     }
     
     public function get_custom_name() {
-        $custom_name = get_post_meta( $this->ID, '_wpinv_custom_name', true );
+        $custom_name = get_post_meta($this->ID, '_wpinv_custom_name', true);
 
-        return apply_filters( 'wpinv_get_item_custom_name', $custom_name, $this->ID );
+        return apply_filters('wpinv_get_item_custom_name', $custom_name, $this->ID);
     }
     
     public function get_custom_singular_name() {
-        $custom_singular_name = get_post_meta( $this->ID, '_wpinv_custom_singular_name', true );
+        $custom_singular_name = get_post_meta($this->ID, '_wpinv_custom_singular_name', true);
 
-        return apply_filters( 'wpinv_get_item_custom_singular_name', $custom_singular_name, $this->ID );
+        return apply_filters('wpinv_get_item_custom_singular_name', $custom_singular_name, $this->ID);
     }
     
     public function get_editable() {
-        $editable = get_post_meta( $this->ID, '_wpinv_editable', true );
+        $editable = get_post_meta($this->ID, '_wpinv_editable', true);
 
-        return apply_filters( 'wpinv_item_get_editable', $editable, $this->ID );
+        return apply_filters('wpinv_item_get_editable', $editable, $this->ID);
     }
     
     public function get_excerpt() {
-        $excerpt = get_the_excerpt( $this->ID );
+        $excerpt = get_the_excerpt($this->ID);
         
-        return apply_filters( 'wpinv_item_get_excerpt', $excerpt, $this->ID );
+        return apply_filters('wpinv_item_get_excerpt', $excerpt, $this->ID);
     }
     
     /**
      * Checks whether the item allows a user to set their own price
      */
     public function get_is_dynamic_pricing() {
-        $is_dynamic_pricing = get_post_meta( $this->ID, '_wpinv_dynamic_pricing', true );
+        $is_dynamic_pricing = get_post_meta($this->ID, '_wpinv_dynamic_pricing', true);
 
-        return (int) apply_filters( 'wpinv_item_get_is_dynamic_pricing', $is_dynamic_pricing, $this->ID );
+        return (int) apply_filters('wpinv_item_get_is_dynamic_pricing', $is_dynamic_pricing, $this->ID);
 
     }
 
@@ -279,32 +279,32 @@ 
     public function get_minimum_price() {
 
         //Fetch the minimum price and cast it to a float
-        $price = (float) get_post_meta( $this->ID, '_minimum_price', true );
+        $price = (float) get_post_meta($this->ID, '_minimum_price', true);
             
         //Sanitize it
-        $price = wpinv_sanitize_amount( $price );
+        $price = wpinv_sanitize_amount($price);
 
         //Filter then return it
-        return apply_filters( 'wpinv_item_get_minimum_price', $price, $this->ID );
+        return apply_filters('wpinv_item_get_minimum_price', $price, $this->ID);
 
     }
 
     public function get_is_recurring() {
-        $is_recurring = get_post_meta( $this->ID, '_wpinv_is_recurring', true );
+        $is_recurring = get_post_meta($this->ID, '_wpinv_is_recurring', true);
 
-        return apply_filters( 'wpinv_item_get_is_recurring', $is_recurring, $this->ID );
+        return apply_filters('wpinv_item_get_is_recurring', $is_recurring, $this->ID);
 
     }
     
-    public function get_recurring_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_recurring_period', true );
+    public function get_recurring_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_recurring_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -320,40 +320,40 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_recurring_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_recurring_period', $period, $full, $this->ID);
     }
     
     public function get_recurring_interval() {
-        $interval = (int)get_post_meta( $this->ID, '_wpinv_recurring_interval', true );
+        $interval = (int) get_post_meta($this->ID, '_wpinv_recurring_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_recurring_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_recurring_interval', $interval, $this->ID);
     }
     
     public function get_recurring_limit() {
-        $limit = get_post_meta( $this->ID, '_wpinv_recurring_limit', true );
+        $limit = get_post_meta($this->ID, '_wpinv_recurring_limit', true);
 
-        return (int)apply_filters( 'wpinv_item_recurring_limit', $limit, $this->ID );
+        return (int) apply_filters('wpinv_item_recurring_limit', $limit, $this->ID);
     }
     
     public function get_free_trial() {
-        $free_trial = get_post_meta( $this->ID, '_wpinv_free_trial', true );
+        $free_trial = get_post_meta($this->ID, '_wpinv_free_trial', true);
 
-        return apply_filters( 'wpinv_item_get_free_trial', $free_trial, $this->ID );
+        return apply_filters('wpinv_item_get_free_trial', $free_trial, $this->ID);
     }
     
-    public function get_trial_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_trial_period', true );
+    public function get_trial_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_trial_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -369,47 +369,47 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_trial_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_trial_period', $period, $full, $this->ID);
     }
     
     public function get_trial_interval() {
-        $interval = absint( get_post_meta( $this->ID, '_wpinv_trial_interval', true ) );
+        $interval = absint(get_post_meta($this->ID, '_wpinv_trial_interval', true));
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_trial_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_trial_interval', $interval, $this->ID);
     }
     
     public function get_the_price() {
-        $item_price = wpinv_price( wpinv_format_amount( $this->get_price() ) );
+        $item_price = wpinv_price(wpinv_format_amount($this->get_price()));
         
-        return apply_filters( 'wpinv_get_the_item_price', $item_price, $this->ID );
+        return apply_filters('wpinv_get_the_item_price', $item_price, $this->ID);
     }
     
     public function is_recurring() {
         $is_recurring = $this->get_is_recurring();
 
-        return (bool)apply_filters( 'wpinv_is_recurring_item', $is_recurring, $this->ID );
+        return (bool) apply_filters('wpinv_is_recurring_item', $is_recurring, $this->ID);
     }
     
     public function has_free_trial() {
         $free_trial = $this->is_recurring() && $this->get_free_trial() ? true : false;
 
-        return (bool)apply_filters( 'wpinv_item_has_free_trial', $free_trial, $this->ID );
+        return (bool) apply_filters('wpinv_item_has_free_trial', $free_trial, $this->ID);
     }
 
     public function is_free() {
         $is_free = false;
         
-        $price = get_post_meta( $this->ID, '_wpinv_price', true );
+        $price = get_post_meta($this->ID, '_wpinv_price', true);
 
-        if ( (float)$price == 0 ) {
+        if ((float) $price == 0) {
             $is_free = true;
         }
 
-        return (bool) apply_filters( 'wpinv_is_free_item', $is_free, $this->ID );
+        return (bool) apply_filters('wpinv_is_free_item', $is_free, $this->ID);
 
     }
     
@@ -418,15 +418,15 @@ 
 
         $is_editable = $editable === 0 || $editable === '0' ? false : true;
 
-        return (bool) apply_filters( 'wpinv_item_is_editable', $is_editable, $this->ID );
+        return (bool) apply_filters('wpinv_item_is_editable', $is_editable, $this->ID);
     }
     
-    public function save_metas( $metas = array() ) {
-        if ( empty( $metas ) ) {
+    public function save_metas($metas = array()) {
+        if (empty($metas)) {
             return false;
         }
         
-        foreach ( $metas as $meta_key => $meta_value ) {
+        foreach ($metas as $meta_key => $meta_value) {
             $meta_key = strpos($meta_key, '_wpinv_') !== 0 ? '_wpinv_' . $meta_key : $meta_key;
             
             $this->update_meta($meta_key, $meta_value);
@@ -435,77 +435,77 @@ 
         return true;
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
         
-        if( '_wpinv_minimum_price' === $meta_key ) {
+        if ('_wpinv_minimum_price' === $meta_key) {
             $meta_key = '_minimum_price';
         }
 
-        $meta_value = apply_filters( 'wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID);
 
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
     
-    public function get_fees( $type = 'fee', $item_id = 0 ) {
+    public function get_fees($type = 'fee', $item_id = 0) {
         global $wpi_session;
         
-        $fees = $wpi_session->get( 'wpi_cart_fees' );
+        $fees = $wpi_session->get('wpi_cart_fees');
 
-        if ( ! wpinv_get_cart_contents() ) {
+        if (!wpinv_get_cart_contents()) {
             // We can only get item type fees when the cart is empty
             $type = 'custom';
         }
 
-        if ( ! empty( $fees ) && ! empty( $type ) && 'all' !== $type ) {
-            foreach( $fees as $key => $fee ) {
-                if( ! empty( $fee['type'] ) && $type != $fee['type'] ) {
-                    unset( $fees[ $key ] );
+        if (!empty($fees) && !empty($type) && 'all' !== $type) {
+            foreach ($fees as $key => $fee) {
+                if (!empty($fee['type']) && $type != $fee['type']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) && ! empty( $item_id ) ) {
+        if (!empty($fees) && !empty($item_id)) {
             // Remove fees that don't belong to the specified Item
-            foreach ( $fees as $key => $fee ) {
-                if ( (int) $item_id !== (int)$fee['custom_id'] ) {
-                    unset( $fees[ $key ] );
+            foreach ($fees as $key => $fee) {
+                if ((int) $item_id !== (int) $fee['custom_id']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) ) {
+        if (!empty($fees)) {
             // Remove fees that belong to a specific item but are not in the cart
-            foreach( $fees as $key => $fee ) {
-                if( empty( $fee['custom_id'] ) ) {
+            foreach ($fees as $key => $fee) {
+                if (empty($fee['custom_id'])) {
                     continue;
                 }
 
-                if ( !wpinv_item_in_cart( $fee['custom_id'] ) ) {
-                    unset( $fees[ $key ] );
+                if (!wpinv_item_in_cart($fee['custom_id'])) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        return ! empty( $fees ) ? $fees : array();
+        return !empty($fees) ? $fees : array();
     }
     
     public function can_purchase() {
         $can_purchase = true;
 
-        if ( !current_user_can( 'edit_post', $this->ID ) && $this->post_status != 'publish' ) {
+        if (!current_user_can('edit_post', $this->ID) && $this->post_status != 'publish') {
             $can_purchase = false;
         }
 
-        return (bool)apply_filters( 'wpinv_can_purchase_item', $can_purchase, $this );
+        return (bool) apply_filters('wpinv_can_purchase_item', $can_purchase, $this);
     }
 
     /**
      * Checks whether this item supports dynamic pricing or not
      */
     public function supports_dynamic_pricing() {
-        return (bool) apply_filters( 'wpinv_item_supports_dynamic_pricing', true, $this );
+        return (bool) apply_filters('wpinv_item_supports_dynamic_pricing', true, $this);
     }
 }

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

Spacing +297 added lines, -297 removed lines

@@ -8,7 +8,7 @@ 
  * @since    1.0.13
  */
 
-if ( !defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -41,7 +41,7 @@ 
 	 *
 	 * @param string $namespace Api Namespace
 	 */
-	public function __construct( $namespace ) {
+	public function __construct($namespace) {
         
         // Set api namespace...
 		$this->namespace = $namespace;
@@ -60,12 +60,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
@@ -82,17 +82,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];
             }
 
         }
@@ -107,32 +107,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.
@@ -145,9 +145,9 @@ 
 		 * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the invoices
 		 */
-        $response       = apply_filters( "wpinv_rest_invoices_response", $response, $request, $args );
+        $response = apply_filters("wpinv_rest_invoices_response", $response, $request, $args);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
         
     }
 
@@ -159,17 +159,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;
         }
 
@@ -185,18 +185,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;
@@ -213,8 +213,8 @@ 
 	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
 	 * @return bool Whether the post can be read.
 	 */
-	public function check_read_permission( $invoice ) {
-		return wpinv_user_can_view_invoice( $invoice->ID );
+	public function check_read_permission($invoice) {
+		return wpinv_user_can_view_invoice($invoice->ID);
     }
     
     /**
@@ -225,19 +225,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.
@@ -249,9 +249,9 @@ 
 		 * @param WP_HTTP_Response $response Response.
 		 * @param WP_REST_Request  $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_get_invoice_response", $response, $request );
+        $response = apply_filters("wpinv_rest_get_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 
     }
     
@@ -263,18 +263,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(),
                 )
@@ -292,30 +292,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 = $this->prepare_item_for_database( $request );
+		$invoice_data = $this->prepare_item_for_database($request);
 
-		if ( is_wp_error( $invoice_data ) ) {
+		if (is_wp_error($invoice_data)) {
 			return $invoice_data;
 		}
 
 		// Try creating the invoice
-        $invoice = 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.
@@ -326,7 +326,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.
@@ -338,9 +338,9 @@ 
 		 * @param array           $invoice_data Invoice properties.
 		 * @param WP_REST_Request $request The request used.
 		 */
-        $response       = apply_filters( "wpinv_rest_create_invoice_response", $response, $request );
+        $response = apply_filters("wpinv_rest_create_invoice_response", $response, $request);
 
-        return rest_ensure_response( $response );
+        return rest_ensure_response($response);
 	}
 
 	/**
@@ -351,20 +351,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(),
                 )
@@ -382,46 +382,46 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function update_item( $request ) {
+	public function update_item($request) {
 		
 		// Ensure the invoice exists.
-        $valid_check = $this->get_post( $request['id'] );
+        $valid_check = $this->get_post($request['id']);
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
+		if (is_wp_error($valid_check)) {
 			return $valid_check;
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+		$data_to_update = $this->prepare_item_for_database($request);
 
-		if ( is_wp_error( $data_to_update ) ) {
+		if (is_wp_error($data_to_update)) {
 			return $data_to_update;
 		}
 
 		// Abort if no invoice data is provided
-        if( empty( $data_to_update ) ) {
-            return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
+        if (empty($data_to_update)) {
+            return new WP_Error('missing_data', __('An update request cannot be empty.', 'invoicing'));
         }
 
 		// Include the invoice ID
 		$data_to_update['ID'] = $request['id'];
 
 		// Update the invoice
-		$updated_invoice = wpinv_update_invoice( $data_to_update, true );
+		$updated_invoice = wpinv_update_invoice($data_to_update, true);
 
 		// Incase the update operation failed...
-		if ( is_wp_error( $updated_invoice ) ) {
+		if (is_wp_error($updated_invoice)) {
 			return $updated_invoice;
 		}
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_invoice, $request );
+		$response = $this->prepare_item_for_response($updated_invoice, $request);
 
 		/** This action is documented in includes/class-wpinv-rest-invoice-controller.php */
-		do_action( "wpinv_rest_insert_invoice", $updated_invoice, $request, false );
+		do_action("wpinv_rest_insert_invoice", $updated_invoice, $request, false);
 
 		/**
 		 * Filters the responses for updating single invoice requests.
@@ -433,9 +433,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);
 	}
 
 	/**
@@ -446,19 +446,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 ( wpinv_current_user_can_manage_invoicing() ||  current_user_can( 'delete_invoices', $request['id'] ) ) {
+		if (wpinv_current_user_can_manage_invoicing() || current_user_can('delete_invoices', $request['id'])) {
 			return 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(),
                 )
@@ -476,31 +476,31 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function delete_item( $request ) {
+	public function delete_item($request) {
 		
 		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
+		$invoice = $this->get_post($request['id']);
+		if (is_wp_error($invoice)) {
 			return $invoice;
 		}
 
-		$request->set_param( 'context', 'edit' );
+		$request->set_param('context', 'edit');
 
 		// Prepare the invoice id
-		$id    = $invoice->ID;
+		$id = $invoice->ID;
 
 		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
+		$response = $this->prepare_item_for_response($invoice, $request);
 
 		// Check if the user wants to bypass the trash...
 		$force_delete = (bool) $request['force'];
 
 		// Try deleting the invoice.
-		$deleted = wp_delete_post( $id, $force_delete );
+		$deleted = wp_delete_post($id, $force_delete);
 
 		// Abort early if we can't delete the invoice.
-		if ( ! $deleted ) {
-			return new WP_Error( 'rest_cannot_delete', __( 'The 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));
 		}
 
 		/**
@@ -512,7 +512,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;
 
@@ -528,43 +528,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',
@@ -574,7 +574,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(
@@ -588,10 +588,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'),
             ),
         );
 
@@ -603,7 +603,7 @@ 
 		 *
 		 * @param array        $query_params JSON Schema-formatted collection parameters.
 		 */
-		return apply_filters( "wpinv_rest_invoices_collection_params", $query_params );
+		return apply_filters("wpinv_rest_invoices_collection_params", $query_params);
     }
     
     /**
@@ -614,7 +614,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;
 	}
 
@@ -626,49 +626,49 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array|WP_Error Invoice Properties or WP_Error.
 	 */
-	protected function prepare_item_for_database( $request ) {
+	protected function prepare_item_for_database($request) {
 		$prepared_invoice = new stdClass();
 
 		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_invoice = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_invoice ) ) {
+		if (isset($request['id'])) {
+			$existing_invoice = $this->get_post($request['id']);
+			if (is_wp_error($existing_invoice)) {
 				return $existing_invoice;
 			}
 
-			$prepared_invoice->ID 		  = $existing_invoice->ID;
+			$prepared_invoice->ID = $existing_invoice->ID;
 			$prepared_invoice->invoice_id = $existing_invoice->ID;
 		}
 
 		$schema = $this->get_item_schema();
 
 		// Invoice owner.
-		if ( ! empty( $schema['properties']['user_id'] ) && isset( $request['user_id'] ) ) {
+		if (!empty($schema['properties']['user_id']) && isset($request['user_id'])) {
 			$prepared_invoice->user_id = (int) $request['user_id'];
 		}
 
 		// Cart details.
-		if ( ! empty( $schema['properties']['cart_details'] ) && isset( $request['cart_details'] ) ) {
+		if (!empty($schema['properties']['cart_details']) && isset($request['cart_details'])) {
 			$prepared_invoice->cart_details = (array) $request['cart_details'];
 		}
 
 		// Invoice status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
+		if (!empty($schema['properties']['status']) && isset($request['status'])) {
 
-			if ( in_array( $request['status'], 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'];
 
-			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;
 		
@@ -679,49 +679,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) wp_unslash( $prepared_invoice );
+		$invoice_data = (array) wp_unslash($prepared_invoice);
 
 		/**
 		 * Filters an invoice before it is inserted via the REST API.
@@ -731,7 +731,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);
 
 	}
 
@@ -744,20 +744,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;
 		}
 
@@ -772,74 +772,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);
 			}
 		}
 
@@ -852,7 +852,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);
 	}
 
 	/**
@@ -865,57 +865,57 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array Fields to be included in the response.
 	 */
-	public function get_fields_for_response( $request ) {
+	public function get_fields_for_response($request) {
 		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+		$properties = isset($schema['properties']) ? $schema['properties'] : array();
 
 		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
+		foreach ($additional_fields as $field_name => $field_options) {
 			// For back-compat, include any field with an empty schema
 			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
+			if (is_null($field_options['schema'])) {
+				$properties[$field_name] = $field_options;
 			}
 		}
 
 		// Exclude fields that specify a different context than the request context.
 		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
+		if ($context) {
+			foreach ($properties as $name => $options) {
+				if (!empty($options['context']) && !in_array($context, $options['context'], true)) {
+					unset($properties[$name]);
 				}
 			}
 		}
 
-		$fields = array_keys( $properties );
+		$fields = array_keys($properties);
 
-		if ( ! isset( $request['_fields'] ) ) {
+		if (!isset($request['_fields'])) {
 			return $fields;
 		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
+		$requested_fields = wpinv_parse_list($request['_fields']);
+		if (0 === count($requested_fields)) {
 			return $fields;
 		}
 		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
+		$requested_fields = array_map('trim', $requested_fields);
 		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
+		if (in_array('id', $fields, true)) {
 			$requested_fields[] = 'id';
 		}
 		// Return the list of all requested fields which appear in the schema.
 		return array_reduce(
 			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
+			function($response_fields, $field) use ($fields) {
+				if (in_array($field, $fields, true)) {
 					$response_fields[] = $field;
 					return $response_fields;
 				}
 				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
+				$nested_fields = explode('.', $field);
 				// A nested field is included so long as its top-level property is
 				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
+				if (in_array($nested_fields[0], $fields, true)) {
 					$response_fields[] = $field;
 				}
 				return $response_fields;
@@ -934,8 +934,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(
@@ -947,266 +947,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,
 				),
 			),
@@ -1224,12 +1224,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);
 	}
 
 	/**
@@ -1241,20 +1241,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'),
 					),
 				),
 			),
@@ -1262,7 +1262,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',
@@ -1285,24 +1285,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,
 			);
 		}
@@ -1316,7 +1316,7 @@ 
 		 *
 		 * @param array   $links    Rest links.
 		 */
-		return apply_filters( "wpinv_rest_invoice_links", $links );
+		return apply_filters("wpinv_rest_invoice_links", $links);
 
 	}
 
@@ -1329,24 +1329,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';
 		}
 
@@ -1359,7 +1359,7 @@ 
 		 *
 		 * @param array   $rels    Available link relations.
 		 */
-		return apply_filters( "wpinv_rest_invoice_link_relations", $rels );
+		return apply_filters("wpinv_rest_invoice_link_relations", $rels);
 	}
 
 	/**
@@ -1372,11 +1372,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);
 		
 	}
     

includes/wpinv-user-functions.php

Spacing +56 added lines, -56 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-function wpinv_get_users_invoices( $user = 0, $number = 20, $pagination = false, $status = 'publish', $orderby = 'ID', $order = 'DESC' ) {
-    if ( empty( $user ) ) {
+function wpinv_get_users_invoices($user = 0, $number = 20, $pagination = false, $status = 'publish', $orderby = 'ID', $order = 'DESC') {
+    if (empty($user)) {
         $user = get_current_user_id();
     }
 
-    if ( empty( $user ) ) {
+    if (empty($user)) {
         return false;
     }
 
-    $args = apply_filters( 'wpinv_get_users_invoices_args', array( 'user' => $user, 'limit' => $number, 'status' => $status, 'paginate' => $pagination, 'orderby' => $orderby, 'order' => $order ) );
+    $args = apply_filters('wpinv_get_users_invoices_args', array('user' => $user, 'limit' => $number, 'status' => $status, 'paginate' => $pagination, 'orderby' => $orderby, 'order' => $order));
     
-    return wpinv_get_invoices( $args );
+    return wpinv_get_invoices($args);
 }
 
-function wpinv_dropdown_users( $args = '' ) {
+function wpinv_dropdown_users($args = '') {
     $defaults = array(
         'show_option_all' => '', 'show_option_none' => '', 'hide_if_only_one_author' => '',
         'orderby' => 'display_name', 'order' => 'ASC',
@@ -27,18 +27,18 @@ 
         'option_none_value' => -1
     );
 
-    $defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
+    $defaults['selected'] = is_author() ? get_query_var('author') : 0;
 
-    $r = wp_parse_args( $args, $defaults );
+    $r = wp_parse_args($args, $defaults);
 
-    $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who' ) );
+    $query_args = wp_array_slice_assoc($r, array('blog_id', 'include', 'exclude', 'orderby', 'order', 'who'));
 
-    $fields = array( 'ID', 'user_login', 'user_email' );
+    $fields = array('ID', 'user_login', 'user_email');
 
-    $show = ! empty( $r['show'] ) ? $r['show'] : 'display_name';
-    if ( 'display_name_with_login' === $show ) {
+    $show = !empty($r['show']) ? $r['show'] : 'display_name';
+    if ('display_name_with_login' === $show) {
         $fields[] = 'display_name';
-    } else if ( 'display_name_with_email' === $show ) {
+    } else if ('display_name_with_email' === $show) {
         $fields[] = 'display_name';
     } else {
         $fields[] = $show;
@@ -50,99 +50,99 @@ 
     $show_option_none = $r['show_option_none'];
     $option_none_value = $r['option_none_value'];
 
-    $query_args = apply_filters( 'wpinv_dropdown_users_args', $query_args, $r );
+    $query_args = apply_filters('wpinv_dropdown_users_args', $query_args, $r);
 
-    $users = get_users( $query_args );
+    $users = get_users($query_args);
 
     $output = '';
-    if ( ! empty( $users ) && ( empty( $r['hide_if_only_one_author'] ) || count( $users ) > 1 ) ) {
-        $name = esc_attr( $r['name'] );
-        if ( $r['multi'] && ! $r['id'] ) {
+    if (!empty($users) && (empty($r['hide_if_only_one_author']) || count($users) > 1)) {
+        $name = esc_attr($r['name']);
+        if ($r['multi'] && !$r['id']) {
             $id = '';
         } else {
-            $id = $r['id'] ? " id='" . esc_attr( $r['id'] ) . "'" : " id='$name'";
+            $id = $r['id'] ? " id='" . esc_attr($r['id']) . "'" : " id='$name'";
         }
         $output = "<select name='{$name}'{$id} class='" . $r['class'] . "'>\n";
 
-        if ( $show_option_all ) {
+        if ($show_option_all) {
             $output .= "\t<option value='0'>$show_option_all</option>\n";
         }
 
-        if ( $show_option_none ) {
-            $_selected = selected( $option_none_value, $r['selected'], false );
-            $output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
+        if ($show_option_none) {
+            $_selected = selected($option_none_value, $r['selected'], false);
+            $output .= "\t<option value='" . esc_attr($option_none_value) . "'$_selected>$show_option_none</option>\n";
         }
 
-        if ( $r['include_selected'] && ( $r['selected'] > 0 ) ) {
+        if ($r['include_selected'] && ($r['selected'] > 0)) {
             $found_selected = false;
             $r['selected'] = (int) $r['selected'];
-            foreach ( (array) $users as $user ) {
+            foreach ((array) $users as $user) {
                 $user->ID = (int) $user->ID;
-                if ( $user->ID === $r['selected'] ) {
+                if ($user->ID === $r['selected']) {
                     $found_selected = true;
                 }
             }
 
-            if ( ! $found_selected ) {
-                $users[] = get_userdata( $r['selected'] );
+            if (!$found_selected) {
+                $users[] = get_userdata($r['selected']);
             }
         }
 
-        foreach ( (array) $users as $user ) {
-            if ( 'display_name_with_login' === $show ) {
+        foreach ((array) $users as $user) {
+            if ('display_name_with_login' === $show) {
                 /* translators: 1: display name, 2: user_login */
-                $display = sprintf( _x( '%1$s (%2$s)', 'user dropdown' ), $user->display_name, $user->user_login );
-            } elseif ( 'display_name_with_email' === $show ) {
+                $display = sprintf(_x('%1$s (%2$s)', 'user dropdown'), $user->display_name, $user->user_login);
+            } elseif ('display_name_with_email' === $show) {
                 /* translators: 1: display name, 2: user_email */
-                if ( $user->display_name == $user->user_email ) {
+                if ($user->display_name == $user->user_email) {
                     $display = $user->display_name;
                 } else {
-                    $display = sprintf( _x( '%1$s (%2$s)', 'user dropdown' ), $user->display_name, $user->user_email );
+                    $display = sprintf(_x('%1$s (%2$s)', 'user dropdown'), $user->display_name, $user->user_email);
                 }
-            } elseif ( ! empty( $user->$show ) ) {
+            } elseif (!empty($user->$show)) {
                 $display = $user->$show;
             } else {
                 $display = '(' . $user->user_login . ')';
             }
 
-            $_selected = selected( $user->ID, $r['selected'], false );
-            $output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
+            $_selected = selected($user->ID, $r['selected'], false);
+            $output .= "\t<option value='$user->ID'$_selected>" . esc_html($display) . "</option>\n";
         }
 
         $output .= "</select>";
     }
 
-    $html = apply_filters( 'wpinv_dropdown_users', $output );
+    $html = apply_filters('wpinv_dropdown_users', $output);
 
-    if ( $r['echo'] ) {
+    if ($r['echo']) {
         echo $html;
     }
     return $html;
 }
 
-function wpinv_guest_redirect( $redirect_to, $user_id = 0 ) {
-    if ( (int)wpinv_get_option( 'guest_checkout' ) && $user_id > 0 ) {
-        wpinv_login_user( $user_id );
+function wpinv_guest_redirect($redirect_to, $user_id = 0) {
+    if ((int) wpinv_get_option('guest_checkout') && $user_id > 0) {
+        wpinv_login_user($user_id);
     } else {
-        $redirect_to = wp_login_url( $redirect_to );
+        $redirect_to = wp_login_url($redirect_to);
     }
     
-    $redirect_to = apply_filters( 'wpinv_invoice_link_guest_redirect', $redirect_to, $user_id );
+    $redirect_to = apply_filters('wpinv_invoice_link_guest_redirect', $redirect_to, $user_id);
     
-    wp_redirect( $redirect_to );
+    wp_redirect($redirect_to);
 }
 
-function wpinv_login_user( $user_id ) {
-    if ( is_user_logged_in() ) {
+function wpinv_login_user($user_id) {
+    if (is_user_logged_in()) {
         return true;
     }
     
-    $user = get_user_by( 'id', $user_id );
+    $user = get_user_by('id', $user_id);
     
-    if ( !empty( $user ) && !is_wp_error( $user ) && !empty( $user->user_login ) ) {
-        wp_set_current_user( $user_id, $user->user_login );
-        wp_set_auth_cookie( $user_id );
-        do_action( 'wp_login', $user->user_login );
+    if (!empty($user) && !is_wp_error($user) && !empty($user->user_login)) {
+        wp_set_current_user($user_id, $user->user_login);
+        wp_set_auth_cookie($user_id);
+        do_action('wp_login', $user->user_login);
         
         return true;
     }
@@ -157,9 +157,9 @@ 
  * @return string capability to check against
  * @param string $capalibilty Optional. The alternative capability to check against.
  */
-function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
+function wpinv_get_capability($capalibilty = 'manage_invoicing') {
 
-	if ( current_user_can( 'manage_options' ) ) {
+	if (current_user_can('manage_options')) {
 		return 'manage_options';
 	};
 
@@ -173,5 +173,5 @@ 
  * @return bool
  */
 function wpinv_current_user_can_manage_invoicing() {
-    return current_user_can( wpinv_get_capability() );
+    return current_user_can(wpinv_get_capability());
 }
\ No newline at end of file

includes/wpinv-tax-functions.php

Spacing +166 added lines, -166 removed lines

@@ -1,121 +1,121 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_use_taxes() {
-    $ret = wpinv_get_option( 'enable_taxes', false );
+    $ret = wpinv_get_option('enable_taxes', false);
     
-    return (bool) apply_filters( 'wpinv_use_taxes', $ret );
+    return (bool) apply_filters('wpinv_use_taxes', $ret);
 }
 
 function wpinv_get_tax_rates() {
-    $rates = get_option( 'wpinv_tax_rates', array() );
+    $rates = get_option('wpinv_tax_rates', array());
     
-    return apply_filters( 'wpinv_get_tax_rates', $rates );
+    return apply_filters('wpinv_get_tax_rates', $rates);
 }
 
-function wpinv_get_tax_rate( $country = false, $state = false, $item_id = 0 ) {
+function wpinv_get_tax_rate($country = false, $state = false, $item_id = 0) {
     global $wpinv_euvat, $wpi_tax_rates, $wpi_userID;
-    $wpi_tax_rates = !empty( $wpi_tax_rates ) ? $wpi_tax_rates : array();
+    $wpi_tax_rates = !empty($wpi_tax_rates) ? $wpi_tax_rates : array();
     
-    if ( !empty( $wpi_tax_rates ) && !empty( $item_id ) && isset( $wpi_tax_rates[$item_id] ) ) {
+    if (!empty($wpi_tax_rates) && !empty($item_id) && isset($wpi_tax_rates[$item_id])) {
         return $wpi_tax_rates[$item_id];
     }
     
-    if ( !$wpinv_euvat->item_is_taxable( $item_id, $country, $state ) ) {
+    if (!$wpinv_euvat->item_is_taxable($item_id, $country, $state)) {
         $wpi_tax_rates[$item_id] = 0;
         return 0;
     }
     
     $is_global = false;
-    if ( $item_id == 'global' ) {
+    if ($item_id == 'global') {
         $is_global = true;
         $item_id = 0;
     }
     
-    $rate           = (float)wpinv_get_option( 'tax_rate', 0 );
-    $user_address   = wpinv_get_user_address( $wpi_userID );
+    $rate           = (float) wpinv_get_option('tax_rate', 0);
+    $user_address   = wpinv_get_user_address($wpi_userID);
     
-    if( empty( $country ) ) {
-        if( !empty( $_POST['wpinv_country'] ) ) {
+    if (empty($country)) {
+        if (!empty($_POST['wpinv_country'])) {
             $country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['wpinv_country'] ) ) {
+        } elseif (!empty($_POST['wpinv_country'])) {
             $country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['country'] ) ) {
+        } elseif (!empty($_POST['country'])) {
             $country = $_POST['country'];
-        } elseif( is_user_logged_in() && !empty( $user_address ) ) {
+        } elseif (is_user_logged_in() && !empty($user_address)) {
             $country = $user_address['country'];
         }
-        $country = !empty( $country ) ? $country : wpinv_get_default_country();
+        $country = !empty($country) ? $country : wpinv_get_default_country();
     }
 
-    if( empty( $state ) ) {
-        if( !empty( $_POST['wpinv_state'] ) ) {
+    if (empty($state)) {
+        if (!empty($_POST['wpinv_state'])) {
             $state = $_POST['wpinv_state'];
-        } elseif( !empty( $_POST['wpinv_state'] ) ) {
+        } elseif (!empty($_POST['wpinv_state'])) {
             $state = $_POST['wpinv_state'];
-        } elseif( !empty( $_POST['state'] ) ) {
+        } elseif (!empty($_POST['state'])) {
             $state = $_POST['state'];
-        } elseif( is_user_logged_in() && !empty( $user_address ) ) {
+        } elseif (is_user_logged_in() && !empty($user_address)) {
             $state = $user_address['state'];
         }
-        $state = !empty( $state ) ? $state : wpinv_get_default_state();
+        $state = !empty($state) ? $state : wpinv_get_default_state();
     }
     
-    if( !empty( $country ) ) {
-        $tax_rates   = wpinv_get_tax_rates();
+    if (!empty($country)) {
+        $tax_rates = wpinv_get_tax_rates();
 
-        if( !empty( $tax_rates ) ) {
+        if (!empty($tax_rates)) {
             // Locate the tax rate for this country / state, if it exists
-            foreach( $tax_rates as $key => $tax_rate ) {
-                if( $country != $tax_rate['country'] )
+            foreach ($tax_rates as $key => $tax_rate) {
+                if ($country != $tax_rate['country'])
                     continue;
 
-                if( !empty( $tax_rate['global'] ) ) {
-                    if( !empty( $tax_rate['rate'] ) ) {
-                        $rate = number_format( $tax_rate['rate'], 4 );
+                if (!empty($tax_rate['global'])) {
+                    if (!empty($tax_rate['rate'])) {
+                        $rate = number_format($tax_rate['rate'], 4);
                     }
                 } else {
 
-                    if( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) )
+                    if (empty($tax_rate['state']) || strtolower($state) != strtolower($tax_rate['state']))
                         continue;
 
                     $state_rate = $tax_rate['rate'];
-                    if( 0 !== $state_rate || !empty( $state_rate ) ) {
-                        $rate = number_format( $state_rate, 4 );
+                    if (0 !== $state_rate || !empty($state_rate)) {
+                        $rate = number_format($state_rate, 4);
                     }
                 }
             }
         }
     }
     
-    $rate = apply_filters( 'wpinv_tax_rate', $rate, $country, $state, $item_id );
+    $rate = apply_filters('wpinv_tax_rate', $rate, $country, $state, $item_id);
     
-    if ( !empty( $item_id ) ) {
+    if (!empty($item_id)) {
         $wpi_tax_rates[$item_id] = $rate;
-    } else if ( $is_global ) {
+    } else if ($is_global) {
         $wpi_tax_rates['global'] = $rate;
     }
     
     return $rate;
 }
 
-function wpinv_get_formatted_tax_rate( $country = false, $state = false, $item_id ) {
-    $rate = wpinv_get_tax_rate( $country, $state, $item_id );
-    $rate = round( $rate, 4 );
+function wpinv_get_formatted_tax_rate($country = false, $state = false, $item_id) {
+    $rate = wpinv_get_tax_rate($country, $state, $item_id);
+    $rate = round($rate, 4);
     $formatted = $rate .= '%';
-    return apply_filters( 'wpinv_formatted_tax_rate', $formatted, $rate, $country, $state, $item_id );
+    return apply_filters('wpinv_formatted_tax_rate', $formatted, $rate, $country, $state, $item_id);
 }
 
-function wpinv_calculate_tax( $amount = 0, $country = false, $state = false, $item_id = 0 ) {
-    $rate = wpinv_get_tax_rate( $country, $state, $item_id );
+function wpinv_calculate_tax($amount = 0, $country = false, $state = false, $item_id = 0) {
+    $rate = wpinv_get_tax_rate($country, $state, $item_id);
     $tax  = 0.00;
 
-    if ( wpinv_use_taxes() ) {        
-        if ( wpinv_prices_include_tax() ) {
-            $pre_tax = ( $amount / ( ( 1 + $rate ) * 0.01 ) );
+    if (wpinv_use_taxes()) {        
+        if (wpinv_prices_include_tax()) {
+            $pre_tax = ($amount / ((1 + $rate) * 0.01));
             $tax     = $amount - $pre_tax;
         } else {
             $tax = $amount * $rate * 0.01;
@@ -123,46 +123,46 @@ 
 
     }
 
-    return apply_filters( 'wpinv_taxed_amount', $tax, $rate, $country, $state, $item_id );
+    return apply_filters('wpinv_taxed_amount', $tax, $rate, $country, $state, $item_id);
 }
 
 function wpinv_prices_include_tax() {
     return false; // TODO
-    $ret = ( wpinv_get_option( 'prices_include_tax', false ) == 'yes' && wpinv_use_taxes() );
+    $ret = (wpinv_get_option('prices_include_tax', false) == 'yes' && wpinv_use_taxes());
 
-    return apply_filters( 'wpinv_prices_include_tax', $ret );
+    return apply_filters('wpinv_prices_include_tax', $ret);
 }
 
-function wpinv_sales_tax_for_year( $year = null ) {
-    return wpinv_price( wpinv_format_amount( wpinv_get_sales_tax_for_year( $year ) ) );
+function wpinv_sales_tax_for_year($year = null) {
+    return wpinv_price(wpinv_format_amount(wpinv_get_sales_tax_for_year($year)));
 }
 
-function wpinv_get_sales_tax_for_year( $year = null ) {
+function wpinv_get_sales_tax_for_year($year = null) {
     global $wpdb;
 
     // Start at zero
     $tax = 0;
 
-    if ( ! empty( $year ) ) {
+    if (!empty($year)) {
         $args = array(
             'post_type'      => 'wpi_invoice',
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'posts_per_page' => -1,
             'year'           => $year,
             'fields'         => 'ids'
         );
 
-        $payments    = get_posts( $args );
-        $payment_ids = implode( ',', $payments );
+        $payments    = get_posts($args);
+        $payment_ids = implode(',', $payments);
 
-        if ( count( $payments ) > 0 ) {
+        if (count($payments) > 0) {
             $sql = "SELECT SUM( meta_value ) FROM $wpdb->postmeta WHERE meta_key = '_wpinv_tax' AND post_id IN( $payment_ids )";
-            $tax = $wpdb->get_var( $sql );
+            $tax = $wpdb->get_var($sql);
         }
 
     }
 
-    return apply_filters( 'wpinv_get_sales_tax_for_year', $tax, $year );
+    return apply_filters('wpinv_get_sales_tax_for_year', $tax, $year);
 }
 
 function wpinv_is_cart_taxed() {
@@ -171,33 +171,33 @@ 
 
 function wpinv_prices_show_tax_on_checkout() {
     return false; // TODO
-    $ret = ( wpinv_get_option( 'checkout_include_tax', false ) == 'yes' && wpinv_use_taxes() );
+    $ret = (wpinv_get_option('checkout_include_tax', false) == 'yes' && wpinv_use_taxes());
 
-    return apply_filters( 'wpinv_taxes_on_prices_on_checkout', $ret );
+    return apply_filters('wpinv_taxes_on_prices_on_checkout', $ret);
 }
 
 function wpinv_display_tax_rate() {
-    $ret = wpinv_use_taxes() && wpinv_get_option( 'display_tax_rate', false );
+    $ret = wpinv_use_taxes() && wpinv_get_option('display_tax_rate', false);
 
-    return apply_filters( 'wpinv_display_tax_rate', $ret );
+    return apply_filters('wpinv_display_tax_rate', $ret);
 }
 
 function wpinv_cart_needs_tax_address_fields() {
-    if( !wpinv_is_cart_taxed() )
+    if (!wpinv_is_cart_taxed())
         return false;
 
-    return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' );
+    return !did_action('wpinv_after_cc_fields', 'wpinv_default_cc_address_fields');
 }
 
-function wpinv_item_is_tax_exclusive( $item_id = 0 ) {
-    $ret = (bool)get_post_meta( $item_id, '_wpinv_tax_exclusive', false );
-    return apply_filters( 'wpinv_is_tax_exclusive', $ret, $item_id );
+function wpinv_item_is_tax_exclusive($item_id = 0) {
+    $ret = (bool) get_post_meta($item_id, '_wpinv_tax_exclusive', false);
+    return apply_filters('wpinv_is_tax_exclusive', $ret, $item_id);
 }
 
-function wpinv_currency_decimal_filter( $decimals = 2 ) {
+function wpinv_currency_decimal_filter($decimals = 2) {
     $currency = wpinv_get_currency();
 
-    switch ( $currency ) {
+    switch ($currency) {
         case 'RIAL' :
         case 'JPY' :
         case 'TWD' :
@@ -206,48 +206,48 @@ 
             break;
     }
 
-    return apply_filters( 'wpinv_currency_decimal_count', $decimals, $currency );
+    return apply_filters('wpinv_currency_decimal_count', $decimals, $currency);
 }
 
 function wpinv_tax_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_tax_amount', $output );
+    return apply_filters('wpinv_tax_amount', $output);
 }
 
 function wpinv_recalculated_tax() {
-    define( 'WPINV_RECALCTAX', true );
+    define('WPINV_RECALCTAX', true);
 }
-add_action( 'wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculated_tax', 1 );
+add_action('wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculated_tax', 1);
 
-function wpinv_recalculate_tax( $return = false ) {
-    $invoice_id = (int)wpinv_get_invoice_cart_id();
-    if ( empty( $invoice_id ) ) {
+function wpinv_recalculate_tax($return = false) {
+    $invoice_id = (int) wpinv_get_invoice_cart_id();
+    if (empty($invoice_id)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice_cart( $invoice_id );
+    $invoice = wpinv_get_invoice_cart($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( empty( $_POST['country'] ) ) {
+    if (empty($_POST['country'])) {
         $_POST['country'] = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
     }
         
     $invoice->country = sanitize_text_field($_POST['country']);
-    $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
+    $invoice->set('country', sanitize_text_field($_POST['country']));
     if (isset($_POST['state'])) {
         $invoice->state = sanitize_text_field($_POST['state']);
-        $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->set('state', sanitize_text_field($_POST['state']));
     }
 
     $invoice->cart_details  = wpinv_get_cart_content_details();
     
-    $subtotal               = wpinv_get_cart_subtotal( $invoice->cart_details );
-    $tax                    = wpinv_get_cart_tax( $invoice->cart_details );
-    $total                  = wpinv_get_cart_total( $invoice->cart_details );
+    $subtotal               = wpinv_get_cart_subtotal($invoice->cart_details);
+    $tax                    = wpinv_get_cart_tax($invoice->cart_details);
+    $total                  = wpinv_get_cart_total($invoice->cart_details);
 
     $invoice->tax           = $tax;
     $invoice->subtotal      = $subtotal;
@@ -255,61 +255,61 @@ 
 
     $invoice->save();
     
-    if ( $invoice->is_free_trial() ) {
+    if ($invoice->is_free_trial()) {
         $total = 0;
     }
     
     $response = array(
-        'total'        => html_entity_decode( wpinv_price( wpinv_format_amount( $total ) ), ENT_COMPAT, 'UTF-8' ),
+        'total'        => html_entity_decode(wpinv_price(wpinv_format_amount($total)), ENT_COMPAT, 'UTF-8'),
         'total_raw'    => $total,
-        'free'         => !( (float)$total > 0 ) && $invoice->is_free() ? true : false,
-        'html'         => wpinv_checkout_cart( $invoice->cart_details, false ),
+        'free'         => !((float) $total > 0) && $invoice->is_free() ? true : false,
+        'html'         => wpinv_checkout_cart($invoice->cart_details, false),
     );
     
-    if ( $return ) {
+    if ($return) {
         return $response;
     }
 
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculate_tax' );
-add_action( 'wp_ajax_nopriv_wpinv_recalculate_tax', 'wpinv_recalculate_tax' );
+add_action('wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculate_tax');
+add_action('wp_ajax_nopriv_wpinv_recalculate_tax', 'wpinv_recalculate_tax');
 
 // VAT Settings
-function wpinv_vat_rate_add_callback( $args ) {
+function wpinv_vat_rate_add_callback($args) {
     ?>
-    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_add" type="button" value="<?php esc_attr_e( 'Add', 'invoicing' );?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
+    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_add" type="button" value="<?php esc_attr_e('Add', 'invoicing'); ?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
     <?php
 }
 
-function wpinv_vat_rate_delete_callback( $args ) {
+function wpinv_vat_rate_delete_callback($args) {
     global $wpinv_euvat;
     
     $vat_classes = $wpinv_euvat->get_rate_classes();
-    $vat_class = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '';
-    if ( isset( $vat_classes[$vat_class] ) ) {
+    $vat_class = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '';
+    if (isset($vat_classes[$vat_class])) {
     ?>
-    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_delete" type="button" value="<?php echo wp_sprintf( esc_attr__( 'Delete class "%s"', 'invoicing' ), $vat_classes[$vat_class] );?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
+    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_delete" type="button" value="<?php echo wp_sprintf(esc_attr__('Delete class "%s"', 'invoicing'), $vat_classes[$vat_class]); ?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
     <?php
     }
 }
 
-function wpinv_vat_rates_callback( $args ) {
+function wpinv_vat_rates_callback($args) {
     global $wpinv_euvat;
     
     $vat_classes    = $wpinv_euvat->get_rate_classes();
-    $vat_class      = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '_standard';
+    $vat_class      = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '_standard';
     
     $eu_states      = $wpinv_euvat->get_eu_states();
     $countries      = wpinv_get_country_list();
     $vat_groups     = $wpinv_euvat->get_vat_groups();
-    $rates          = $wpinv_euvat->get_vat_rates( $vat_class );
+    $rates          = $wpinv_euvat->get_vat_rates($vat_class);
     ob_start();
 ?>
 </td><tr>
     <td colspan="2" class="wpinv_vat_tdbox">
-    <input type="hidden" name="wpi_vat_class" value="<?php echo $vat_class;?>" />
-    <p><?php echo ( isset( $args['desc'] ) ? $args['desc'] : '' ); ?></p>
+    <input type="hidden" name="wpi_vat_class" value="<?php echo $vat_class; ?>" />
+    <p><?php echo (isset($args['desc']) ? $args['desc'] : ''); ?></p>
     <table id="wpinv_vat_rates" class="wp-list-table widefat fixed posts">
         <colgroup>
             <col width="50px" />
@@ -321,43 +321,43 @@ 
         </colgroup>
         <thead>
             <tr>
-                <th scope="col" colspan="2" class="wpinv_vat_country_name"><?php _e( 'Country', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_global" title="<?php esc_attr_e( 'Apply rate to whole country', 'invoicing' ); ?>"><?php _e( 'Country Wide', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_rate"><?php _e( 'Rate %', 'invoicing' ); ?></th> 
-                <th scope="col" class="wpinv_vat_name"><?php _e( 'VAT Name', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_group"><?php _e( 'Tax Group', 'invoicing' ); ?></th>
+                <th scope="col" colspan="2" class="wpinv_vat_country_name"><?php _e('Country', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_global" title="<?php esc_attr_e('Apply rate to whole country', 'invoicing'); ?>"><?php _e('Country Wide', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_rate"><?php _e('Rate %', 'invoicing'); ?></th> 
+                <th scope="col" class="wpinv_vat_name"><?php _e('VAT Name', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_group"><?php _e('Tax Group', 'invoicing'); ?></th>
             </tr>
         </thead>
         <tbody>
-        <?php if( !empty( $eu_states ) ) { ?>
+        <?php if (!empty($eu_states)) { ?>
         <?php 
-        foreach ( $eu_states as $state ) { 
-            $country_name = isset( $countries[$state] ) ? $countries[$state] : '';
+        foreach ($eu_states as $state) { 
+            $country_name = isset($countries[$state]) ? $countries[$state] : '';
             
             // Filter the rate for each country
-            $country_rate = array_filter( $rates, function( $rate ) use( $state ) { return $rate['country'] === $state; } );
+            $country_rate = array_filter($rates, function($rate) use($state) { return $rate['country'] === $state; } );
             
             // If one does not exist create a default
-            $country_rate = is_array( $country_rate ) && count( $country_rate ) > 0 ? reset( $country_rate ) : array();
+            $country_rate = is_array($country_rate) && count($country_rate) > 0 ? reset($country_rate) : array();
             
-            $vat_global = isset( $country_rate['global'] ) ? !empty( $country_rate['global'] ) : true;
-            $vat_rate = isset( $country_rate['rate'] ) ? $country_rate['rate'] : '';
-            $vat_name = !empty( $country_rate['name'] ) ? esc_attr( stripslashes( $country_rate['name'] ) ) : '';
-            $vat_group = !empty( $country_rate['group'] ) ? $country_rate['group'] : ( $vat_class === '_standard' ? 'standard' : 'reduced' );
+            $vat_global = isset($country_rate['global']) ? !empty($country_rate['global']) : true;
+            $vat_rate = isset($country_rate['rate']) ? $country_rate['rate'] : '';
+            $vat_name = !empty($country_rate['name']) ? esc_attr(stripslashes($country_rate['name'])) : '';
+            $vat_group = !empty($country_rate['group']) ? $country_rate['group'] : ($vat_class === '_standard' ? 'standard' : 'reduced');
         ?>
         <tr>
             <td class="wpinv_vat_country"><?php echo $state; ?><input type="hidden" name="vat_rates[<?php echo $state; ?>][country]" value="<?php echo $state; ?>" /><input type="hidden" name="vat_rates[<?php echo $state; ?>][state]" value="" /></td>
             <td class="wpinv_vat_country_name"><?php echo $country_name; ?></td>
             <td class="wpinv_vat_global">
-                <input type="checkbox" name="vat_rates[<?php echo $state;?>][global]" id="vat_rates[<?php echo $state;?>][global]" value="1" <?php checked( true, $vat_global );?> disabled="disabled" />
-                <label for="tax_rates[<?php echo $state;?>][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
-                <input type="hidden" name="vat_rates[<?php echo $state;?>][global]" value="1" checked="checked" />
+                <input type="checkbox" name="vat_rates[<?php echo $state; ?>][global]" id="vat_rates[<?php echo $state; ?>][global]" value="1" <?php checked(true, $vat_global); ?> disabled="disabled" />
+                <label for="tax_rates[<?php echo $state; ?>][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
+                <input type="hidden" name="vat_rates[<?php echo $state; ?>][global]" value="1" checked="checked" />
             </td>
-            <td class="wpinv_vat_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="vat_rates[<?php echo $state;?>][rate]" value="<?php echo $vat_rate; ?>" /></td>
-            <td class="wpinv_vat_name"><input type="text" class="regular-text" name="vat_rates[<?php echo $state;?>][name]" value="<?php echo $vat_name; ?>" /></td>
+            <td class="wpinv_vat_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="vat_rates[<?php echo $state; ?>][rate]" value="<?php echo $vat_rate; ?>" /></td>
+            <td class="wpinv_vat_name"><input type="text" class="regular-text" name="vat_rates[<?php echo $state; ?>][name]" value="<?php echo $vat_name; ?>" /></td>
             <td class="wpinv_vat_group">
             <?php
-            echo wpinv_html_select( array(
+            echo wpinv_html_select(array(
                                         'name'             => 'vat_rates[' . $state . '][group]',
                                         'selected'         => $vat_group,
                                         'id'               => 'vat_rates[' . $state . '][group]',
@@ -366,14 +366,14 @@ 
                                         'multiple'         => false,
                                         'show_option_all'  => false,
                                         'show_option_none' => false
-                                    ) );
+                                    ));
             ?>
             </td>
         </tr>
         <?php } ?>
         <tr>
             <td colspan="6" style="background-color:#fafafa;">
-                <span><input id="wpi_vat_get_rates_group" type="button" class="button-secondary" value="<?php esc_attr_e( 'Update EU VAT Rates', 'invoicing' ); ?>" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span><span id="wpinv-rates-error-wrap" class="wpinv_errors" style="display:none;"></span>
+                <span><input id="wpi_vat_get_rates_group" type="button" class="button-secondary" value="<?php esc_attr_e('Update EU VAT Rates', 'invoicing'); ?>" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span><span id="wpinv-rates-error-wrap" class="wpinv_errors" style="display:none;"></span>
             </td>
         </tr>
         <?php } ?>
@@ -385,35 +385,35 @@ 
     echo $content;
 }
 
-function wpinv_vat_number_callback( $args ) {
+function wpinv_vat_number_callback($args) {
     global $wpinv_euvat;
     
     $vat_number     = $wpinv_euvat->get_vat_number();
     $vat_valid      = $wpinv_euvat->is_vat_validated();
 
-    $size           = ( isset( $args['size'] ) && !is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $validated_text = $vat_valid ? __( 'VAT number validated', 'invoicing' ) : __( 'VAT number not validated', 'invoicing' );
+    $size           = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $validated_text = $vat_valid ? __('VAT number validated', 'invoicing') : __('VAT number not validated', 'invoicing');
     $disabled       = $vat_valid ? 'disabled="disabled"' : " ";
     
-    $html = '<input type="text" class="' . $size . '-text" id="wpinv_settings[' . $args['id'] . ']" name="wpinv_settings[' . $args['id'] . ']" placeholder="GB123456789" value="' . esc_attr( stripslashes( $vat_number ) ) . '"/>';
-    $html .= '<span>&nbsp;<input type="button" id="wpinv_vat_validate" class="wpinv_validate_vat_button button-secondary" ' . $disabled . ' value="' . esc_attr__( 'Validate VAT Number', 'invoicing' ) . '" /></span>';
-    $html .= '<span class="wpinv-vat-stat wpinv-vat-stat-' . (int)$vat_valid . '"><i class="fa"></i> <font>' . $validated_text . '</font></span>';
-    $html .= '<label for="wpinv_settings[' . $args['id'] . ']">' . '<p>' . __( 'Enter your VAT number including country identifier, eg: GB123456789 (Settings must be saved after validation)', 'invoicing' ).'</p>' . '</label>';
-    $html .= '<input type="hidden" name="_wpi_nonce" value="' . wp_create_nonce( 'vat_validation' ) . '">';
+    $html = '<input type="text" class="' . $size . '-text" id="wpinv_settings[' . $args['id'] . ']" name="wpinv_settings[' . $args['id'] . ']" placeholder="GB123456789" value="' . esc_attr(stripslashes($vat_number)) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" id="wpinv_vat_validate" class="wpinv_validate_vat_button button-secondary" ' . $disabled . ' value="' . esc_attr__('Validate VAT Number', 'invoicing') . '" /></span>';
+    $html .= '<span class="wpinv-vat-stat wpinv-vat-stat-' . (int) $vat_valid . '"><i class="fa"></i> <font>' . $validated_text . '</font></span>';
+    $html .= '<label for="wpinv_settings[' . $args['id'] . ']">' . '<p>' . __('Enter your VAT number including country identifier, eg: GB123456789 (Settings must be saved after validation)', 'invoicing') . '</p>' . '</label>';
+    $html .= '<input type="hidden" name="_wpi_nonce" value="' . wp_create_nonce('vat_validation') . '">';
 
     echo $html;
 }
 
-function wpinv_eu_fallback_rate_callback( $args ) {
+function wpinv_eu_fallback_rate_callback($args) {
     global $wpinv_options;
 
-    $value = isset( $wpinv_options[$args['id']] ) ? $wpinv_options[ $args['id'] ] : ( isset( $args['std'] ) ? $args['std'] : '' );
-    $size = ( isset( $args['size'] ) && !is_null( $args['size'] ) ) ? $args['size'] : 'small';
+    $value = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : (isset($args['std']) ? $args['std'] : '');
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'small';
     
-    $html = '<input type="number" min="0" max="99" step="any" class="' . $size . '-text" id="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '" name="wpinv_settings[' . $args['id'] . ']" value="' . esc_attr( stripslashes( $value ) ) . '" />';
-    $html .= '<span>&nbsp;<input id="wpi_add_eu_states" type="button" class="button-secondary" value="' . esc_attr__( 'Add EU Member States', 'invoicing' ) . '" /></span>';
-    $html .= '<span>&nbsp;<input id="wpi_remove_eu_states" type="button" class="button-secondary" value="' . esc_attr__( 'Remove EU Member States', 'invoicing' ) . '" /></span>';
-    $html .= '<span>&nbsp;<input id="wpi_vat_get_rates" type="button" class="button-secondary" value="' . esc_attr__( 'Update EU VAT Rates', 'invoicing' ) . '" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span>';
+    $html = '<input type="number" min="0" max="99" step="any" class="' . $size . '-text" id="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '" name="wpinv_settings[' . $args['id'] . ']" value="' . esc_attr(stripslashes($value)) . '" />';
+    $html .= '<span>&nbsp;<input id="wpi_add_eu_states" type="button" class="button-secondary" value="' . esc_attr__('Add EU Member States', 'invoicing') . '" /></span>';
+    $html .= '<span>&nbsp;<input id="wpi_remove_eu_states" type="button" class="button-secondary" value="' . esc_attr__('Remove EU Member States', 'invoicing') . '" /></span>';
+    $html .= '<span>&nbsp;<input id="wpi_vat_get_rates" type="button" class="button-secondary" value="' . esc_attr__('Update EU VAT Rates', 'invoicing') . '" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span>';
     $html .= '<p><label for="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '">' . $args['desc'] . '</label></p>';
     echo $html;
     ?>
@@ -421,36 +421,36 @@ 
     <?php
 }
 
-function wpinv_vat_ip_lookup_callback( $args ) {
+function wpinv_vat_ip_lookup_callback($args) {
     global $wpinv_options, $wpinv_euvat;
 
-    $value =  isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ]  : ( isset( $args['std'] ) ? $args['std'] : 'default' );
+    $value = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : (isset($args['std']) ? $args['std'] : 'default');
     
     $options = array();
-    if ( function_exists( 'geoip_country_code_by_name' ) ) {
-        $options['geoip'] = __( 'PHP GeoIP extension', 'invoicing' );
+    if (function_exists('geoip_country_code_by_name')) {
+        $options['geoip'] = __('PHP GeoIP extension', 'invoicing');
     }
     
     $geoip2_database = $wpinv_euvat->geoip2_country_dbfile();
     
-    if ( !function_exists( 'bcadd' ) ) {
-        $geoip2_message = __( 'GeoIP2 service requires the BC Math PHP extension, it is not loaded in your version of PHP!', 'invoicing' );
+    if (!function_exists('bcadd')) {
+        $geoip2_message = __('GeoIP2 service requires the BC Math PHP extension, it is not loaded in your version of PHP!', 'invoicing');
     } else {
-        $geoip2_message = ini_get('safe_mode') ? __( 'GeoIP2 is not supported with PHP safe mode enabled!', 'invoicing' ) : '';
+        $geoip2_message = ini_get('safe_mode') ? __('GeoIP2 is not supported with PHP safe mode enabled!', 'invoicing') : '';
     }
     
-    if ( $geoip2_database !== false && empty( $geoip2_message ) ) {
-        $options['geoip2'] = __( 'GeoIP2 Database', 'invoicing' );
+    if ($geoip2_database !== false && empty($geoip2_message)) {
+        $options['geoip2'] = __('GeoIP2 Database', 'invoicing');
     }
     
-    if ( function_exists( 'simplexml_load_file' ) ) {
-        $options['geoplugin'] = __( 'geoPlugin Web Service', 'invoicing' );
+    if (function_exists('simplexml_load_file')) {
+        $options['geoplugin'] = __('geoPlugin Web Service', 'invoicing');
     }
     
-    $options['site']    = __( 'Use default country', 'invoicing' );
-    $options['default'] = __( 'Auto', 'invoicing' );
+    $options['site']    = __('Use default country', 'invoicing');
+    $options['default'] = __('Auto', 'invoicing');
 
-    $html = wpinv_html_select( array(
+    $html = wpinv_html_select(array(
         'name'             => "wpinv_settings[{$args['id']}]",
         'selected'         => $value,
         'id'               => "wpinv_settings[{$args['id']}]",
@@ -462,23 +462,23 @@ 
     ));
     
     $desc = '<label for="wpinv_settings[' . $args['id'] . ']">';
-    $desc .= __( 'Select the option Invoicing should use to determine the country from the IP address of the user.', 'invoicing' );
+    $desc .= __('Select the option Invoicing should use to determine the country from the IP address of the user.', 'invoicing');
     $desc .= '<p>';
-    if ( empty( $geoip2_message ) ) {
-        if ( $geoip2_database ) {
+    if (empty($geoip2_message)) {
+        if ($geoip2_database) {
             $last_updated = '';
-            if ( $time_updated = wpinv_get_option( 'wpinv_geoip2_date_updated' ) ) {
-                $date_updated = date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $time_updated );
-                $last_updated = '<br>' . sprintf( __( 'The GeoIP2 database was last updated on: <b>%s</b>', 'invoicing' ), $date_updated );
+            if ($time_updated = wpinv_get_option('wpinv_geoip2_date_updated')) {
+                $date_updated = date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $time_updated);
+                $last_updated = '<br>' . sprintf(__('The GeoIP2 database was last updated on: <b>%s</b>', 'invoicing'), $date_updated);
             }
-            $desc .= __(  'GeoIP2 database exists:', 'invoicing' ) . $last_updated . '&nbsp;<input type="button" id="wpi_geoip2" action="update" class="wpinv-refresh-geoip2-btn button-secondary" value="' . __( 'Update GeoIP2 database now (~55MB)', 'invoicing' ) . '"></input>';
+            $desc .= __('GeoIP2 database exists:', 'invoicing') . $last_updated . '&nbsp;<input type="button" id="wpi_geoip2" action="update" class="wpinv-refresh-geoip2-btn button-secondary" value="' . __('Update GeoIP2 database now (~55MB)', 'invoicing') . '"></input>';
         } else {
-            $desc .= __( 'GeoIP2 database does not exist:', 'invoicing' ) . '&nbsp;<input type="button" id="wpi_geoip2" action="download" class="wpinv-download-geoip2-btn button-secondary" value="' . __( 'Download GeoIP2 database now', 'invoicing' ) . ' (~53MB)"></input><br>' . __(  'After downloading the GeoIP2 database the GeoIP2 lookup option will show.', 'invoicing' );
+            $desc .= __('GeoIP2 database does not exist:', 'invoicing') . '&nbsp;<input type="button" id="wpi_geoip2" action="download" class="wpinv-download-geoip2-btn button-secondary" value="' . __('Download GeoIP2 database now', 'invoicing') . ' (~53MB)"></input><br>' . __('After downloading the GeoIP2 database the GeoIP2 lookup option will show.', 'invoicing');
         }
     } else {
         $desc .= $geoip2_message;
     }
-    $desc .= '</p><p>'. __( 'geoPlugin is a great free service please consider supporting them: ', 'invoicing' ) . ' <a href="http://www.geoplugin.com/" target="_blank">GeoPlugin.com</a></p>';
+    $desc .= '</p><p>' . __('geoPlugin is a great free service please consider supporting them: ', 'invoicing') . ' <a href="http://www.geoplugin.com/" target="_blank">GeoPlugin.com</a></p>';
     $desc .= '</label>';
     
     $html .= $desc;