AyeCode / invoicing

templates/emails/wpinv-email-invoice-items.php

Spacing +70 added lines, -70 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
 global $wpinv_euvat, $ajax_cart_details;
@@ -11,158 +11,158 @@ 
 $quantities_enabled = wpinv_item_quantities_enabled();
 $use_taxes          = wpinv_use_taxes();
 $zero_tax           = !(float)$invoice->get_tax() > 0 ? true : false;
-$tax_label          = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __( 'Tax', 'invoicing' );
-$tax_title          = !$zero_tax && $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+$tax_label          = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __('Tax', 'invoicing');
+$tax_title          = !$zero_tax && $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
 
-do_action( 'wpinv_before_email_items', $invoice ); ?>
+do_action('wpinv_before_email_items', $invoice); ?>
 <div id="wpinv-email-items">
-    <h3 class="wpinv-items-t"><?php echo apply_filters( 'wpinv_email_items_title', __( 'Items', 'invoicing' ) ); ?></h3>
+    <h3 class="wpinv-items-t"><?php echo apply_filters('wpinv_email_items_title', __('Items', 'invoicing')); ?></h3>
     <table id="wpinv_checkout_cart" class="table table-bordered table-hover">
         <thead>
             <tr class="wpinv_cart_header_row">
-                <?php do_action( 'wpinv_email_items_table_header_first' ); ?>
-                <th class="wpinv_cart_item_name text-left"><?php _e( 'Item Name', 'invoicing' ); ?></th>
-                <th class="wpinv_cart_item_price text-right"><?php _e( 'Item Price', 'invoicing' ); ?></th>
-                <?php if ( $quantities_enabled ) { ?>
-                <th class="wpinv_cart_item_qty text-right"><?php _e( 'Qty', 'invoicing' ); ?></th>
+                <?php do_action('wpinv_email_items_table_header_first'); ?>
+                <th class="wpinv_cart_item_name text-left"><?php _e('Item Name', 'invoicing'); ?></th>
+                <th class="wpinv_cart_item_price text-right"><?php _e('Item Price', 'invoicing'); ?></th>
+                <?php if ($quantities_enabled) { ?>
+                <th class="wpinv_cart_item_qty text-right"><?php _e('Qty', 'invoicing'); ?></th>
                 <?php } ?>
-                <?php if ( !$zero_tax && $use_taxes ) { ?>
+                <?php if (!$zero_tax && $use_taxes) { ?>
                 <th class="wpinv_cart_item_tax text-right"><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></th>
                 <?php } ?>
-                <th class="wpinv_cart_item_subtotal text-right"><?php echo __( 'Item Total', 'invoicing' ) . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
-                <?php do_action( 'wpinv_email_items_table_header_last' ); ?>
+                <th class="wpinv_cart_item_subtotal text-right"><?php echo __('Item Total', 'invoicing') . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
+                <?php do_action('wpinv_email_items_table_header_last'); ?>
             </tr>
         </thead>
         <tbody>
             <?php
-                do_action( 'wpinv_email_items_before' );
-                if ( $cart_items ) {
-                    foreach ( $cart_items as $key => $item ) {
-                        $wpi_item = $item['id'] ? new WPInv_Item( $item['id'] ) : NULL;
+                do_action('wpinv_email_items_before');
+                if ($cart_items) {
+                    foreach ($cart_items as $key => $item) {
+                        $wpi_item = $item['id'] ? new WPInv_Item($item['id']) : NULL;
                     ?>
-                    <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr( $key ) . '_' . esc_attr( $item['id'] ); ?>" data-item-id="<?php echo esc_attr( $item['id'] ); ?>">
-                        <?php do_action( 'wpinv_email_items_table_body_first', $item ); ?>
+                    <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr($key) . '_' . esc_attr($item['id']); ?>" data-item-id="<?php echo esc_attr($item['id']); ?>">
+                        <?php do_action('wpinv_email_items_table_body_first', $item); ?>
                         <td class="wpinv_cart_item_name text-left">
                             <?php
-                                if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $item['id'] ) ) {
+                                if (current_theme_supports('post-thumbnails') && has_post_thumbnail($item['id'])) {
                                     echo '<div class="wpinv_cart_item_image">';
-                                        echo get_the_post_thumbnail( $item['id'], apply_filters( 'wpinv_checkout_image_size', array( 25,25 ) ) );
+                                        echo get_the_post_thumbnail($item['id'], apply_filters('wpinv_checkout_image_size', array(25, 25)));
                                     echo '</div>';
                                 }
-                                $item_title = esc_html( wpinv_get_cart_item_name( $item ) ) . wpinv_get_item_suffix( $wpi_item );
+                                $item_title = esc_html(wpinv_get_cart_item_name($item)) . wpinv_get_item_suffix($wpi_item);
                                 echo '<span class="wpinv_email_cart_item_title">' . $item_title . '</span>';
                                 
                                 $summary = '';
-                                if ( !empty( $wpi_item ) && $wpi_item->is_package() && !empty( $item['meta']['post_id'] ) ) {
-                                    $post_link = '<a href="' . get_permalink( $item['meta']['post_id'] ) .'" target="_blank">' . (!empty($item['meta']['invoice_title']) ? $item['meta']['invoice_title'] : get_the_title( $item['meta']['post_id']) ) . '</a>';
-                                    $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $wpi_item->get_custom_singular_name(), $post_link );
+                                if (!empty($wpi_item) && $wpi_item->is_package() && !empty($item['meta']['post_id'])) {
+                                    $post_link = '<a href="' . get_permalink($item['meta']['post_id']) . '" target="_blank">' . (!empty($item['meta']['invoice_title']) ? $item['meta']['invoice_title'] : get_the_title($item['meta']['post_id'])) . '</a>';
+                                    $summary = wp_sprintf(__('%s: %s', 'invoicing'), $wpi_item->get_custom_singular_name(), $post_link);
                                 }
                                 
-                                $summary = apply_filters( 'wpinv_email_invoice_line_item_summary', $summary, $item, $wpi_item, $invoice );
-                                if ( !empty( $summary ) ) {
+                                $summary = apply_filters('wpinv_email_invoice_line_item_summary', $summary, $item, $wpi_item, $invoice);
+                                if (!empty($summary)) {
                                     echo '<p class="small">' . $summary . '</p>';
                                 }
     
-                                do_action( 'wpinv_email_cart_item_title_after', $item, $key );
+                                do_action('wpinv_email_cart_item_title_after', $item, $key);
                             ?>
                         </td>
                         <td class="wpinv_cart_item_price text-right">
                             <?php 
-                            echo wpinv_cart_item_price( $item );
-                            do_action( 'wpinv_email_cart_item_price_after', $item, $key );
+                            echo wpinv_cart_item_price($item);
+                            do_action('wpinv_email_cart_item_price_after', $item, $key);
                             ?>
                         </td>
-                        <?php if ( $quantities_enabled ) { ?>
+                        <?php if ($quantities_enabled) { ?>
                         <td class="wpinv_cart_item_qty text-right">
                             <?php
-                            echo wpinv_get_cart_item_quantity( $item );
-                            do_action( 'wpinv_email_item_quantitiy', $item, $key );
+                            echo wpinv_get_cart_item_quantity($item);
+                            do_action('wpinv_email_item_quantitiy', $item, $key);
                             ?>
                         </td>
                         <?php } ?>
-                        <?php if ( !$zero_tax && $use_taxes ) { ?>
+                        <?php if (!$zero_tax && $use_taxes) { ?>
                         <td class="wpinv_cart_item_tax text-right">
                             <?php
-                            echo wpinv_cart_item_tax( $item );
-                            do_action( 'wpinv_email_item_tax', $item, $key );
+                            echo wpinv_cart_item_tax($item);
+                            do_action('wpinv_email_item_tax', $item, $key);
                             ?>
                         </td>
                         <?php } ?>
                         <td class="wpinv_cart_item_subtotal text-right">
                             <?php
-                            echo wpinv_cart_item_subtotal( $item );
-                            do_action( 'wpinv_email_item_subtotal', $item, $key );
+                            echo wpinv_cart_item_subtotal($item);
+                            do_action('wpinv_email_item_subtotal', $item, $key);
                             ?>
                         </td>
-                        <?php do_action( 'wpinv_email_items_table_body_last', $item, $key ); ?>
+                        <?php do_action('wpinv_email_items_table_body_last', $item, $key); ?>
                     </tr>
                 <?php } ?>
             <?php } ?>
-            <?php do_action( 'wpinv_email_items_middle' ); ?>
-            <?php do_action( 'wpinv_email_items_after' ); ?>
+            <?php do_action('wpinv_email_items_middle'); ?>
+            <?php do_action('wpinv_email_items_after'); ?>
         </tbody>
         <tfoot>
-            <?php $cart_columns = wpinv_checkout_cart_columns(); if ( $zero_tax && $use_taxes ) { $cart_columns--; } ?>
-            <?php if ( has_action( 'wpinv_email_footer_buttons' ) ) { ?>
+            <?php $cart_columns = wpinv_checkout_cart_columns(); if ($zero_tax && $use_taxes) { $cart_columns--; } ?>
+            <?php if (has_action('wpinv_email_footer_buttons')) { ?>
                 <tr class="wpinv_cart_footer_row">
-                    <?php do_action( 'wpinv_email_items_table_buttons_first', $cart_items ); ?>
-                    <td colspan="<?php echo ( $cart_columns ); ?>">
-                        <?php do_action( 'wpinv_email_footer_buttons' ); ?>
+                    <?php do_action('wpinv_email_items_table_buttons_first', $cart_items); ?>
+                    <td colspan="<?php echo ($cart_columns); ?>">
+                        <?php do_action('wpinv_email_footer_buttons'); ?>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_buttons_first', $cart_items ); ?>
+                    <?php do_action('wpinv_email_items_table_buttons_first', $cart_items); ?>
                 </tr>
             <?php } ?>
 
-            <?php if ( !$zero_tax && $use_taxes && !wpinv_prices_include_tax() && wpinv_is_cart_taxed() ) { ?>
+            <?php if (!$zero_tax && $use_taxes && !wpinv_prices_include_tax() && wpinv_is_cart_taxed()) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row">
-                    <?php do_action( 'wpinv_email_items_table_subtotal_first', $cart_items ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_subtotal_label text-right">
-                        <strong><?php _e( 'Sub-Total', 'invoicing' ); ?>:</strong>
+                    <?php do_action('wpinv_email_items_table_subtotal_first', $cart_items); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_subtotal_label text-right">
+                        <strong><?php _e('Sub-Total', 'invoicing'); ?>:</strong>
                     </td>
                     <td class="wpinv_cart_subtotal text-right">
-                        <span class="wpinv_cart_subtotal_amount bold"><?php echo $invoice->get_subtotal( true ); ?></span>
+                        <span class="wpinv_cart_subtotal_amount bold"><?php echo $invoice->get_subtotal(true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_subtotal_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_email_items_table_subtotal_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
             
-            <?php if ( wpinv_discount( $invoice_id, false ) > 0 ) { ?>
+            <?php if (wpinv_discount($invoice_id, false) > 0) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_discount_row">
-                    <?php do_action( 'wpinv_receipt_items_table_discount_first', $cart_items, $invoice ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_discount_label text-right">
-                        <strong><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?>:</strong>
+                    <?php do_action('wpinv_receipt_items_table_discount_first', $cart_items, $invoice); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_discount_label text-right">
+                        <strong><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?>:</strong>
                     </td>
                     <td class="wpinv_cart_discount text-right">
-                        <span class="wpinv_cart_discount_amount"><?php echo wpinv_discount( $invoice_id, true, true ); ?></span>
+                        <span class="wpinv_cart_discount_amount"><?php echo wpinv_discount($invoice_id, true, true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_receipt_items_table_discount_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_receipt_items_table_discount_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
 
-            <?php if ( !$zero_tax && $use_taxes && wpinv_is_cart_taxed() ) { ?>
+            <?php if (!$zero_tax && $use_taxes && wpinv_is_cart_taxed()) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_tax_row">
-                    <?php do_action( 'wpinv_email_items_table_tax_first', $cart_items, $invoice ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_tax_label text-right">
+                    <?php do_action('wpinv_email_items_table_tax_first', $cart_items, $invoice); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_tax_label text-right">
                         <strong><?php echo $tax_label; ?>:</strong>
                     </td>
                     <td class="wpinv_cart_tax text-right">
-                        <span class="wpinv_cart_tax_amount"><?php echo $invoice->get_tax( true ); ?></span>
+                        <span class="wpinv_cart_tax_amount"><?php echo $invoice->get_tax(true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_tax_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_email_items_table_tax_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
 
             <tr class="wpinv_cart_footer_row">
-                <?php do_action( 'wpinv_email_items_table_footer_first', $cart_items, $invoice ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_total_label text-right">
-                    <?php echo apply_filters( 'wpinv_email_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?>
+                <?php do_action('wpinv_email_items_table_footer_first', $cart_items, $invoice); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_total_label text-right">
+                    <?php echo apply_filters('wpinv_email_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?>
                 </td>
                 <td class="wpinv_cart_total text-right">
-                    <span class="wpinv_cart_amount bold"><?php echo $invoice->get_total( true ); ?></span>
+                    <span class="wpinv_cart_amount bold"><?php echo $invoice->get_total(true); ?></span>
                 </td>
-                <?php do_action( 'wpinv_email_items_table_footer_last', $cart_items, $invoice ); ?>
+                <?php do_action('wpinv_email_items_table_footer_last', $cart_items, $invoice); ?>
             </tr>
         </tfoot>
     </table>
 </div>
-<?php do_action( 'wpinv_after_email_items', $invoice ); ?>
\ No newline at end of file
+<?php do_action('wpinv_after_email_items', $invoice); ?>
\ No newline at end of file

templates/wpinv-checkout-cart.php

Spacing +61 added lines, -61 removed lines

@@ -5,140 +5,140 @@
 
 global $wpinv_euvat, $post, $ajax_cart_details, $wpi_cart_columns, $wpi_session;
 $invoice            = wpinv_get_invoice_cart();
-$cart_items         = !empty( $ajax_cart_details ) ? $ajax_cart_details : wpinv_get_cart_content_details();
+$cart_items         = !empty($ajax_cart_details) ? $ajax_cart_details : wpinv_get_cart_content_details();
 $quantities_enabled = wpinv_item_quantities_enabled();
 $use_taxes          = wpinv_use_taxes();
 $tax_label          = $wpinv_euvat->tax_label();
-$tax_title          = $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+$tax_title          = $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
 ?>
 <table id="wpinv_checkout_cart" class="table table-bordered table-hover">
     <thead>
         <tr class="wpinv_cart_header_row">
-            <?php do_action( 'wpinv_checkout_table_header_first' ); ?>
-            <th class="wpinv_cart_item_name text-left"><?php _e( 'Item Name', 'invoicing' ); ?></th>
-            <th class="wpinv_cart_item_price text-right"><?php _e( 'Item Price', 'invoicing' ); ?></th>
-            <?php if ( $quantities_enabled ) { ?>
-            <th class="wpinv_cart_item_qty text-right"><?php _e( 'Qty', 'invoicing' ); ?></th>
+            <?php do_action('wpinv_checkout_table_header_first'); ?>
+            <th class="wpinv_cart_item_name text-left"><?php _e('Item Name', 'invoicing'); ?></th>
+            <th class="wpinv_cart_item_price text-right"><?php _e('Item Price', 'invoicing'); ?></th>
+            <?php if ($quantities_enabled) { ?>
+            <th class="wpinv_cart_item_qty text-right"><?php _e('Qty', 'invoicing'); ?></th>
             <?php } ?>
-            <?php if ( $use_taxes ) { ?>
+            <?php if ($use_taxes) { ?>
             <th class="wpinv_cart_item_tax text-right"><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></th>
             <?php } ?>
-            <th class="wpinv_cart_item_subtotal text-right"><?php echo __( 'Item Total', 'invoicing' ) . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
-            <?php do_action( 'wpinv_checkout_table_header_last' ); ?>
+            <th class="wpinv_cart_item_subtotal text-right"><?php echo __('Item Total', 'invoicing') . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
+            <?php do_action('wpinv_checkout_table_header_last'); ?>
         </tr>
     </thead>
     <tbody>
         <?php
-            do_action( 'wpinv_cart_items_before' );
+            do_action('wpinv_cart_items_before');
             
-            if ( $cart_items ) {
-                foreach ( $cart_items as $key => $item ) {
-                    $wpi_item = !empty( $item['id'] ) ? new WPInv_Item( $item['id'] ) : NULL;
+            if ($cart_items) {
+                foreach ($cart_items as $key => $item) {
+                    $wpi_item = !empty($item['id']) ? new WPInv_Item($item['id']) : NULL;
                 ?>
-                <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr( $key ) . '_' . esc_attr( $item['id'] ); ?>" data-item-id="<?php echo esc_attr( $item['id'] ); ?>">
-                    <?php do_action( 'wpinv_checkout_table_body_first', $item ); ?>
+                <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr($key) . '_' . esc_attr($item['id']); ?>" data-item-id="<?php echo esc_attr($item['id']); ?>">
+                    <?php do_action('wpinv_checkout_table_body_first', $item); ?>
                     <td class="wpinv_cart_item_name text-left">
                         <?php
-                            if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $item['id'] ) ) {
+                            if (current_theme_supports('post-thumbnails') && has_post_thumbnail($item['id'])) {
                                 echo '<div class="wpinv_cart_item_image">';
-                                    echo get_the_post_thumbnail( $item['id'], apply_filters( 'wpinv_checkout_image_size', array( 25,25 ) ) );
+                                    echo get_the_post_thumbnail($item['id'], apply_filters('wpinv_checkout_image_size', array(25, 25)));
                                 echo '</div>';
                             }
-                            $item_title = esc_html( wpinv_get_cart_item_name( $item ) ) . wpinv_get_item_suffix( $wpi_item );
+                            $item_title = esc_html(wpinv_get_cart_item_name($item)) . wpinv_get_item_suffix($wpi_item);
                             echo '<span class="wpinv_checkout_cart_item_title">' . $item_title . '</span>';
-                            if ( !empty( $wpi_item ) && $wpi_item->is_package() && !empty( $item['meta']['post_id'] ) ) {
-                                $post_link = !empty( $item['meta']['invoice_title'] ) ? $item['meta']['invoice_title'] : get_the_title( $item['meta']['post_id'] );
-                                $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $wpi_item->get_custom_singular_name(), $post_link );
-                                echo '<small class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</small>';
+                            if (!empty($wpi_item) && $wpi_item->is_package() && !empty($item['meta']['post_id'])) {
+                                $post_link = !empty($item['meta']['invoice_title']) ? $item['meta']['invoice_title'] : get_the_title($item['meta']['post_id']);
+                                $summary = wp_sprintf(__('%s: %s', 'invoicing'), $wpi_item->get_custom_singular_name(), $post_link);
+                                echo '<small class="meta">' . wpautop(wp_kses_post($summary)) . '</small>';
                             }
-                            do_action( 'wpinv_checkout_cart_item_title_after', $item, $key );
+                            do_action('wpinv_checkout_cart_item_title_after', $item, $key);
                         ?>
                     </td>
                     <td class="wpinv_cart_item_price text-right">
                         <?php 
-                        echo wpinv_cart_item_price( $item );
-                        do_action( 'wpinv_checkout_cart_item_price_after', $item, $key );
+                        echo wpinv_cart_item_price($item);
+                        do_action('wpinv_checkout_cart_item_price_after', $item, $key);
                         ?>
                     </td>
-                    <?php if ( $quantities_enabled ) { ?>
+                    <?php if ($quantities_enabled) { ?>
                     <td class="wpinv_cart_item_qty text-right">
                         <?php
-                        echo wpinv_get_cart_item_quantity( $item );
-                        do_action( 'wpinv_cart_item_quantitiy', $item, $key );
+                        echo wpinv_get_cart_item_quantity($item);
+                        do_action('wpinv_cart_item_quantitiy', $item, $key);
                         ?>
                     </td>
                     <?php } ?>
-                    <?php if ( $use_taxes ) { ?>
+                    <?php if ($use_taxes) { ?>
                     <td class="wpinv_cart_item_tax text-right">
                         <?php
-                        echo wpinv_cart_item_tax( $item );
+                        echo wpinv_cart_item_tax($item);
                         //echo wpinv_get_cart_item_tax( $wpi_item->ID, $subtotal = '', $options = array() );
-                        do_action( 'wpinv_cart_item_tax', $item, $key );
+                        do_action('wpinv_cart_item_tax', $item, $key);
                         ?>
                     </td>
                     <?php } ?>
                     <td class="wpinv_cart_item_subtotal text-right">
                         <?php
-                        echo wpinv_cart_item_subtotal( $item );
-                        do_action( 'wpinv_cart_item_subtotal', $item, $key );
+                        echo wpinv_cart_item_subtotal($item);
+                        do_action('wpinv_cart_item_subtotal', $item, $key);
                         ?>
                     </td>
-                    <?php do_action( 'wpinv_checkout_table_body_last', $item, $key ); ?>
+                    <?php do_action('wpinv_checkout_table_body_last', $item, $key); ?>
                 </tr>
             <?php } ?>
         <?php } ?>
-        <?php do_action( 'wpinv_cart_items_middle' ); ?>
-        <?php do_action( 'wpinv_cart_items_after' ); ?>
+        <?php do_action('wpinv_cart_items_middle'); ?>
+        <?php do_action('wpinv_cart_items_after'); ?>
     </tbody>
     <tfoot>
         <?php $cart_columns = wpinv_checkout_cart_columns(); ?>
-        <?php if ( has_action( 'wpinv_cart_footer_buttons' ) ) { ?>
+        <?php if (has_action('wpinv_cart_footer_buttons')) { ?>
             <tr class="wpinv_cart_footer_row">
-                <?php do_action( 'wpinv_checkout_table_buttons_first', $cart_items ); ?>
-                <td colspan="<?php echo ( $cart_columns ); ?>">
-                    <?php do_action( 'wpinv_cart_footer_buttons' ); ?>
+                <?php do_action('wpinv_checkout_table_buttons_first', $cart_items); ?>
+                <td colspan="<?php echo ($cart_columns); ?>">
+                    <?php do_action('wpinv_cart_footer_buttons'); ?>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_buttons_first', $cart_items ); ?>
+                <?php do_action('wpinv_checkout_table_buttons_first', $cart_items); ?>
             </tr>
         <?php } ?>
 
-        <?php if ( $use_taxes && !wpinv_prices_include_tax() ) { ?>
-            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if ( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
-                <?php do_action( 'wpinv_checkout_table_subtotal_first', $cart_items ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_subtotal_label text-right">
-                    <strong><?php _e( 'Sub-Total', 'invoicing' ); ?>:</strong>
+        <?php if ($use_taxes && !wpinv_prices_include_tax()) { ?>
+            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if (!wpinv_is_cart_taxed()) echo ' style="display:none;"'; ?>>
+                <?php do_action('wpinv_checkout_table_subtotal_first', $cart_items); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_subtotal_label text-right">
+                    <strong><?php _e('Sub-Total', 'invoicing'); ?>:</strong>
                 </td>
                 <td class="wpinv_cart_subtotal text-right">
-                    <span class="wpinv_cart_subtotal_amount bold"><?php echo wpinv_cart_subtotal( $cart_items ); ?></span>
+                    <span class="wpinv_cart_subtotal_amount bold"><?php echo wpinv_cart_subtotal($cart_items); ?></span>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_subtotal_last', $cart_items ); ?>
+                <?php do_action('wpinv_checkout_table_subtotal_last', $cart_items); ?>
             </tr>
         <?php } ?>
         
-        <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html( $cart_items ); ?>
+        <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html($cart_items); ?>
 
-        <?php if ( $use_taxes ) { ?>
-            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
-                <?php do_action( 'wpinv_checkout_table_tax_first' ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_tax_label text-right">
+        <?php if ($use_taxes) { ?>
+            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if (!wpinv_is_cart_taxed()) echo ' style="display:none;"'; ?>>
+                <?php do_action('wpinv_checkout_table_tax_first'); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_tax_label text-right">
                     <strong><?php echo $tax_label; ?>:</strong>
                 </td>
                 <td class="wpinv_cart_tax text-right">
-                    <span class="wpinv_cart_tax_amount" data-tax="<?php echo wpinv_get_cart_tax( $cart_items ); ?>"><?php echo esc_html( wpinv_cart_tax( $cart_items ) ); ?></span>
+                    <span class="wpinv_cart_tax_amount" data-tax="<?php echo wpinv_get_cart_tax($cart_items); ?>"><?php echo esc_html(wpinv_cart_tax($cart_items)); ?></span>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_tax_last' ); ?>
+                <?php do_action('wpinv_checkout_table_tax_last'); ?>
             </tr>
         <?php } ?>
 
         <tr class="wpinv_cart_footer_row wpinv_cart_total_row">
-            <?php do_action( 'wpinv_checkout_table_footer_first' ); ?>
-            <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_total_label text-right">
-                <?php echo apply_filters( 'wpinv_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?>
+            <?php do_action('wpinv_checkout_table_footer_first'); ?>
+            <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_total_label text-right">
+                <?php echo apply_filters('wpinv_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?>
             </td>
             <td class="wpinv_cart_total text-right">
-                <span class="wpinv_cart_amount bold" data-subtotal="<?php echo wpinv_get_cart_total( $cart_items ); ?>" data-total="<?php echo wpinv_get_cart_total( NULL, NULL, $invoice ); ?>"><?php wpinv_cart_total( $cart_items, true, $invoice ); ?></span>
+                <span class="wpinv_cart_amount bold" data-subtotal="<?php echo wpinv_get_cart_total($cart_items); ?>" data-total="<?php echo wpinv_get_cart_total(NULL, NULL, $invoice); ?>"><?php wpinv_cart_total($cart_items, true, $invoice); ?></span>
             </td>
-            <?php do_action( 'wpinv_checkout_table_footer_last' ); ?>
+            <?php do_action('wpinv_checkout_table_footer_last'); ?>
         </tr>
     </tfoot>
 </table>

includes/admin/meta-boxes/class-mb-invoice-address.php

Spacing +48 added lines, -48 removed lines

@@ -1,34 +1,34 @@ 
 <?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__));
 }
 
 class WPInv_Meta_Box_Billing_Details {
-    public static function output( $post ) {
+    public static function output($post) {
         global $user_ID;
-        $post_id    = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice    = new WPInv_Invoice( $post_id );
+        $post_id    = !empty($post->ID) ? $post->ID : 0;
+        $invoice    = new WPInv_Invoice($post_id);
 ?>
 <div class="gdmbx2-wrap form-table">
     <div id="gdmbx2-metabox-wpinv_address" class="gdmbx2-metabox gdmbx-field-list wpinv-address gdmbx-row">
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-user-id table-layout">
             <div class="gdmbx-th">
-                <label for="post_author_override"><?php _e( 'Customer', 'invoicing' );?></label>
+                <label for="post_author_override"><?php _e('Customer', 'invoicing'); ?></label>
             </div>
             <div class="gdmbx-td gdmbx-customer-div">
-            <?php wpinv_dropdown_users( array(
+            <?php wpinv_dropdown_users(array(
                             'name' => 'post_author_override',
                             'selected' => empty($post->ID) ? $user_ID : $post->post_author,
                             'include_selected' => true,
                             'show' => 'user_email',
                             'orderby' => 'user_email',
                             'class' => 'gdmbx2-text-large'
-                        ) ); ?>
+                        )); ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-email table-layout" style="display:none">
-            <div class="gdmbx-th"><label for="wpinv_email"><?php _e( 'Email', 'invoicing' );?> <span class="required">*</span></label>
+            <div class="gdmbx-th"><label for="wpinv_email"><?php _e('Email', 'invoicing'); ?> <span class="required">*</span></label>
             </div>
             <div class="gdmbx-td">
                 <input type="hidden" id="wpinv_new_user" name="wpinv_new_user" value="" />
@@ -36,56 +36,56 @@ 
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-btns table-layout">
-            <div class="gdmbx-th"><label><?php _e( 'Actions', 'invoicing' );?></label>
+            <div class="gdmbx-th"><label><?php _e('Actions', 'invoicing'); ?></label>
             </div>
             <div class="gdmbx-td">
-                <a id="wpinv-fill-user-details" class="button button-small button-secondary" title="<?php esc_attr_e( 'Fill User Details', 'invoicing' );?>" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-refresh"></i><?php _e( 'Fill User Details', 'invoicing' );?></a>
-                <a class="wpinv-new-user button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-plus"></i><?php _e( 'Add New User', 'invoicing' );?></a>
-                <a style="display:none" class="wpinv-new-cancel button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-close"></i><?php _e( 'Cancel', 'invoicing' );?> </a>
+                <a id="wpinv-fill-user-details" class="button button-small button-secondary" title="<?php esc_attr_e('Fill User Details', 'invoicing'); ?>" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-refresh"></i><?php _e('Fill User Details', 'invoicing'); ?></a>
+                <a class="wpinv-new-user button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-plus"></i><?php _e('Add New User', 'invoicing'); ?></a>
+                <a style="display:none" class="wpinv-new-cancel button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-close"></i><?php _e('Cancel', 'invoicing'); ?> </a>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-first-name table-layout">
-            <div class="gdmbx-th"><label for="wpinv_first_name"><?php _e( 'First Name', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_first_name"><?php _e('First Name', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_first_name" id="wpinv_first_name" value="<?php echo esc_attr( $invoice->first_name );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_first_name" id="wpinv_first_name" value="<?php echo esc_attr($invoice->first_name); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-last-name table-layout">
-            <div class="gdmbx-th"><label for="wpinv_last_name"><?php _e( 'Last Name', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_last_name"><?php _e('Last Name', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_last_name" id="wpinv_last_name" value="<?php echo esc_attr( $invoice->last_name );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_last_name" id="wpinv_last_name" value="<?php echo esc_attr($invoice->last_name); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-company table-layout">
-            <div class="gdmbx-th"><label for="wpinv_company"><?php _e( 'Company', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_company"><?php _e('Company', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_company" id="wpinv_company" value="<?php echo esc_attr( $invoice->company );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_company" id="wpinv_company" value="<?php echo esc_attr($invoice->company); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-vat-number table-layout">
-            <div class="gdmbx-th"><label for="wpinv_vat_number"><?php _e( 'Vat Number', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_vat_number"><?php _e('Vat Number', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_vat_number" id="wpinv_vat_number" value="<?php echo esc_attr( $invoice->vat_number );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_vat_number" id="wpinv_vat_number" value="<?php echo esc_attr($invoice->vat_number); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-address table-layout">
-            <div class="gdmbx-th"><label for="wpinv_address"><?php _e( 'Address', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_address"><?php _e('Address', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_address" id="wpinv_address" value="<?php echo esc_attr( $invoice->address );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_address" id="wpinv_address" value="<?php echo esc_attr($invoice->address); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-city table-layout">
-            <div class="gdmbx-th"><label for="wpinv_city"><?php _e( 'City', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_city"><?php _e('City', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_city" id="wpinv_city" value="<?php echo esc_attr( $invoice->city );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_city" id="wpinv_city" value="<?php echo esc_attr($invoice->city); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-select gdmbx-wpinv-country table-layout">
-            <div class="gdmbx-th"><label for="wpinv_country"><?php _e( 'Country', 'invoicing' );?> <span class="wpi-loader"><i class="fa fa-refresh fa-spin"></i></span></label></div>
+            <div class="gdmbx-th"><label for="wpinv_country"><?php _e('Country', 'invoicing'); ?> <span class="wpi-loader"><i class="fa fa-refresh fa-spin"></i></span></label></div>
             <div class="gdmbx-td">
                 <?php
-                echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'Choose a country', 'invoicing' ) ), wpinv_get_country_list() ),
+                echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('Choose a country', 'invoicing')), wpinv_get_country_list()),
                     'name'             => 'wpinv_country',
                     'id'               => 'wpinv_country',
                     'selected'         => $invoice->country,
@@ -93,20 +93,20 @@ 
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-large',
                     'chosen'           => false,
-                    'placeholder'      => __( 'Choose a country', 'invoicing' ),
+                    'placeholder'      => __('Choose a country', 'invoicing'),
                     'required'         => false,
-                ) );
+                ));
                 ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-state table-layout">
-            <div class="gdmbx-th"><label for="wpinv_state"><?php _e( 'State', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_state"><?php _e('State', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
                 <?php
-                $states = wpinv_get_country_states( $invoice->country );
-                if( !empty( $states ) ) {
-                    echo wpinv_html_select( array(
-                        'options'          => array_merge( array( '' => __( 'Choose a state', 'invoicing' ) ), $states ),
+                $states = wpinv_get_country_states($invoice->country);
+                if (!empty($states)) {
+                    echo wpinv_html_select(array(
+                        'options'          => array_merge(array('' => __('Choose a state', 'invoicing')), $states),
                         'name'             => 'wpinv_state',
                         'id'               => 'wpinv_state',
                         'selected'         => $invoice->state,
@@ -114,44 +114,44 @@ 
                         'show_option_none' => false,
                         'class'            => 'gdmbx2-text-large',
                         'chosen'           => false,
-                        'placeholder'      => __( 'Choose a state', 'invoicing' ),
+                        'placeholder'      => __('Choose a state', 'invoicing'),
                         'required'         => false,
-                    ) );
+                    ));
                 } else {
-                    echo wpinv_html_text( array(
+                    echo wpinv_html_text(array(
                         'name'  => 'wpinv_state',
-                        'value' => ! empty( $invoice->state ) ? $invoice->state : '',
+                        'value' => !empty($invoice->state) ? $invoice->state : '',
                         'id'    => 'wpinv_state',
                         'class' => 'gdmbx2-text-large',
                         'required' => false,
-                    ) );
+                    ));
                 }
                 ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-zip table-layout">
-            <div class="gdmbx-th"><label for="wpinv_zip"><?php _e( 'Zipcode', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_zip"><?php _e('Zipcode', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_zip" id="wpinv_zip" value="<?php echo esc_attr( $invoice->zip );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_zip" id="wpinv_zip" value="<?php echo esc_attr($invoice->zip); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-phone table-layout">
-            <div class="gdmbx-th"><label for="wpinv_phone"><?php _e( 'Phone', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_phone"><?php _e('Phone', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_phone" id="wpinv_phone" value="<?php echo esc_attr( $invoice->phone );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_phone" id="wpinv_phone" value="<?php echo esc_attr($invoice->phone); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-ip table-layout">
-            <div class="gdmbx-th"><label for="wpinv_ip"><?php _e( 'IP Address', 'invoicing' );?><?php if ($invoice->ip) { ?>
-                &nbsp;&nbsp;<a href="<?php echo admin_url( 'admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $invoice->ip ); ?>" title="<?php esc_attr_e( 'View IP information', 'invoicing' );?>" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+            <div class="gdmbx-th"><label for="wpinv_ip"><?php _e('IP Address', 'invoicing'); ?><?php if ($invoice->ip) { ?>
+                &nbsp;&nbsp;<a href="<?php echo admin_url('admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $invoice->ip); ?>" title="<?php esc_attr_e('View IP information', 'invoicing'); ?>" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i></a>
                 <?php } ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" value="<?php echo esc_attr( $invoice->ip );?>" readonly />
+                <input type="text" class="gdmbx2-text-large" value="<?php echo esc_attr($invoice->ip); ?>" readonly />
             </div>
         </div>
     </div>
 </div>
-<?php wp_nonce_field( 'wpinv_save_invoice', 'wpinv_save_invoice' ) ;?>
+<?php wp_nonce_field('wpinv_save_invoice', 'wpinv_save_invoice'); ?>
 <?php
     }
 }

includes/class-wpinv-reports.php

Spacing +169 added lines, -169 removed lines

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

includes/wpinv-helper-functions.php

Spacing +235 added lines, -235 removed lines

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

includes/class-wpinv-ajax.php

Spacing +191 added lines, -191 removed lines

@@ -7,28 +7,28 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Ajax {
     public static function init() {
-        add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-        add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+        add_action('init', array(__CLASS__, 'define_ajax'), 0);
+        add_action('template_redirect', array(__CLASS__, 'do_wpinv_ajax'), 0);
         self::add_ajax_events();
     }
 
     public static function define_ajax() {
-        if ( !empty( $_GET['wpinv-ajax'] ) ) {
-            if ( ! defined( 'DOING_AJAX' ) ) {
-                define( 'DOING_AJAX', true );
+        if (!empty($_GET['wpinv-ajax'])) {
+            if (!defined('DOING_AJAX')) {
+                define('DOING_AJAX', true);
             }
-            if ( ! defined( 'WC_DOING_AJAX' ) ) {
-                define( 'WC_DOING_AJAX', true );
+            if (!defined('WC_DOING_AJAX')) {
+                define('WC_DOING_AJAX', true);
             }
             // Turn off display_errors during AJAX events to prevent malformed JSON
-            if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-                @ini_set( 'display_errors', 0 );
+            if (!WP_DEBUG || (WP_DEBUG && !WP_DEBUG_DISPLAY)) {
+                @ini_set('display_errors', 0);
             }
             $GLOBALS['wpdb']->hide_errors();
         }
@@ -37,24 +37,24 @@ 
     public static function do_wpinv_ajax() {
         global $wp_query;
 
-        if ( !empty( $_GET['wpinv-ajax'] ) ) {
-            $wp_query->set( 'wpinv-ajax', sanitize_text_field( $_GET['wpinv-ajax'] ) );
+        if (!empty($_GET['wpinv-ajax'])) {
+            $wp_query->set('wpinv-ajax', sanitize_text_field($_GET['wpinv-ajax']));
         }
 
-        if ( $action = $wp_query->get( 'wpinv-ajax' ) ) {
+        if ($action = $wp_query->get('wpinv-ajax')) {
             self::wpinv_ajax_headers();
-            do_action( 'wpinv_ajax_' . sanitize_text_field( $action ) );
+            do_action('wpinv_ajax_' . sanitize_text_field($action));
             die();
         }
     }
     
     private static function wpinv_ajax_headers() {
         send_origin_headers();
-        @header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-        @header( 'X-Robots-Tag: noindex' );
+        @header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+        @header('X-Robots-Tag: noindex');
         send_nosniff_header();
         nocache_headers();
-        status_header( 200 );
+        status_header(200);
     }
     
     public static function add_ajax_events() {
@@ -76,39 +76,39 @@ 
             'remove_discount' => false,
         );
 
-        foreach ( $ajax_events as $ajax_event => $nopriv ) {
-            add_action( 'wp_ajax_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+        foreach ($ajax_events as $ajax_event => $nopriv) {
+            add_action('wp_ajax_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
             
-            if ( !defined( 'WPI_AJAX_' . strtoupper( $nopriv ) ) ) {
-                define( 'WPI_AJAX_' . strtoupper( $nopriv ), 1 );
+            if (!defined('WPI_AJAX_' . strtoupper($nopriv))) {
+                define('WPI_AJAX_' . strtoupper($nopriv), 1);
             }
 
-            if ( $nopriv ) {
-                add_action( 'wp_ajax_nopriv_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+            if ($nopriv) {
+                add_action('wp_ajax_nopriv_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
 
-                add_action( 'wpinv_ajax_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+                add_action('wpinv_ajax_' . $ajax_event, array(__CLASS__, $ajax_event));
             }
         }
     }
     
     public static function add_note() {
-        check_ajax_referer( 'add-invoice-note', '_nonce' );
+        check_ajax_referer('add-invoice-note', '_nonce');
 
-        if ( !current_user_can( 'manage_options' ) ) {
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
 
-        $post_id   = absint( $_POST['post_id'] );
-        $note      = wp_kses_post( trim( stripslashes( $_POST['note'] ) ) );
-        $note_type = sanitize_text_field( $_POST['note_type'] );
+        $post_id   = absint($_POST['post_id']);
+        $note      = wp_kses_post(trim(stripslashes($_POST['note'])));
+        $note_type = sanitize_text_field($_POST['note_type']);
 
         $is_customer_note = $note_type == 'customer' ? 1 : 0;
 
-        if ( $post_id > 0 ) {
-            $note_id = wpinv_insert_payment_note( $post_id, $note, $is_customer_note );
+        if ($post_id > 0) {
+            $note_id = wpinv_insert_payment_note($post_id, $note, $is_customer_note);
 
-            if ( $note_id > 0 && !is_wp_error( $note_id ) ) {
-                wpinv_get_invoice_note_line_item( $note_id );
+            if ($note_id > 0 && !is_wp_error($note_id)) {
+                wpinv_get_invoice_note_line_item($note_id);
             }
         }
 
@@ -116,16 +116,16 @@ 
     }
 
     public static function delete_note() {
-        check_ajax_referer( 'delete-invoice-note', '_nonce' );
+        check_ajax_referer('delete-invoice-note', '_nonce');
 
-        if ( !current_user_can( 'manage_options' ) ) {
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
 
         $note_id = (int)$_POST['note_id'];
 
-        if ( $note_id > 0 ) {
-            wp_delete_comment( $note_id, true );
+        if ($note_id > 0) {
+            wp_delete_comment($note_id, true);
         }
 
         die();
@@ -138,8 +138,8 @@ 
     }
     
     public static function checkout() {
-        if ( ! defined( 'WPINV_CHECKOUT' ) ) {
-            define( 'WPINV_CHECKOUT', true );
+        if (!defined('WPINV_CHECKOUT')) {
+            define('WPINV_CHECKOUT', true);
         }
 
         wpinv_process_checkout();
@@ -148,53 +148,53 @@ 
     
     public static function add_invoice_item() {
         global $wpi_userID, $wpinv_ip_address_country;
-        check_ajax_referer( 'invoice-item', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $item_id    = sanitize_text_field( $_POST['item_id'] );
-        $invoice_id = absint( $_POST['invoice_id'] );
+        $item_id    = sanitize_text_field($_POST['item_id']);
+        $invoice_id = absint($_POST['invoice_id']);
         
-        if ( !is_numeric( $invoice_id ) || !is_numeric( $item_id ) ) {
+        if (!is_numeric($invoice_id) || !is_numeric($item_id)) {
             die();
         }
         
-        $invoice    = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice)) {
             die();
         }
         
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             die(); // Don't allow modify items for paid invoice.
         }
         
-        if ( !empty( $_POST['user_id'] ) ) {
-            $wpi_userID = absint( $_POST['user_id'] ); 
+        if (!empty($_POST['user_id'])) {
+            $wpi_userID = absint($_POST['user_id']); 
         }
 
-        $item = new WPInv_Item( $item_id );
-        if ( !( !empty( $item ) && $item->post_type == 'wpi_item' ) ) {
+        $item = new WPInv_Item($item_id);
+        if (!(!empty($item) && $item->post_type == 'wpi_item')) {
             die();
         }
         
         // Validate item before adding to invoice because recurring item must be paid individually.
-        if ( !empty( $invoice->cart_details ) ) {
+        if (!empty($invoice->cart_details)) {
             $valid = true;
             
-            if ( $recurring_item = $invoice->get_recurring() ) {
-                if ( $recurring_item != $item_id ) {
+            if ($recurring_item = $invoice->get_recurring()) {
+                if ($recurring_item != $item_id) {
                     $valid = false;
                 }
-            } else if ( wpinv_is_recurring_item( $item_id ) ) {
+            } else if (wpinv_is_recurring_item($item_id)) {
                 $valid = false;
             }
             
-            if ( !$valid ) {
+            if (!$valid) {
                 $response               = array();
                 $response['success']    = false;
-                $response['msg']        = __( 'You can not add item to invoice because recurring item must be paid individually!', 'invoicing' );
-                wp_send_json( $response );
+                $response['msg']        = __('You can not add item to invoice because recurring item must be paid individually!', 'invoicing');
+                wp_send_json($response);
             }
         }
         
@@ -202,9 +202,9 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
         
         $quantity = wpinv_item_quantities_enabled() && !empty($_POST['qty']) && (int)$_POST['qty'] > 0 ? (int)$_POST['qty'] : 1;
 
@@ -219,21 +219,21 @@ 
             'fees'          => array()
         );
 
-        $invoice->add_item( $item_id, $args );
+        $invoice->add_item($item_id, $args);
         $invoice->save();
         
-        if ( empty( $_POST['country'] ) ) {
+        if (empty($_POST['country'])) {
             $_POST['country'] = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
         }
-        if ( empty( $_POST['state'] ) ) {
+        if (empty($_POST['state'])) {
             $_POST['state'] = $invoice->state;
         }
          
-        $invoice->country   = sanitize_text_field( $_POST['country'] );
-        $invoice->state     = sanitize_text_field( $_POST['state'] );
+        $invoice->country   = sanitize_text_field($_POST['country']);
+        $invoice->state     = sanitize_text_field($_POST['state']);
         
-        $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-        $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->set('country', sanitize_text_field($_POST['country']));
+        $invoice->set('state', sanitize_text_field($_POST['state']));
         
         $wpinv_ip_address_country = $invoice->country;
 
@@ -241,7 +241,7 @@ 
         
         $response                       = array();
         $response['success']            = true;
-        $response['data']['items']      = wpinv_admin_get_line_items( $invoice );
+        $response['data']['items']      = wpinv_admin_get_line_items($invoice);
         $response['data']['subtotal']   = $invoice->get_subtotal();
         $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['tax']        = $invoice->get_tax();
@@ -253,40 +253,40 @@ 
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function remove_invoice_item() {
         global $wpi_userID, $wpinv_ip_address_country;
         
-        check_ajax_referer( 'invoice-item', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $item_id    = sanitize_text_field( $_POST['item_id'] );
-        $invoice_id = absint( $_POST['invoice_id'] );
-        $cart_index = isset( $_POST['index'] ) && $_POST['index'] >= 0 ? $_POST['index'] : false;
+        $item_id    = sanitize_text_field($_POST['item_id']);
+        $invoice_id = absint($_POST['invoice_id']);
+        $cart_index = isset($_POST['index']) && $_POST['index'] >= 0 ? $_POST['index'] : false;
         
-        if ( !is_numeric( $invoice_id ) || !is_numeric( $item_id ) ) {
+        if (!is_numeric($invoice_id) || !is_numeric($item_id)) {
             die();
         }
 
-        $invoice    = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice)) {
             die();
         }
         
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             die(); // Don't allow modify items for paid invoice.
         }
         
-        if ( !empty( $_POST['user_id'] ) ) {
-            $wpi_userID = absint( $_POST['user_id'] ); 
+        if (!empty($_POST['user_id'])) {
+            $wpi_userID = absint($_POST['user_id']); 
         }
 
-        $item       = new WPInv_Item( $item_id );
-        if ( !( !empty( $item ) && $item->post_type == 'wpi_item' ) ) {
+        $item = new WPInv_Item($item_id);
+        if (!(!empty($item) && $item->post_type == 'wpi_item')) {
             die();
         }
         
@@ -294,9 +294,9 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
 
         $args = array(
             'id'         => $item_id,
@@ -304,21 +304,21 @@ 
             'cart_index' => $cart_index
         );
 
-        $invoice->remove_item( $item_id, $args );
+        $invoice->remove_item($item_id, $args);
         $invoice->save();
         
-        if ( empty( $_POST['country'] ) ) {
+        if (empty($_POST['country'])) {
             $_POST['country'] = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
         }
-        if ( empty( $_POST['state'] ) ) {
+        if (empty($_POST['state'])) {
             $_POST['state'] = $invoice->state;
         }
          
-        $invoice->country   = sanitize_text_field( $_POST['country'] );
-        $invoice->state     = sanitize_text_field( $_POST['state'] );
+        $invoice->country   = sanitize_text_field($_POST['country']);
+        $invoice->state     = sanitize_text_field($_POST['state']);
         
-        $invoice->set( 'country', sanitize_text_field( $_POST['country'] ) );
-        $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->set('country', sanitize_text_field($_POST['country']));
+        $invoice->set('state', sanitize_text_field($_POST['state']));
         
         $wpinv_ip_address_country = $invoice->country;
         
@@ -326,7 +326,7 @@ 
         
         $response                       = array();
         $response['success']            = true;
-        $response['data']['items']      = wpinv_admin_get_line_items( $invoice );
+        $response['data']['items']      = wpinv_admin_get_line_items($invoice);
         $response['data']['subtotal']   = $invoice->get_subtotal();
         $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['tax']        = $invoice->get_tax();
@@ -338,40 +338,40 @@ 
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function create_invoice_item() {
-        check_ajax_referer( 'invoice-item', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $invoice_id = absint( $_POST['invoice_id'] );
+        $invoice_id = absint($_POST['invoice_id']);
 
         // Find the item
-        if ( !is_numeric( $invoice_id ) ) {
+        if (!is_numeric($invoice_id)) {
             die();
         }        
         
-        $invoice     = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice)) {
             die();
         }
         
         // Validate item before adding to invoice because recurring item must be paid individually.
-        if ( !empty( $invoice->cart_details ) && $invoice->get_recurring() ) {
+        if (!empty($invoice->cart_details) && $invoice->get_recurring()) {
             $response               = array();
             $response['success']    = false;
-            $response['msg']        = __( 'You can not add item to invoice because recurring item must be paid individually!', 'invoicing' );
-            wp_send_json( $response );
+            $response['msg']        = __('You can not add item to invoice because recurring item must be paid individually!', 'invoicing');
+            wp_send_json($response);
         }        
         
         $save_item = $_POST['_wpinv_quick'];
         
         $meta               = array();
         $meta['type']       = !empty($save_item['type']) ? sanitize_text_field($save_item['type']) : 'custom';
-        $meta['price']      = !empty($save_item['price']) ? wpinv_sanitize_amount( $save_item['price'] ) : 0;
+        $meta['price']      = !empty($save_item['price']) ? wpinv_sanitize_amount($save_item['price']) : 0;
         $meta['vat_rule']   = !empty($save_item['vat_rule']) ? sanitize_text_field($save_item['vat_rule']) : 'digital';
         $meta['vat_class']  = !empty($save_item['vat_class']) ? sanitize_text_field($save_item['vat_class']) : '_standard';
         
@@ -381,9 +381,9 @@ 
         $data['meta']           = $meta;
         
         $item = new WPInv_Item();
-        $item->create( $data );
+        $item->create($data);
         
-        if ( !empty( $item ) ) {
+        if (!empty($item)) {
             $_POST['item_id']   = $item->ID;
             $_POST['qty']       = !empty($save_item['qty']) && $save_item['qty'] > 0 ? (int)$save_item['qty'] : 1;
             
@@ -393,15 +393,15 @@ 
     }
     
     public static function get_billing_details() {
-        check_ajax_referer( 'get-billing-details', '_nonce' );
+        check_ajax_referer('get-billing-details', '_nonce');
         
-        if ( !current_user_can( 'manage_options' ) ) {
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
 
         $user_id            = (int)$_POST['user_id'];
         $billing_details    = wpinv_get_user_address($user_id);
-        $billing_details    = apply_filters( 'wpinv_fill_billing_details', $billing_details, $user_id );
+        $billing_details    = apply_filters('wpinv_fill_billing_details', $billing_details, $user_id);
         
         if (isset($billing_details['user_id'])) {
             unset($billing_details['user_id']);
@@ -415,20 +415,20 @@ 
         $response['success']                    = true;
         $response['data']['billing_details']    = $billing_details;
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function admin_recalculate_totals() {
         global $wpi_userID, $wpinv_ip_address_country;
         
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $invoice_id = absint( $_POST['invoice_id'] );        
-        $invoice    = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) ) {
+        $invoice_id = absint($_POST['invoice_id']);        
+        $invoice    = wpinv_get_invoice($invoice_id);
+        if (empty($invoice)) {
             die();
         }
         
@@ -436,23 +436,23 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
         
-        if ( !empty( $_POST['user_id'] ) ) {
-            $wpi_userID = absint( $_POST['user_id'] ); 
+        if (!empty($_POST['user_id'])) {
+            $wpi_userID = absint($_POST['user_id']); 
         }
         
-        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'] ) );
-        if ( isset( $_POST['state'] ) ) {
-            $invoice->state = sanitize_text_field( $_POST['state'] );
-            $invoice->set( 'state', sanitize_text_field( $_POST['state'] ) );
+        $invoice->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']));
         }
         
         $wpinv_ip_address_country = $invoice->country;
@@ -461,7 +461,7 @@ 
         
         $response                       = array();
         $response['success']            = true;
-        $response['data']['items']      = wpinv_admin_get_line_items( $invoice );
+        $response['data']['items']      = wpinv_admin_get_line_items($invoice);
         $response['data']['subtotal']   = $invoice->get_subtotal();
         $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['tax']        = $invoice->get_tax();
@@ -473,25 +473,25 @@ 
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function admin_apply_discount() {
         global $wpi_userID;
         
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $invoice_id = absint( $_POST['invoice_id'] );
-        $discount_code = sanitize_text_field( $_POST['code'] );
-        if ( empty( $invoice_id ) || empty( $discount_code ) ) {
+        $invoice_id = absint($_POST['invoice_id']);
+        $discount_code = sanitize_text_field($_POST['code']);
+        if (empty($invoice_id) || empty($discount_code)) {
             die();
         }
         
-        $invoice = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) || ( !empty( $invoice ) && $invoice->is_paid() ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice) || (!empty($invoice) && $invoice->is_paid())) {
             die();
         }
         
@@ -499,49 +499,49 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
         
         $response               = array();
         $response['success']    = false;
-        $response['msg']        = __( 'This discount is invalid.', 'invoicing' );
+        $response['msg']        = __('This discount is invalid.', 'invoicing');
         $response['data']['code'] = $discount_code;
         
-        if ( wpinv_is_discount_valid( $discount_code, $invoice->get_user_id() ) ) {
-            $discounts = wpinv_set_cart_discount( $discount_code );
+        if (wpinv_is_discount_valid($discount_code, $invoice->get_user_id())) {
+            $discounts = wpinv_set_cart_discount($discount_code);
             
             $response['success'] = true;
-            $response['msg'] = __( 'Discount has been applied successfully.', 'invoicing' );
-        }  else {
+            $response['msg'] = __('Discount has been applied successfully.', 'invoicing');
+        } else {
             $errors = wpinv_get_errors();
-            if ( !empty( $errors['wpinv-discount-error'] ) ) {
+            if (!empty($errors['wpinv-discount-error'])) {
                 $response['msg'] = $errors['wpinv-discount-error'];
             }
-            wpinv_unset_error( 'wpinv-discount-error' );
+            wpinv_unset_error('wpinv-discount-error');
         }
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function admin_remove_discount() {
         global $wpi_userID;
         
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $invoice_id = absint( $_POST['invoice_id'] );
-        $discount_code = sanitize_text_field( $_POST['code'] );
-        if ( empty( $invoice_id ) || empty( $discount_code ) ) {
+        $invoice_id = absint($_POST['invoice_id']);
+        $discount_code = sanitize_text_field($_POST['code']);
+        if (empty($invoice_id) || empty($discount_code)) {
             die();
         }
         
-        $invoice = wpinv_get_invoice( $invoice_id );
-        if ( empty( $invoice ) || ( !empty( $invoice ) && $invoice->is_paid() ) ) {
+        $invoice = wpinv_get_invoice($invoice_id);
+        if (empty($invoice) || (!empty($invoice) && $invoice->is_paid())) {
             die();
         }
         
@@ -549,38 +549,38 @@ 
         
         $data                   = array();
         $data['invoice_id']     = $invoice_id;
-        $data['cart_discounts'] = $invoice->get_discounts( true );
+        $data['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
         
         $response               = array();
         $response['success']    = false;
         $response['msg']        = NULL;
         
-        $discounts  = wpinv_unset_cart_discount( $discount_code );
+        $discounts = wpinv_unset_cart_discount($discount_code);
         $response['success'] = true;
-        $response['msg'] = __( 'Discount has been removed successfully.', 'invoicing' );
+        $response['msg'] = __('Discount has been removed successfully.', 'invoicing');
         
         wpinv_set_checkout_session($checkout_session);
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function check_email() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $email = sanitize_text_field( $_POST['email'] );
+        $email = sanitize_text_field($_POST['email']);
         
         $response = array();
-        if ( is_email( $email ) && email_exists( $email ) && $user_data = get_user_by( 'email', $email ) ) {
+        if (is_email($email) && email_exists($email) && $user_data = get_user_by('email', $email)) {
             $user_id            = $user_data->ID;
             $user_login         = $user_data->user_login;
             $display_name       = $user_data->display_name ? $user_data->display_name : $user_login;
             $billing_details    = wpinv_get_user_address($user_id);
-            $billing_details    = apply_filters( 'wpinv_fill_billing_details', $billing_details, $user_id );
+            $billing_details    = apply_filters('wpinv_fill_billing_details', $billing_details, $user_id);
             
             if (isset($billing_details['user_id'])) {
                 unset($billing_details['user_id']);
@@ -596,31 +596,31 @@ 
             $response['data']['billing_details']    = $billing_details;
         }
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function run_tool() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !current_user_can( 'manage_options' ) ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!current_user_can('manage_options')) {
             die(-1);
         }
         
-        $tool = sanitize_text_field( $_POST['tool'] );
+        $tool = sanitize_text_field($_POST['tool']);
         
-        do_action( 'wpinv_run_tool' );
+        do_action('wpinv_run_tool');
         
-        if ( !empty( $tool ) ) {
-            do_action( 'wpinv_tool_' . $tool );
+        if (!empty($tool)) {
+            do_action('wpinv_tool_' . $tool);
         }
     }
     
     public static function apply_discount() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
+        check_ajax_referer('wpinv-nonce', '_nonce');
         
         $response = array();
         
-        if ( isset( $_POST['code'] ) ) {
-            $discount_code = sanitize_text_field( $_POST['code'] );
+        if (isset($_POST['code'])) {
+            $discount_code = sanitize_text_field($_POST['code']);
 
             $response['success']        = false;
             $response['msg']            = '';
@@ -628,14 +628,14 @@ 
             
             $user = is_user_logged_in() ? get_current_user_id() : '';
 
-            if ( wpinv_is_discount_valid( $discount_code, $user ) ) {
-                $discount       = wpinv_get_discount_by_code( $discount_code );
-                $discounts      = wpinv_set_cart_discount( $discount_code );
-                $amount         = wpinv_format_discount_rate( wpinv_get_discount_type( $discount->ID ), wpinv_get_discount_amount( $discount->ID ) );
-                $total          = wpinv_get_cart_total( null, $discounts );
-                $cart_totals    = wpinv_recalculate_tax( true );
+            if (wpinv_is_discount_valid($discount_code, $user)) {
+                $discount       = wpinv_get_discount_by_code($discount_code);
+                $discounts      = wpinv_set_cart_discount($discount_code);
+                $amount         = wpinv_format_discount_rate(wpinv_get_discount_type($discount->ID), wpinv_get_discount_amount($discount->ID));
+                $total          = wpinv_get_cart_total(null, $discounts);
+                $cart_totals    = wpinv_recalculate_tax(true);
             
-                if ( !empty( $cart_totals ) ) {
+                if (!empty($cart_totals)) {
                     $response['success']        = true;
                     $response['data']           = $cart_totals;
                     $response['data']['code']   = $discount_code;
@@ -644,29 +644,29 @@ 
                 }
             } else {
                 $errors = wpinv_get_errors();
-                $response['msg']  = $errors['wpinv-discount-error'];
-                wpinv_unset_error( 'wpinv-discount-error' );
+                $response['msg'] = $errors['wpinv-discount-error'];
+                wpinv_unset_error('wpinv-discount-error');
             }
 
             // Allow for custom discount code handling
-            $response = apply_filters( 'wpinv_ajax_discount_response', $response );
+            $response = apply_filters('wpinv_ajax_discount_response', $response);
         }
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     public static function remove_discount() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
+        check_ajax_referer('wpinv-nonce', '_nonce');
         
         $response = array();
         
-        if ( isset( $_POST['code'] ) ) {
-            $discount_code  = sanitize_text_field( $_POST['code'] );
-            $discounts      = wpinv_unset_cart_discount( $discount_code );
-            $total          = wpinv_get_cart_total( null, $discounts );
-            $cart_totals    = wpinv_recalculate_tax( true );
+        if (isset($_POST['code'])) {
+            $discount_code  = sanitize_text_field($_POST['code']);
+            $discounts      = wpinv_unset_cart_discount($discount_code);
+            $total          = wpinv_get_cart_total(null, $discounts);
+            $cart_totals    = wpinv_recalculate_tax(true);
             
-            if ( !empty( $cart_totals ) ) {
+            if (!empty($cart_totals)) {
                 $response['success']        = true;
                 $response['data']           = $cart_totals;
                 $response['data']['code']   = $discount_code;
@@ -675,10 +675,10 @@ 
             }
             
             // Allow for custom discount code handling
-            $response = apply_filters( 'wpinv_ajax_discount_response', $response );
+            $response = apply_filters('wpinv_ajax_discount_response', $response);
         }
         
-        wp_send_json( $response );
+        wp_send_json($response);
     }
 }
 

templates/wpinv-invoice-history.php

Spacing +41 added lines, -41 removed lines

@@ -1,80 +1,80 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( !( $user_id = get_current_user_id() ) ) {
+if (!($user_id = get_current_user_id())) {
     ?>
-    <div class="wpinv-empty alert alert-error"><?php _e( 'You are not allowed to access this section', 'invoicing' ) ;?></div>
+    <div class="wpinv-empty alert alert-error"><?php _e('You are not allowed to access this section', 'invoicing'); ?></div>
     <?php
     return;
 }
 
 global $current_page;
-$current_page   = empty( $current_page ) ? 1 : absint( $current_page );
-$query          = apply_filters( 'wpinv_user_invoices_query', array( 'user' => $user_id, 'page' => $current_page, 'paginate' => true ) );
-$user_invoices  = wpinv_get_invoices( $query );
+$current_page   = empty($current_page) ? 1 : absint($current_page);
+$query          = apply_filters('wpinv_user_invoices_query', array('user' => $user_id, 'page' => $current_page, 'paginate' => true));
+$user_invoices  = wpinv_get_invoices($query);
 $has_invoices   = 0 < $user_invoices->total;
     
-do_action( 'wpinv_before_user_invoices', $has_invoices ); ?>
+do_action('wpinv_before_user_invoices', $has_invoices); ?>
 
-<?php if ( $has_invoices ) { ?>
+<?php if ($has_invoices) { ?>
 	<table class="table table-bordered table-hover wpi-user-invoices">
 		<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 ( $user_invoices->invoices as $invoice ) {
+			<?php foreach ($user_invoices->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 ( 'invoice-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s' ); ?>
-								<time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+							<?php elseif ('invoice-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s'); ?>
+								<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>';
 										}
 									}
 								?>
@@ -86,9 +86,9 @@ 
 		</tbody>
 	</table>
 
-	<?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
+	<?php do_action('wpinv_before_user_invoices_pagination'); ?>
 
-	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
+	<?php if (1 < $user_invoices->max_num_pages) : ?>
 		<div class="invoicing-Pagination">
 			<?php
 			$big = 999999;
@@ -101,23 +101,23 @@ 
 			else
 				$current_page = 1;
 
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+			echo paginate_links(array(
+				'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
+				'current' => max(1, $current_page),
 				'total'   => $user_invoices->max_num_pages,
 				'add_args' => array(
 					'wpinv-cpt' => 'wpi_invoice',
 				)
-			) );
+			));
 			?>
 		</div>
 	<?php endif; ?>
 
 <?php } else { ?>
 	<div class="wpinv-empty alert-info">
-		<?php _e( 'No invoice has been made yet.', 'invoicing' ); ?>
+		<?php _e('No invoice has been made yet.', 'invoicing'); ?>
 	</div>
 <?php } ?>
 
-<?php do_action( 'wpinv_after_user_invoices', $has_invoices ); ?>
+<?php do_action('wpinv_after_user_invoices', $has_invoices); ?>

includes/wpinv-gd-functions.php

Spacing +266 added lines, -266 removed lines

@@ -1,23 +1,23 @@ 
 <?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_gd_active() {
-    return (bool)defined( 'GEODIRECTORY_VERSION' );
+    return (bool)defined('GEODIRECTORY_VERSION');
 }
 
 function wpinv_pm_active() {
-    return (bool)wpinv_gd_active() && (bool)defined( 'GEODIRPAYMENT_VERSION' );
+    return (bool)wpinv_gd_active() && (bool)defined('GEODIRPAYMENT_VERSION');
 }
 
-function wpinv_is_gd_post_type( $post_type ) {
+function wpinv_is_gd_post_type($post_type) {
     global $gd_posttypes;
     
-    $gd_posttypes = !empty( $gd_posttypes ) && is_array( $gd_posttypes ) ? $gd_posttypes : geodir_get_posttypes();
+    $gd_posttypes = !empty($gd_posttypes) && is_array($gd_posttypes) ? $gd_posttypes : geodir_get_posttypes();
     
-    if ( !empty( $post_type ) && !empty( $gd_posttypes ) && in_array( $post_type, $gd_posttypes ) ) {
+    if (!empty($post_type) && !empty($gd_posttypes) && in_array($post_type, $gd_posttypes)) {
         return true;
     }
     
@@ -29,10 +29,10 @@ 
         return;
     }
     
-    if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
+    if (!(defined('DOING_AJAX') && DOING_AJAX)) {
         // Add  fields for force upgrade
-        if ( defined('INVOICE_TABLE') && !get_option('wpinv_gdp_column') ) {
-            geodir_add_column_if_not_exist( INVOICE_TABLE, 'invoice_id', 'INT( 11 ) NOT NULL DEFAULT 0' );
+        if (defined('INVOICE_TABLE') && !get_option('wpinv_gdp_column')) {
+            geodir_add_column_if_not_exist(INVOICE_TABLE, 'invoice_id', 'INT( 11 ) NOT NULL DEFAULT 0');
             
             update_option('wpinv_gdp_column', '1');
         }
@@ -40,39 +40,39 @@ 
         wpinv_merge_gd_packages_to_items();
     }
 }
-add_action( 'admin_init', 'wpinv_geodir_integration' );
+add_action('admin_init', 'wpinv_geodir_integration');
 
-function wpinv_get_gdp_package_type( $item_types ) {
-    if ( wpinv_pm_active() ) {
-        $item_types['package'] = __( 'Package', 'invoicing' );
+function wpinv_get_gdp_package_type($item_types) {
+    if (wpinv_pm_active()) {
+        $item_types['package'] = __('Package', 'invoicing');
     }
         
     return $item_types;
 }
-add_filter( 'wpinv_get_item_types', 'wpinv_get_gdp_package_type', 10, 1 );
+add_filter('wpinv_get_item_types', 'wpinv_get_gdp_package_type', 10, 1);
 
 function wpinv_update_package_item($package_id) {
     return wpinv_merge_gd_package_to_item($package_id, true);
 }
 add_action('geodir_after_save_package', 'wpinv_update_package_item', 10, 1);
 
-function wpinv_merge_gd_packages_to_items( $force = false ) {    
-    if ( $merged = get_option( 'wpinv_merge_gd_packages' ) && !$force ) {
+function wpinv_merge_gd_packages_to_items($force = false) {    
+    if ($merged = get_option('wpinv_merge_gd_packages') && !$force) {
         return true;
     }
 
-    if(!function_exists('geodir_package_list_info')){
+    if (!function_exists('geodir_package_list_info')) {
         return false;
     }
     
     $packages = geodir_package_list_info();
     
-    foreach ( $packages as $key => $package ) {
-        wpinv_merge_gd_package_to_item( $package->pid, $force, $package );
+    foreach ($packages as $key => $package) {
+        wpinv_merge_gd_package_to_item($package->pid, $force, $package);
     }
     
-    if ( !$merged ) {
-        update_option( 'wpinv_merge_gd_packages', 1 );
+    if (!$merged) {
+        update_option('wpinv_merge_gd_packages', 1);
     }
     
     return true;
@@ -101,7 +101,7 @@ 
 
     $package = empty($package) ? geodir_get_package_info_by_id($package_id, '') : $package;
 
-    if ( empty($package) || !wpinv_is_gd_post_type( $package->post_type ) ) {
+    if (empty($package) || !wpinv_is_gd_post_type($package->post_type)) {
         return false;
     }
         
@@ -110,17 +110,17 @@ 
     $meta['custom_id']              = $package_id;
     $meta['custom_singular_name']   = get_post_type_singular_label($package->post_type);
     $meta['custom_name']            = get_post_type_plural_label($package->post_type);
-    $meta['price']                  = wpinv_round_amount( $package->amount );
+    $meta['price']                  = wpinv_round_amount($package->amount);
     $meta['vat_rule']               = 'digital';
     $meta['vat_class']              = '_standard';
     
-    if ( !empty( $package->sub_active ) ) {
-        $sub_num_trial_days = absint( $package->sub_num_trial_days );
+    if (!empty($package->sub_active)) {
+        $sub_num_trial_days = absint($package->sub_num_trial_days);
         
         $meta['is_recurring']       = 1;
         $meta['recurring_period']   = $package->sub_units;
-        $meta['recurring_interval'] = absint( $package->sub_units_num );
-        $meta['recurring_limit']    = absint( $package->sub_units_num_times );
+        $meta['recurring_interval'] = absint($package->sub_units_num);
+        $meta['recurring_limit']    = absint($package->sub_units_num_times);
         $meta['free_trial']         = $sub_num_trial_days > 0 ? 1 : 0;
         $meta['trial_period']       = $package->sub_num_trial_units;
         $meta['trial_interval']     = $sub_num_trial_days;
@@ -134,7 +134,7 @@ 
         $meta['trial_interval']     = '';
     }
     
-    $data  = array( 
+    $data = array( 
         'post_title'    => $package->title,
         'post_excerpt'  => $package->title_desc,
         'post_status'   => $package->status == 1 ? 'publish' : 'pending',
@@ -151,48 +151,48 @@ 
     return $item;
 }
 
-function wpinv_gdp_to_wpi_gateway( $payment_method ) {
-    switch( $payment_method ) {
+function wpinv_gdp_to_wpi_gateway($payment_method) {
+    switch ($payment_method) {
         case 'prebanktransfer':
             $gateway = 'bank_transfer';
         break;
         default:
-            $gateway = empty( $payment_method ) ? 'manual' : $payment_method;
+            $gateway = empty($payment_method) ? 'manual' : $payment_method;
         break;
     }
     
-    return apply_filters( 'wpinv_gdp_to_wpi_gateway', $gateway, $payment_method );
+    return apply_filters('wpinv_gdp_to_wpi_gateway', $gateway, $payment_method);
 }
 
-function wpinv_gdp_to_wpi_gateway_title( $payment_method ) {
-    $gateway = wpinv_gdp_to_wpi_gateway( $payment_method );
+function wpinv_gdp_to_wpi_gateway_title($payment_method) {
+    $gateway = wpinv_gdp_to_wpi_gateway($payment_method);
     
-    $gateway_title = wpinv_get_gateway_checkout_label( $gateway );
+    $gateway_title = wpinv_get_gateway_checkout_label($gateway);
     
-    if ( $gateway == $gateway_title ) {
-        $gateway_title = geodir_payment_method_title( $gateway );
+    if ($gateway == $gateway_title) {
+        $gateway_title = geodir_payment_method_title($gateway);
     }
     
-    return apply_filters( 'wpinv_gdp_to_wpi_gateway_title', $gateway_title, $payment_method );
+    return apply_filters('wpinv_gdp_to_wpi_gateway_title', $gateway_title, $payment_method);
 }
 
 function wpinv_print_checkout_errors() {
     global $wpi_session;
     wpinv_print_errors();
 }
-add_action( 'geodir_checkout_page_content', 'wpinv_print_checkout_errors', -10 );
+add_action('geodir_checkout_page_content', 'wpinv_print_checkout_errors', -10);
 
-function wpinv_cpt_save( $invoice_id, $update = false, $pre_status = NULL ) {
+function wpinv_cpt_save($invoice_id, $update = false, $pre_status = NULL) {
     global $wpi_nosave, $wpi_zero_tax, $wpi_gdp_inv_merge;
     
-    $invoice_info = geodir_get_invoice( $invoice_id );
+    $invoice_info = geodir_get_invoice($invoice_id);
     
-    $wpi_invoice_id  = !empty( $invoice_info->invoice_id ) ? $invoice_info->invoice_id : 0;
+    $wpi_invoice_id  = !empty($invoice_info->invoice_id) ? $invoice_info->invoice_id : 0;
     
     if (!empty($invoice_info)) {
-        $wpi_invoice = $wpi_invoice_id > 0 ? wpinv_get_invoice( $wpi_invoice_id ) : NULL;
+        $wpi_invoice = $wpi_invoice_id > 0 ? wpinv_get_invoice($wpi_invoice_id) : NULL;
         
-        if ( !empty( $wpi_invoice ) ) { // update invoice
+        if (!empty($wpi_invoice)) { // update invoice
             $save = false;
             if ($invoice_info->coupon_code !== $wpi_invoice->discount_code || (float)$invoice_info->discount < (float)$wpi_invoice->discount || (float)$invoice_info->discount > (float)$wpi_invoice->discount) {
                 $save = true;
@@ -202,16 +202,16 @@ 
             
             if ($invoice_info->paymentmethod !== $wpi_invoice->gateway) {
                 $save = true;
-                $gateway = !empty( $invoice_info->paymentmethod ) ? $invoice_info->paymentmethod : '';
-                $gateway = wpinv_gdp_to_wpi_gateway( $gateway );
-                $gateway_title = wpinv_gdp_to_wpi_gateway_title( $gateway );
-                $wpi_invoice->set('gateway', $gateway );
-                $wpi_invoice->set('gateway_title', $gateway_title );
+                $gateway = !empty($invoice_info->paymentmethod) ? $invoice_info->paymentmethod : '';
+                $gateway = wpinv_gdp_to_wpi_gateway($gateway);
+                $gateway_title = wpinv_gdp_to_wpi_gateway_title($gateway);
+                $wpi_invoice->set('gateway', $gateway);
+                $wpi_invoice->set('gateway_title', $gateway_title);
             }
             
-            if ( ( $status = wpinv_gdp_to_wpi_status( $invoice_info->status ) ) !== $wpi_invoice->status ) {
+            if (($status = wpinv_gdp_to_wpi_status($invoice_info->status)) !== $wpi_invoice->status) {
                 $save = true;
-                $wpi_invoice->set( 'status', $status );
+                $wpi_invoice->set('status', $status);
             }
             
             if ($save) {
@@ -222,16 +222,16 @@ 
             
             return $wpi_invoice;
         } else { // create invoice
-            $user_info = get_userdata( $invoice_info->user_id );
+            $user_info = get_userdata($invoice_info->user_id);
             
-            if ( !empty( $pre_status ) ) {
+            if (!empty($pre_status)) {
                 $invoice_info->status = $pre_status;
             }
-            $status = wpinv_gdp_to_wpi_status( $invoice_info->status );
+            $status = wpinv_gdp_to_wpi_status($invoice_info->status);
             
             $wpi_zero_tax = false;
             
-            if ( $wpi_gdp_inv_merge && in_array( $status, array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+            if ($wpi_gdp_inv_merge && in_array($status, array('publish', 'wpi-processing', 'wpi-renewal'))) {
                 $wpi_zero_tax = true;
             }
             
@@ -241,13 +241,13 @@ 
             $invoice_data['user_id']        = $invoice_info->user_id;
             $invoice_data['created_via']    = 'API';
             
-            if ( !empty( $invoice_info->date ) ) {
-                $invoice_data['created_date']   = $invoice_info->date;
+            if (!empty($invoice_info->date)) {
+                $invoice_data['created_date'] = $invoice_info->date;
             }
             
-            $paymentmethod = !empty( $invoice_info->paymentmethod ) ? $invoice_info->paymentmethod : '';
-            $paymentmethod = wpinv_gdp_to_wpi_gateway( $paymentmethod );
-            $payment_method_title = wpinv_gdp_to_wpi_gateway_title( $paymentmethod );
+            $paymentmethod = !empty($invoice_info->paymentmethod) ? $invoice_info->paymentmethod : '';
+            $paymentmethod = wpinv_gdp_to_wpi_gateway($paymentmethod);
+            $payment_method_title = wpinv_gdp_to_wpi_gateway_title($paymentmethod);
             
             $invoice_data['payment_details'] = array( 
                 'gateway'           => $paymentmethod, 
@@ -255,7 +255,7 @@ 
                 'currency'          => geodir_get_currency_type(),
             );
             
-            $user_address = wpinv_get_user_address( $invoice_info->user_id, false );
+            $user_address = wpinv_get_user_address($invoice_info->user_id, false);
             
             $invoice_data['user_info'] = array( 
                 'user_id'       => $invoice_info->user_id, 
@@ -278,14 +278,14 @@ 
             
             $post_item = wpinv_get_gd_package_item($invoice_info->package_id);
 
-            if ( $invoice_info->invoice_type == 'add_franchise' ) {
+            if ($invoice_info->invoice_type == 'add_franchise') {
                 $custom_price = $invoice_info->amount;
             } else {
                 $custom_price = '';
             }
 
-            if ( !empty( $post_item ) ) {
-                $cart_details  = array();
+            if (!empty($post_item)) {
+                $cart_details = array();
                 $cart_details[] = array(
                     'id'            => $post_item->ID,
                     'name'          => $post_item->get_name(),
@@ -299,19 +299,19 @@ 
                     ),
                 );
                 
-                $invoice_data['cart_details']  = $cart_details;
+                $invoice_data['cart_details'] = $cart_details;
             }
 
-            $data = array( 'invoice' => $invoice_data );
+            $data = array('invoice' => $invoice_data);
 
             $wpinv_api = new WPInv_API();
-            $data = $wpinv_api->insert_invoice( $data );
+            $data = $wpinv_api->insert_invoice($data);
             
-            if ( is_wp_error( $data ) ) {
-                wpinv_error_log( 'WPInv_Invoice: ' . $data->get_error_message() );
+            if (is_wp_error($data)) {
+                wpinv_error_log('WPInv_Invoice: ' . $data->get_error_message());
             } else {
-                if ( !empty( $data ) ) {
-                    update_post_meta( $data->ID, '_wpinv_gdp_id', $invoice_id );
+                if (!empty($data)) {
+                    update_post_meta($data->ID, '_wpinv_gdp_id', $invoice_id);
                     
                     $update_data = array();
                     $update_data['tax_amount'] = $data->get_tax();
@@ -319,14 +319,14 @@ 
                     $update_data['invoice_id'] = $data->ID;
                     
                     global $wpdb;
-                    $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $invoice_id ) );
+                    $wpdb->update(INVOICE_TABLE, $update_data, array('id' => $invoice_id));
                     
                     return $data;
                 } else {
-                    if ( $update ) {
-                        wpinv_error_log( 'WPInv_Invoice: ' . __( 'Fail to update invoice.', 'invoicing' ) );
+                    if ($update) {
+                        wpinv_error_log('WPInv_Invoice: ' . __('Fail to update invoice.', 'invoicing'));
                     } else {
-                        wpinv_error_log( 'WPInv_Invoice: ' . __( 'Fail to create invoice.', 'invoicing' ) );
+                        wpinv_error_log('WPInv_Invoice: ' . __('Fail to create invoice.', 'invoicing'));
                     }
                 }
             }
@@ -337,59 +337,59 @@ 
 }
 add_action('geodir_payment_invoice_created', 'wpinv_cpt_save', 11, 3);
 
-function wpinv_cpt_update( $invoice_id ) {
-    return wpinv_cpt_save( $invoice_id, true );
+function wpinv_cpt_update($invoice_id) {
+    return wpinv_cpt_save($invoice_id, true);
 }
 add_action('geodir_payment_invoice_updated', 'wpinv_cpt_update', 11, 1);
 
-function wpinv_payment_status_changed( $invoice_id, $new_status, $old_status = 'pending', $subscription = false ) {
-    $invoice_info = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice_info ) ) {
+function wpinv_payment_status_changed($invoice_id, $new_status, $old_status = 'pending', $subscription = false) {
+    $invoice_info = geodir_get_invoice($invoice_id);
+    if (empty($invoice_info)) {
         return false;
     }
 
-    $invoice = !empty( $invoice_info->invoice_id ) ? wpinv_get_invoice( $invoice_info->invoice_id ) : NULL;
-    if ( !empty( $invoice ) ) {
+    $invoice = !empty($invoice_info->invoice_id) ? wpinv_get_invoice($invoice_info->invoice_id) : NULL;
+    if (!empty($invoice)) {
         $new_status = wpinv_gdp_to_wpi_status($new_status);
-        $invoice    = wpinv_update_payment_status( $invoice->ID, $new_status );
+        $invoice    = wpinv_update_payment_status($invoice->ID, $new_status);
     } else {
-        $invoice = wpinv_cpt_save( $invoice_id );
+        $invoice = wpinv_cpt_save($invoice_id);
     }
     
     return $invoice;
 }
-add_action( 'geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4 );
+add_action('geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4);
 
-function wpinv_transaction_details_note( $invoice_id, $html ) {
-    $invoice_info = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice_info ) ) {
+function wpinv_transaction_details_note($invoice_id, $html) {
+    $invoice_info = geodir_get_invoice($invoice_id);
+    if (empty($invoice_info)) {
         return false;
     }
 
-    $wpi_invoice_id = !empty( $invoice_info->invoice_id ) ? $invoice_info->invoice_id : NULL;
+    $wpi_invoice_id = !empty($invoice_info->invoice_id) ? $invoice_info->invoice_id : NULL;
     
-    if ( !$wpi_invoice_id ) {
-        $invoice = wpinv_cpt_save( $invoice_id, false, $old_status );
+    if (!$wpi_invoice_id) {
+        $invoice = wpinv_cpt_save($invoice_id, false, $old_status);
         
-        if ( !empty( $invoice ) ) {
+        if (!empty($invoice)) {
             $wpi_invoice_id = $invoice->ID;
         }
     }
 
-    $invoice = wpinv_get_invoice( $wpi_invoice_id );
+    $invoice = wpinv_get_invoice($wpi_invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
-    return $invoice->add_note( $html, true );
+    return $invoice->add_note($html, true);
 }
-add_action( 'geodir_payment_invoice_transaction_details_changed', 'wpinv_transaction_details_note', 11, 2 );
+add_action('geodir_payment_invoice_transaction_details_changed', 'wpinv_transaction_details_note', 11, 2);
 
-function wpinv_gdp_to_wpi_status( $status ) {
+function wpinv_gdp_to_wpi_status($status) {
     $inv_status = $status ? $status : 'pending';
     
-    switch ( $status ) {
+    switch ($status) {
         case 'confirmed':
             $inv_status = 'publish';
         break;
@@ -409,10 +409,10 @@ 
     return $inv_status;
 }
 
-function wpinv_wpi_to_gdp_status( $status ) {
+function wpinv_wpi_to_gdp_status($status) {
     $inv_status = $status ? $status : 'pending';
     
-    switch ( $status ) {
+    switch ($status) {
         case 'publish':
         case 'wpi-processing':
         case 'wpi-renewal':
@@ -435,72 +435,72 @@ 
     return $inv_status;
 }
 
-function wpinv_wpi_to_gdp_id( $invoice_id ) {
+function wpinv_wpi_to_gdp_id($invoice_id) {
     global $wpdb;
     
-    return $wpdb->get_var( $wpdb->prepare( "SELECT `id` FROM `" . INVOICE_TABLE . "` WHERE `invoice_id` = %d AND `invoice_id` > 0 ORDER BY id DESC LIMIT 1", array( (int)$invoice_id ) ) );
+    return $wpdb->get_var($wpdb->prepare("SELECT `id` FROM `" . INVOICE_TABLE . "` WHERE `invoice_id` = %d AND `invoice_id` > 0 ORDER BY id DESC LIMIT 1", array((int)$invoice_id)));
 }
 
-function wpinv_gdp_to_wpi_id( $invoice_id ) {
-    $invoice = geodir_get_invoice( $invoice_id );    
-    return ( empty( $invoice->invoice_id ) ? $invoice->invoice_id : false);
+function wpinv_gdp_to_wpi_id($invoice_id) {
+    $invoice = geodir_get_invoice($invoice_id);    
+    return (empty($invoice->invoice_id) ? $invoice->invoice_id : false);
 }
 
-function wpinv_to_gdp_recalculate_total( $invoice, $wpi_nosave ) {
+function wpinv_to_gdp_recalculate_total($invoice, $wpi_nosave) {
     global $wpdb;
     
-    if ( !empty( $wpi_nosave ) ) {
+    if (!empty($wpi_nosave)) {
         return;
     }
     
-    $gdp_invoice_id = wpinv_wpi_to_gdp_id( $invoice->ID );
+    $gdp_invoice_id = wpinv_wpi_to_gdp_id($invoice->ID);
     
-    if ( $gdp_invoice_id > 0 ) {
+    if ($gdp_invoice_id > 0) {
         $update_data = array();
         $update_data['tax_amount']      = $invoice->tax;
         $update_data['paied_amount']    = $invoice->total;
         $update_data['discount']        = $invoice->discount;
         $update_data['coupon_code']     = $invoice->discount_code;
         
-        $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $gdp_invoice_id ) );
+        $wpdb->update(INVOICE_TABLE, $update_data, array('id' => $gdp_invoice_id));
     }
     
     return;
 }
 //add_action( 'wpinv_invoice_recalculate_total', 'wpinv_to_gdp_recalculate_total', 10, 2 );
 
-function wpinv_gdp_to_wpi_invoice( $invoice_id ) {
-    $invoice = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice->invoice_id ) ) {
+function wpinv_gdp_to_wpi_invoice($invoice_id) {
+    $invoice = geodir_get_invoice($invoice_id);
+    if (empty($invoice->invoice_id)) {
         return false;
     }
     
-    return wpinv_get_invoice( $invoice->invoice_id );
+    return wpinv_get_invoice($invoice->invoice_id);
 }
 
-function wpinv_payment_set_coupon_code( $status, $invoice_id, $coupon_code ) {
-    $invoice = wpinv_gdp_to_wpi_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+function wpinv_payment_set_coupon_code($status, $invoice_id, $coupon_code) {
+    $invoice = wpinv_gdp_to_wpi_invoice($invoice_id);
+    if (empty($invoice)) {
         return $status;
     }
 
-    if ( $status === 1 || $status === 0 ) {
-        if ( $status === 1 ) {
-            $discount = geodir_get_discount_amount( $coupon_code, $invoice->get_subtotal() );
+    if ($status === 1 || $status === 0) {
+        if ($status === 1) {
+            $discount = geodir_get_discount_amount($coupon_code, $invoice->get_subtotal());
         } else {
             $discount = '';
             $coupon_code = '';
         }
         
-        $invoice->set( 'discount', $discount );
-        $invoice->set( 'discount_code', $coupon_code );
+        $invoice->set('discount', $discount);
+        $invoice->set('discount_code', $coupon_code);
         $invoice->save();
         $invoice->recalculate_total();
     }
     
     return $status;
 }
-add_filter( 'geodir_payment_set_coupon_code', 'wpinv_payment_set_coupon_code', 10, 3 );
+add_filter('geodir_payment_set_coupon_code', 'wpinv_payment_set_coupon_code', 10, 3);
 
 function wpinv_merge_gd_invoices() {
     if (!defined('GEODIRPAYMENT_VERSION')) {
@@ -508,157 +508,157 @@ 
     }
     ?>
     <tr>
-        <td><?php _e( 'Merge Price Packages', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager price packages to the Invoicing items.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_packages" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Price Packages', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager price packages to the Invoicing items.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_packages" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <tr>
-        <td><?php _e( 'Merge Invoices', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager invoices to the Invoicing.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_invoices" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Invoices', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager invoices to the Invoicing.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_invoices" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
 	<tr>
-        <td><?php _e( 'Fix Taxes for Merged Invoices', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Fix taxes for NON-PAID invoices which are merged before, from GeoDirectory Payment Manager invoices to Invoicing. This will recalculate taxes for non-paid merged invoices.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_fix_taxes" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Fix Taxes for Merged Invoices', 'invoicing'); ?></td>
+        <td><p><?php _e('Fix taxes for NON-PAID invoices which are merged before, from GeoDirectory Payment Manager invoices to Invoicing. This will recalculate taxes for non-paid merged invoices.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_fix_taxes" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <tr>
-        <td><?php _e( 'Merge Coupons', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager coupons to the Invoicing.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_coupons" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Coupons', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager coupons to the Invoicing.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_coupons" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <?php
 }
-add_action( 'wpinv_tools_row', 'wpinv_merge_gd_invoices', 10 );
+add_action('wpinv_tools_row', 'wpinv_merge_gd_invoices', 10);
 
 function wpinv_tool_merge_packages() {
     $packages = geodir_package_list_info();
     
     $count = 0;
     
-    if ( !empty( $packages ) ) {
+    if (!empty($packages)) {
         $success = true;
         
-        foreach ( $packages as $key => $package ) {
+        foreach ($packages as $key => $package) {
             $item = wpinv_get_item_by('custom_id', $package->pid, 'package');
-            if ( !empty( $item ) ) {
+            if (!empty($item)) {
                 continue;
             }
             
-            $merged = wpinv_merge_gd_package_to_item( $package->pid, false, $package );
+            $merged = wpinv_merge_gd_package_to_item($package->pid, false, $package);
             
-            if ( !empty( $merged ) ) {
-                wpinv_error_log( 'Package merge S : ' . $package->pid );
+            if (!empty($merged)) {
+                wpinv_error_log('Package merge S : ' . $package->pid);
                 $count++;
             } else {
-                wpinv_error_log( 'Package merge F : ' . $package->pid );
+                wpinv_error_log('Package merge F : ' . $package->pid);
             }
         }
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> price package is merged successfully.', 'Total <b>%d</b> price packages are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> price package is merged successfully.', 'Total <b>%d</b> price packages are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No price packages merged.', 'invoicing' );
+            $message = __('No price packages merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No price packages found to merge!', 'invoicing' );
+        $message = __('No price packages found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_packages', 'wpinv_tool_merge_packages' );
+add_action('wpinv_tool_merge_packages', 'wpinv_tool_merge_packages');
 
 function wpinv_tool_merge_invoices() {
     global $wpdb, $wpi_gdp_inv_merge, $wpi_tax_rates;
     
     $sql = "SELECT `gdi`.`id`, `gdi`.`date`, `gdi`.`date_updated` FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NULL ORDER BY `gdi`.`id` ASC";
 
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
     
     $count = 0;
     
-    if ( !empty( $items ) ) {
+    if (!empty($items)) {
         $success = true;
         $wpi_gdp_inv_merge = true;
         
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
             $wpi_tax_rates = NULL;
             
-            $wpdb->query( "UPDATE `" . INVOICE_TABLE . "` SET `invoice_id` = 0 WHERE id = '" . $item->id . "'" );
+            $wpdb->query("UPDATE `" . INVOICE_TABLE . "` SET `invoice_id` = 0 WHERE id = '" . $item->id . "'");
             
-            $merged = wpinv_cpt_save( $item->id );
+            $merged = wpinv_cpt_save($item->id);
             
-            if ( !empty( $merged ) && !empty( $merged->ID ) ) {
+            if (!empty($merged) && !empty($merged->ID)) {
                 $count++;
                 
-                $post_date = !empty( $item->date ) && $item->date != '0000-00-00 00:00:00' ? $item->date : current_time( 'mysql' );
-                $post_date_gmt = get_gmt_from_date( $post_date );
-                $post_modified = !empty( $item->date_updated ) && $item->date_updated != '0000-00-00 00:00:00' ? $item->date_updated : $post_date;
-                $post_modified_gmt = get_gmt_from_date( $post_modified );
+                $post_date = !empty($item->date) && $item->date != '0000-00-00 00:00:00' ? $item->date : current_time('mysql');
+                $post_date_gmt = get_gmt_from_date($post_date);
+                $post_modified = !empty($item->date_updated) && $item->date_updated != '0000-00-00 00:00:00' ? $item->date_updated : $post_date;
+                $post_modified_gmt = get_gmt_from_date($post_modified);
                 
-                $wpdb->update( $wpdb->posts, array( 'post_date' => $post_date, 'post_date_gmt' => $post_date_gmt, 'post_modified' => $post_modified, 'post_modified_gmt' => $post_modified_gmt ), array( 'ID' => $merged->ID ) );
+                $wpdb->update($wpdb->posts, array('post_date' => $post_date, 'post_date_gmt' => $post_date_gmt, 'post_modified' => $post_modified, 'post_modified_gmt' => $post_modified_gmt), array('ID' => $merged->ID));
                 
-                if ( $merged->is_paid() ) {
-                    update_post_meta( $merged->ID, '_wpinv_completed_date', $post_modified );
+                if ($merged->is_paid()) {
+                    update_post_meta($merged->ID, '_wpinv_completed_date', $post_modified);
                 }
                 
-                clean_post_cache( $merged->ID );
+                clean_post_cache($merged->ID);
                 
-                wpinv_error_log( 'Invoice merge S : ' . $item->id . ' => ' . $merged->ID );
+                wpinv_error_log('Invoice merge S : ' . $item->id . ' => ' . $merged->ID);
             } else {
-                wpinv_error_log( 'Invoice merge F : ' . $item->id );
+                wpinv_error_log('Invoice merge F : ' . $item->id);
             }
         }
         
         $wpi_gdp_inv_merge = false;
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> invoice is merged successfully.', 'Total <b>%d</b> invoices are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> invoice is merged successfully.', 'Total <b>%d</b> invoices are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No invoices merged.', 'invoicing' );
+            $message = __('No invoices merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No invoices found to merge!', 'invoicing' );
+        $message = __('No invoices found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_invoices', 'wpinv_tool_merge_invoices' );
+add_action('wpinv_tool_merge_invoices', 'wpinv_tool_merge_invoices');
 
 function wpinv_tool_merge_coupons() {
     global $wpdb;
     
     $sql = "SELECT * FROM `" . COUPON_TABLE . "` WHERE `coupon_code` IS NOT NULL AND `coupon_code` != '' ORDER BY `cid` ASC";
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
     $count = 0;
     
-    if ( !empty( $items ) ) {
+    if (!empty($items)) {
         $success = true;
         
-        foreach ( $items as $item ) {
-            if ( wpinv_get_discount_by_code( $item->coupon_code ) ) {
+        foreach ($items as $item) {
+            if (wpinv_get_discount_by_code($item->coupon_code)) {
                 continue;
             }
             
             $args = array(
                 'post_type'   => 'wpi_discount',
                 'post_title'  => $item->coupon_code,
-                'post_status' => !empty( $item->status ) ? 'publish' : 'pending'
+                'post_status' => !empty($item->status) ? 'publish' : 'pending'
             );
 
-            $merged = wp_insert_post( $args );
+            $merged = wp_insert_post($args);
             
             $item_id = $item->cid;
             
-            if ( $merged ) {
+            if ($merged) {
                 $meta = array(
                     'code'              => $item->coupon_code,
                     'type'              => $item->discount_type != 'per' ? 'flat' : 'percent',
@@ -666,65 +666,65 @@ 
                     'max_uses'          => (int)$item->usage_limit,
                     'uses'              => (int)$item->usage_count,
                 );
-                wpinv_store_discount( $merged, $meta, get_post( $merged ) );
+                wpinv_store_discount($merged, $meta, get_post($merged));
                 
                 $count++;
                 
-                wpinv_error_log( 'Coupon merge S : ' . $item_id . ' => ' . $merged );
+                wpinv_error_log('Coupon merge S : ' . $item_id . ' => ' . $merged);
             } else {
-                wpinv_error_log( 'Coupon merge F : ' . $item_id );
+                wpinv_error_log('Coupon merge F : ' . $item_id);
             }
         }
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> coupon is merged successfully.', 'Total <b>%d</b> coupons are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> coupon is merged successfully.', 'Total <b>%d</b> coupons are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No coupons merged.', 'invoicing' );
+            $message = __('No coupons merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No coupons found to merge!', 'invoicing' );
+        $message = __('No coupons found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_coupons', 'wpinv_tool_merge_coupons' );
+add_action('wpinv_tool_merge_coupons', 'wpinv_tool_merge_coupons');
 
-function wpinv_gdp_to_wpi_currency( $value, $option = '' ) {
+function wpinv_gdp_to_wpi_currency($value, $option = '') {
     return wpinv_get_currency();
 }
-add_filter( 'pre_option_geodir_currency', 'wpinv_gdp_to_wpi_currency', 10, 2 );
+add_filter('pre_option_geodir_currency', 'wpinv_gdp_to_wpi_currency', 10, 2);
 
-function wpinv_gdp_to_wpi_currency_sign( $value, $option = '' ) {
+function wpinv_gdp_to_wpi_currency_sign($value, $option = '') {
     return wpinv_currency_symbol();
 }
-add_filter( 'pre_option_geodir_currencysym', 'wpinv_gdp_to_wpi_currency_sign', 10, 2 );
+add_filter('pre_option_geodir_currencysym', 'wpinv_gdp_to_wpi_currency_sign', 10, 2);
 
-function wpinv_gdp_to_wpi_display_price( $price, $amount, $display = true , $decimal_sep, $thousand_sep ) {
-    if ( !$display ) {
-        $price = wpinv_round_amount( $amount );
+function wpinv_gdp_to_wpi_display_price($price, $amount, $display = true, $decimal_sep, $thousand_sep) {
+    if (!$display) {
+        $price = wpinv_round_amount($amount);
     } else {
-        $price = wpinv_price( wpinv_format_amount( $amount ) );
+        $price = wpinv_price(wpinv_format_amount($amount));
     }
     
     return $price;
 }
-add_filter( 'geodir_payment_price' , 'wpinv_gdp_to_wpi_display_price', 10000, 5 );
+add_filter('geodir_payment_price', 'wpinv_gdp_to_wpi_display_price', 10000, 5);
 
-function wpinv_gdp_to_inv_checkout_redirect( $redirect_url ) {
+function wpinv_gdp_to_inv_checkout_redirect($redirect_url) {
     $invoice_id         = geodir_payment_cart_id();
-    $invoice_info       = geodir_get_invoice( $invoice_id );
-    $wpi_invoice        = !empty( $invoice_info->invoice_id ) ? wpinv_get_invoice( $invoice_info->invoice_id ) : NULL;
+    $invoice_info       = geodir_get_invoice($invoice_id);
+    $wpi_invoice        = !empty($invoice_info->invoice_id) ? wpinv_get_invoice($invoice_info->invoice_id) : NULL;
     
-    if ( !( !empty( $wpi_invoice ) && !empty( $wpi_invoice->ID ) ) ) {
-        $wpi_invoice_id = wpinv_cpt_save( $invoice_id );
-        $wpi_invoice    = wpinv_get_invoice( $wpi_invoice_id );
+    if (!(!empty($wpi_invoice) && !empty($wpi_invoice->ID))) {
+        $wpi_invoice_id = wpinv_cpt_save($invoice_id);
+        $wpi_invoice    = wpinv_get_invoice($wpi_invoice_id);
     }
     
-    if ( !empty( $wpi_invoice ) && !empty( $wpi_invoice->ID ) ) {
+    if (!empty($wpi_invoice) && !empty($wpi_invoice->ID)) {
         
         // Clear cart
         geodir_payment_clear_cart();
@@ -734,121 +734,121 @@ 
     
     return $redirect_url;
 }
-add_filter( 'geodir_payment_checkout_redirect_url', 'wpinv_gdp_to_inv_checkout_redirect', 100, 1 );
+add_filter('geodir_payment_checkout_redirect_url', 'wpinv_gdp_to_inv_checkout_redirect', 100, 1);
 
-function wpinv_gdp_dashboard_invoice_history_link( $dashboard_links ) {    
-    if ( get_current_user_id() ) {        
-        $dashboard_links .= '<li><i class="fa fa-shopping-cart"></i><a class="gd-invoice-link" href="' . esc_url( wpinv_get_history_page_uri() ) . '">' . __( 'My Invoice History', 'invoicing' ) . '</a></li>';
+function wpinv_gdp_dashboard_invoice_history_link($dashboard_links) {    
+    if (get_current_user_id()) {        
+        $dashboard_links .= '<li><i class="fa fa-shopping-cart"></i><a class="gd-invoice-link" href="' . esc_url(wpinv_get_history_page_uri()) . '">' . __('My Invoice History', 'invoicing') . '</a></li>';
     }
 
     return $dashboard_links;
 }
-add_action( 'geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link' );
-remove_action( 'geodir_dashboard_links', 'geodir_payment_invoices_list_page_link' );
+add_action('geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link');
+remove_action('geodir_dashboard_links', 'geodir_payment_invoices_list_page_link');
 
-function wpinv_wpi_to_gdp_update_status( $invoice_id, $new_status, $old_status ) {
+function wpinv_wpi_to_gdp_update_status($invoice_id, $new_status, $old_status) {
     if (!defined('GEODIRPAYMENT_VERSION')) {
         return false;
     }
     
-    $invoice    = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    remove_action( 'geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4 );
+    remove_action('geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4);
     
-    $invoice_id = wpinv_wpi_to_gdp_id( $invoice_id );
-    $new_status = wpinv_wpi_to_gdp_status( $new_status );
+    $invoice_id = wpinv_wpi_to_gdp_id($invoice_id);
+    $new_status = wpinv_wpi_to_gdp_status($new_status);
     
-    geodir_update_invoice_status( $invoice_id, $new_status, $invoice->is_recurring() );
+    geodir_update_invoice_status($invoice_id, $new_status, $invoice->is_recurring());
 }
-add_action( 'wpinv_update_status', 'wpinv_wpi_to_gdp_update_status', 999, 3 );
+add_action('wpinv_update_status', 'wpinv_wpi_to_gdp_update_status', 999, 3);
 
-function wpinv_gdp_to_wpi_delete_package( $gd_package_id ) {
-    $item = wpinv_get_item_by( 'custom_id', $gd_package_id, 'package' );
+function wpinv_gdp_to_wpi_delete_package($gd_package_id) {
+    $item = wpinv_get_item_by('custom_id', $gd_package_id, 'package');
     
-    if ( !empty( $item ) ) {
-        wpinv_remove_item( $item, true );
+    if (!empty($item)) {
+        wpinv_remove_item($item, true);
     }
 }
-add_action( 'geodir_payment_post_delete_package', 'wpinv_gdp_to_wpi_delete_package', 10, 1 ) ;
+add_action('geodir_payment_post_delete_package', 'wpinv_gdp_to_wpi_delete_package', 10, 1);
 
-function wpinv_can_delete_package_item( $return, $post_id ) {
-    if ( $return && function_exists( 'geodir_get_package_info_by_id' ) && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' && $package_id = get_post_meta( $post_id, '_wpinv_custom_id', true ) ) {
-        $gd_package = geodir_get_package_info_by_id( $package_id, '' );
+function wpinv_can_delete_package_item($return, $post_id) {
+    if ($return && function_exists('geodir_get_package_info_by_id') && get_post_meta($post_id, '_wpinv_type', true) == 'package' && $package_id = get_post_meta($post_id, '_wpinv_custom_id', true)) {
+        $gd_package = geodir_get_package_info_by_id($package_id, '');
         
-        if ( !empty( $gd_package ) ) {
+        if (!empty($gd_package)) {
             $return = false;
         }
     }
 
     return $return;
 }
-add_filter( 'wpinv_can_delete_item', 'wpinv_can_delete_package_item', 10, 2 );
+add_filter('wpinv_can_delete_item', 'wpinv_can_delete_package_item', 10, 2);
 
-function wpinv_package_item_classes( $classes, $class, $post_id ) {
+function wpinv_package_item_classes($classes, $class, $post_id) {
     global $typenow;
 
-    if ( $typenow == 'wpi_item' && in_array( 'wpi-gd-package', $classes ) ) {
-        if ( wpinv_item_in_use( $post_id ) ) {
+    if ($typenow == 'wpi_item' && in_array('wpi-gd-package', $classes)) {
+        if (wpinv_item_in_use($post_id)) {
             $classes[] = 'wpi-inuse-pkg';
-        } else if ( !( function_exists( 'geodir_get_package_info_by_id' ) && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' && geodir_get_package_info_by_id( (int)get_post_meta( $post_id, '_wpinv_custom_id', true ), '' ) ) ) {
+        } else if (!(function_exists('geodir_get_package_info_by_id') && get_post_meta($post_id, '_wpinv_type', true) == 'package' && geodir_get_package_info_by_id((int)get_post_meta($post_id, '_wpinv_custom_id', true), ''))) {
             $classes[] = 'wpi-delete-pkg';
         }
     }
 
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_package_item_classes', 10, 3 );
+add_filter('post_class', 'wpinv_package_item_classes', 10, 3);
 
-function wpinv_gdp_package_type_info( $post ) {
-    if ( wpinv_pm_active() ) {
-        ?><p class="wpi-m0"><?php _e( 'Package: GeoDirectory price packages items.', 'invoicing' );?></p>
+function wpinv_gdp_package_type_info($post) {
+    if (wpinv_pm_active()) {
+        ?><p class="wpi-m0"><?php _e('Package: GeoDirectory price packages items.', 'invoicing'); ?></p>
         <?php
     }
 }
-add_action( 'wpinv_item_info_metabox_after', 'wpinv_gdp_package_type_info', 10, 1 ) ;
+add_action('wpinv_item_info_metabox_after', 'wpinv_gdp_package_type_info', 10, 1);
 
-function wpinv_gdp_to_gdi_set_zero_tax( $is_taxable, $item_id, $country , $state ) {
+function wpinv_gdp_to_gdi_set_zero_tax($is_taxable, $item_id, $country, $state) {
     global $wpi_zero_tax;
 
-    if ( $wpi_zero_tax ) {
+    if ($wpi_zero_tax) {
         $is_taxable = false;
     }
 
     return $is_taxable;
 }
-add_action( 'wpinv_item_is_taxable', 'wpinv_gdp_to_gdi_set_zero_tax', 10, 4 ) ;
+add_action('wpinv_item_is_taxable', 'wpinv_gdp_to_gdi_set_zero_tax', 10, 4);
 
 function wpinv_tool_merge_fix_taxes() {
     global $wpdb;
     
 	$sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
-	$items = $wpdb->get_results( $sql );
+	$items = $wpdb->get_results($sql);
 	
-	if ( !empty( $items ) ) {
-		foreach ( $items as $item ) {
-			if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
-				update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
+	if (!empty($items)) {
+		foreach ($items as $item) {
+			if (get_post_meta($item->ID, '_wpinv_vat_class', true) == '_exempt') {
+				update_post_meta($item->ID, '_wpinv_vat_class', '_standard');
 			}
 		}
 	}
 		
     $sql = "SELECT `p`.`ID`, gdi.id AS gdp_id FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NOT NULL AND p.post_status NOT IN( 'publish', 'wpi-processing', 'wpi-renewal' ) ORDER BY `gdi`.`id` ASC";
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
 	
-	if ( !empty( $items ) ) {
+	if (!empty($items)) {
 		$success = false;
-        $message = __( 'Taxes fixed for non-paid merged GD invoices.', 'invoicing' );
+        $message = __('Taxes fixed for non-paid merged GD invoices.', 'invoicing');
 		
 		global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
 		
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 			$wpi_tax_rates = NULL;               
 			$data = wpinv_get_invoice($item->ID);
 
-			if ( empty( $data ) ) {
+			if (empty($data)) {
 				continue;
 			}
 			
@@ -856,51 +856,51 @@ 
 			
 			$data_session                   = array();
 			$data_session['invoice_id']     = $data->ID;
-			$data_session['cart_discounts'] = $data->get_discounts( true );
+			$data_session['cart_discounts'] = $data->get_discounts(true);
 			
-			wpinv_set_checkout_session( $data_session );
+			wpinv_set_checkout_session($data_session);
 			
 			$wpi_userID         = (int)$data->get_user_id();
 			$_POST['country']   = !empty($data->country) ? $data->country : wpinv_get_default_country();
 				
-			$data->country      = sanitize_text_field( $_POST['country'] );
-			$data->set( 'country', sanitize_text_field( $_POST['country'] ) );
+			$data->country      = sanitize_text_field($_POST['country']);
+			$data->set('country', sanitize_text_field($_POST['country']));
 			
 			$wpinv_ip_address_country = $data->country;
 			
 			$data->recalculate_totals(true);
 			
-			wpinv_set_checkout_session( $checkout_session );
+			wpinv_set_checkout_session($checkout_session);
 			
 			$update_data = array();
 			$update_data['tax_amount'] = $data->get_tax();
 			$update_data['paied_amount'] = $data->get_total();
 			$update_data['invoice_id'] = $data->ID;
 			
-			$wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
+			$wpdb->update(INVOICE_TABLE, $update_data, array('id' => $item->gdp_id));
 		}
 	} else {
         $success = false;
-        $message = __( 'No invoices found to fix taxes!', 'invoicing' );
+        $message = __('No invoices found to fix taxes!', 'invoicing');
     }
 	
 	$response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_fix_taxes', 'wpinv_tool_merge_fix_taxes' );
-remove_action( 'geodir_before_detail_fields' , 'geodir_build_coupon', 2 );
+add_action('wpinv_tool_merge_fix_taxes', 'wpinv_tool_merge_fix_taxes');
+remove_action('geodir_before_detail_fields', 'geodir_build_coupon', 2);
 
-function wpinv_wpi_to_gdp_handle_subscription_cancel( $invoice_id, $invoice ) {
-    if ( wpinv_pm_active() && !empty( $invoice ) && $invoice->is_recurring() ) {
-        if ( $invoice->is_renewal() ) {
+function wpinv_wpi_to_gdp_handle_subscription_cancel($invoice_id, $invoice) {
+    if (wpinv_pm_active() && !empty($invoice) && $invoice->is_recurring()) {
+        if ($invoice->is_renewal()) {
             $invoice = $invoice->get_parent_payment();
         }
         
-        if ( !empty( $invoice ) ) {
-            wpinv_wpi_to_gdp_update_status( $invoice->ID, 'wpi-cancelled', $invoice->get_status() );
+        if (!empty($invoice)) {
+            wpinv_wpi_to_gdp_update_status($invoice->ID, 'wpi-cancelled', $invoice->get_status());
         }
     }
 }
-add_action( 'wpinv_subscription_cancelled', 'wpinv_wpi_to_gdp_handle_subscription_cancel', 10, 2 );
\ No newline at end of file
+add_action('wpinv_subscription_cancelled', 'wpinv_wpi_to_gdp_handle_subscription_cancel', 10, 2);
\ No newline at end of file

templates/emails/wpinv-email-user_note.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_before_note_details', $invoice, $email_type, $sent_to_admin, $customer_note );
+do_action('wpinv_email_before_note_details', $invoice, $email_type, $sent_to_admin, $customer_note);
 
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_after_note_details', $invoice, $email_type, $sent_to_admin, $customer_note );
+do_action('wpinv_email_after_note_details', $invoice, $email_type, $sent_to_admin, $customer_note);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file