AyeCode / invoicing

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

Spacing +87 added lines, -87 removed lines

@@ -1,30 +1,30 @@ 
 <?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_Details {
-    public static function output( $post ) {
+    public static function output($post) {
         $currency_symbol    = wpinv_currency_symbol();
         $statuses           = wpinv_get_invoice_statuses();
         
-        $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);
         
-        $status             = $invoice->get_status( false ); // Current status    
+        $status             = $invoice->get_status(false); // Current status    
         $discount           = $invoice->get_discount();
         $discount_code      = $discount > 0 ? $invoice->get_discount_code() : '';
         $invoice_number     = $invoice->get_number();
         
         $date_created       = $invoice->get_created_date();
-        $datetime_created   = strtotime( $date_created );
-        $date_created       = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $datetime_created ) : '';
+        $datetime_created   = strtotime($date_created);
+        $date_created       = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $datetime_created) : '';
         $date_completed     = $invoice->get_completed_date();
-        $date_completed     = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), strtotime( $date_completed ) ) : 'n/a';
-        $title['status'] = __( 'Invoice Status:', 'invoicing' );
-        $title['number'] = __( 'Invoice Number:', 'invoicing' );
-        $mail_notice = esc_attr__( 'After saving invoice, this will send a copy of the invoice to the user&#8217;s email address.', 'invoicing' );
+        $date_completed     = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n(get_option('date_format') . ' ' . get_option('time_format'), strtotime($date_completed)) : 'n/a';
+        $title['status'] = __('Invoice Status:', 'invoicing');
+        $title['number'] = __('Invoice Number:', 'invoicing');
+        $mail_notice = esc_attr__('After saving invoice, this will send a copy of the invoice to the user&#8217;s email address.', 'invoicing');
         
         $title = apply_filters('wpinv_details_metabox_titles', $title, $invoice);
         $statuses = apply_filters('wpinv_invoice_statuses', $statuses, $invoice);
@@ -34,29 +34,29 @@ 
 <div class="gdmbx2-wrap form-table">
     <div class="gdmbx2-metabox gdmbx-field-list" id="gdmbx2-metabox-wpinv_details">
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-created">
-            <div class="gdmbx-th"><label><?php _e( 'Date Created:', 'invoicing' );?></label></div>
-            <div class="gdmbx-td"><?php echo $date_created;?></div>
+            <div class="gdmbx-th"><label><?php _e('Date Created:', 'invoicing'); ?></label></div>
+            <div class="gdmbx-td"><?php echo $date_created; ?></div>
         </div>
-        <?php if ( $invoice->post_type == 'wpi_invoice' && wpinv_get_option( 'overdue_active' ) && ( $invoice->needs_payment() || $invoice->has_status( array( 'auto-draft' ) ) ) ) { ?>
+        <?php if ($invoice->post_type == 'wpi_invoice' && wpinv_get_option('overdue_active') && ($invoice->needs_payment() || $invoice->has_status(array('auto-draft')))) { ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-overdue">
-            <div class="gdmbx-th"><label for="wpinv_due_date"><?php _e( 'Due Date:', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_due_date"><?php _e('Due Date:', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" placeholder="<?php esc_attr_e( 'Y-m-d', 'invoicing' );?>" value="<?php echo esc_attr( $invoice->get_due_date() );?>" id="wpinv_due_date" name="wpinv_due_date" class="regular-text wpiDatepicker" data-minDate="<?php echo esc_attr( date_i18n( 'Y-m-d', $datetime_created ) );?>" data-dateFormat="yy-mm-dd">
+                <input type="text" placeholder="<?php esc_attr_e('Y-m-d', 'invoicing'); ?>" value="<?php echo esc_attr($invoice->get_due_date()); ?>" id="wpinv_due_date" name="wpinv_due_date" class="regular-text wpiDatepicker" data-minDate="<?php echo esc_attr(date_i18n('Y-m-d', $datetime_created)); ?>" data-dateFormat="yy-mm-dd">
             </div>
         </div>
         <?php } ?>
-        <?php if ( $date_completed && $date_completed != 'n/a' ) { ?>
+        <?php if ($date_completed && $date_completed != 'n/a') { ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-completed">
-            <div class="gdmbx-th"><label><?php _e( 'Payment Date:', 'invoicing' );?></label></div>
-            <div class="gdmbx-td"><?php echo $date_completed;?></div>
+            <div class="gdmbx-th"><label><?php _e('Payment Date:', 'invoicing'); ?></label></div>
+            <div class="gdmbx-td"><?php echo $date_completed; ?></div>
         </div>
         <?php } ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-status">
             <div class="gdmbx-th"><label for="wpinv_status"><?php echo $title['status']; ?></label></div>
             <div class="gdmbx-td">
                 <select required="required" id="wpinv_status" name="wpinv_status" class="gdmbx2_select">
-                    <?php foreach ( $statuses as $value => $label ) { ?>
-                    <option value="<?php echo $value;?>" <?php selected( $status, $value );?>><?php echo $label;?></option>
+                    <?php foreach ($statuses as $value => $label) { ?>
+                    <option value="<?php echo $value; ?>" <?php selected($status, $value); ?>><?php echo $label; ?></option>
                     <?php } ?>
                 </select>
             </div>
@@ -64,107 +64,107 @@ 
         <div class="gdmbx-row gdmbx-type-text gdmbx2-id-wpinv-number table-layout">
             <div class="gdmbx-th"><label for="wpinv_number"><?php echo $title['number']; ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" value="<?php echo esc_attr( $invoice_number );?>" id="wpinv_number" name="wpinv_number" class="regular-text" readonly>
+                <input type="text" value="<?php echo esc_attr($invoice_number); ?>" id="wpinv_number" name="wpinv_number" class="regular-text" readonly>
             </div>
         </div>
-        <?php do_action( 'wpinv_meta_box_details_inner', $post_id ); ?>
-        <?php if ( !( $is_paid = ( $invoice->is_paid() || $invoice->is_refunded() ) ) || $discount_code ) { ?>
+        <?php do_action('wpinv_meta_box_details_inner', $post_id); ?>
+        <?php if (!($is_paid = ($invoice->is_paid() || $invoice->is_refunded())) || $discount_code) { ?>
         <div class="gdmbx-row gdmbx-type-text gdmbx2-id-wpinv-discount-code table-layout">
-            <div class="gdmbx-th"><label for="wpinv_discount_code"><?php _e( 'Discount Code:', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_discount_code"><?php _e('Discount Code:', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" value="<?php echo esc_attr( $discount_code ); ?>" id="wpinv_discount" class="medium-text" <?php echo ( $discount_code ? 'readonly' : '' ); ?> /><?php if ( !$is_paid ) { ?><input value="<?php echo esc_attr_e( 'Apply', 'invoicing' ); ?>" class="button button-small button-primary <?php echo ( $discount_code ? 'wpi-hide' : 'wpi-inlineb' ); ?>" id="wpinv-apply-code" type="button" /><input value="<?php echo esc_attr_e( 'Remove', 'invoicing' ); ?>" class="button button-small button-primary <?php echo ( $discount_code ? 'wpi-inlineb' : 'wpi-hide' ); ?>" id="wpinv-remove-code" type="button" /><?php } ?>
+                <input type="text" value="<?php echo esc_attr($discount_code); ?>" id="wpinv_discount" class="medium-text" <?php echo ($discount_code ? 'readonly' : ''); ?> /><?php if (!$is_paid) { ?><input value="<?php echo esc_attr_e('Apply', 'invoicing'); ?>" class="button button-small button-primary <?php echo ($discount_code ? 'wpi-hide' : 'wpi-inlineb'); ?>" id="wpinv-apply-code" type="button" /><input value="<?php echo esc_attr_e('Remove', 'invoicing'); ?>" class="button button-small button-primary <?php echo ($discount_code ? 'wpi-inlineb' : 'wpi-hide'); ?>" id="wpinv-remove-code" type="button" /><?php } ?>
             </div>
         </div>
         <?php } ?>
     </div>
 </div>
 <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-save-send table-layout">
-    <p class="wpi-meta-row wpi-save-send"><label for="wpi_save_send"><?php echo sprintf(__( 'Send %s:', 'invoicing' ),$post_obj->labels->singular_name) ; ?></label>
+    <p class="wpi-meta-row wpi-save-send"><label for="wpi_save_send"><?php echo sprintf(__('Send %s:', 'invoicing'), $post_obj->labels->singular_name); ?></label>
         <select id="wpi_save_send" name="wpi_save_send">
-            <option value="1"><?php _e( 'Yes', 'invoicing' ); ?></option>
-            <option value="" selected="selected"><?php _e( 'No', 'invoicing' ); ?></option>
+            <option value="1"><?php _e('Yes', 'invoicing'); ?></option>
+            <option value="" selected="selected"><?php _e('No', 'invoicing'); ?></option>
         </select>
     </p>
     <p class="wpi-meta-row wpi-send-info"><?php echo $mail_notice; ?></p>
 </div>
-<?php wp_nonce_field( 'wpinv_details', 'wpinv_details_nonce' ) ;?>
+<?php wp_nonce_field('wpinv_details', 'wpinv_details_nonce'); ?>
         <?php
     }
     
-    public static function resend_invoice( $post ) {
+    public static function resend_invoice($post) {
         global $wpi_mb_invoice;
         
-        if ( empty( $wpi_mb_invoice ) ) {
+        if (empty($wpi_mb_invoice)) {
             return;
         }
         
         $text = array(
-            'message'       => esc_attr__( 'This will send a copy of the invoice to the customer&#8217;s email address.', 'invoicing' ),
-            'button_text'   =>  __( 'Resend Invoice', 'invoicing' ),
+            'message'       => esc_attr__('This will send a copy of the invoice to the customer&#8217;s email address.', 'invoicing'),
+            'button_text'   =>  __('Resend Invoice', 'invoicing'),
         );
             
         $text = apply_filters('wpinv_resend_invoice_metabox_text', $text);
-        do_action( 'wpinv_metabox_resend_invoice_before', $wpi_mb_invoice );
+        do_action('wpinv_metabox_resend_invoice_before', $wpi_mb_invoice);
         
-        if ( $email = $wpi_mb_invoice->get_email() ) {
+        if ($email = $wpi_mb_invoice->get_email()) {
             $email_actions = array();
-            $email_actions['email_url']      = add_query_arg( array( 'wpi_action' => 'send_invoice', 'invoice_id' => $post->ID ) );
-            $email_actions['reminder_url']   = add_query_arg( array( 'wpi_action' => 'send_reminder', 'invoice_id' => $post->ID ) );
+            $email_actions['email_url']      = add_query_arg(array('wpi_action' => 'send_invoice', 'invoice_id' => $post->ID));
+            $email_actions['reminder_url']   = add_query_arg(array('wpi_action' => 'send_reminder', 'invoice_id' => $post->ID));
             
-            $email_actions = apply_filters('wpinv_resend_invoice_email_actions', $email_actions );
+            $email_actions = apply_filters('wpinv_resend_invoice_email_actions', $email_actions);
         ?>
         <p class="wpi-meta-row wpi-resend-info"><?php echo $text['message']; ?></p>
-        <p class="wpi-meta-row wpi-resend-email"><a href="<?php echo esc_url( $email_actions['email_url'] ); ?>" class="button button-secondary"><?php echo $text['button_text']; ?></a></p>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && "wpi_invoice" === $wpi_mb_invoice->post_type && $wpi_mb_invoice->needs_payment() && ( $due_date = $wpi_mb_invoice->get_due_date() ) ) { ?>
-        <p class="wpi-meta-row wpi-send-reminder"><a title="<?php esc_attr_e( 'Send overdue reminder notification to customer', 'invoicing' ); ?>" href="<?php echo esc_url( $email_actions['reminder_url'] ); ?>" class="button button-secondary"><?php esc_attr_e( 'Send Reminder', 'invoicing' ); ?></a></p>
+        <p class="wpi-meta-row wpi-resend-email"><a href="<?php echo esc_url($email_actions['email_url']); ?>" class="button button-secondary"><?php echo $text['button_text']; ?></a></p>
+        <?php if (wpinv_get_option('overdue_active') && "wpi_invoice" === $wpi_mb_invoice->post_type && $wpi_mb_invoice->needs_payment() && ($due_date = $wpi_mb_invoice->get_due_date())) { ?>
+        <p class="wpi-meta-row wpi-send-reminder"><a title="<?php esc_attr_e('Send overdue reminder notification to customer', 'invoicing'); ?>" href="<?php echo esc_url($email_actions['reminder_url']); ?>" class="button button-secondary"><?php esc_attr_e('Send Reminder', 'invoicing'); ?></a></p>
         <?php } ?>
         <?php
         }
         
-        do_action( 'wpinv_metabox_resend_invoice_after', $wpi_mb_invoice );
+        do_action('wpinv_metabox_resend_invoice_after', $wpi_mb_invoice);
     }
     
-    public static function subscriptions( $post ) {
+    public static function subscriptions($post) {
         global $wpi_mb_invoice;
         
         $invoice = $wpi_mb_invoice;
         
-        if ( !empty( $invoice ) && $invoice->is_recurring() && $invoice->is_parent() ) {
+        if (!empty($invoice) && $invoice->is_recurring() && $invoice->is_parent()) {
             $payments       = $invoice->get_child_payments();
             
             $total_payments = (int)$invoice->get_total_payments();
             $subscription   = $invoice->get_subscription_data();
 
-            $billing_cycle  = wpinv_get_billing_cycle( $subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency() );
-            $times_billed   = $total_payments . ' / ' . ( ( (int)$subscription['bill_times'] == 0 ) ? __( 'Until cancelled', 'invoicing' ) : $subscription['bill_times'] );
+            $billing_cycle  = wpinv_get_billing_cycle($subscription['initial_amount'], $subscription['recurring_amount'], $subscription['period'], $subscription['interval'], $subscription['bill_times'], $subscription['trial_period'], $subscription['trial_interval'], $invoice->get_currency());
+            $times_billed   = $total_payments . ' / ' . (((int)$subscription['bill_times'] == 0) ? __('Until cancelled', 'invoicing') : $subscription['bill_times']);
             $subscription_status = $invoice->get_subscription_status();
             ?>
-            <p class="wpi-meta-row wpi-sub-label"><?php _e( 'Recurring Payment', 'invoicing' );?></p>
-            <?php if ( $subscription_id = $invoice->get_subscription_id() ) { ?>
-            <p class="wpi-meta-row wpi-sub-id"><label><?php _e( 'Subscription ID:', 'invoicing' );?> </label><?php echo $subscription_id; ?></p>
+            <p class="wpi-meta-row wpi-sub-label"><?php _e('Recurring Payment', 'invoicing'); ?></p>
+            <?php if ($subscription_id = $invoice->get_subscription_id()) { ?>
+            <p class="wpi-meta-row wpi-sub-id"><label><?php _e('Subscription ID:', 'invoicing'); ?> </label><?php echo $subscription_id; ?></p>
             <?php } ?>
-            <p class="wpi-meta-row wpi-bill-cycle"><label><?php _e( 'Billing Cycle:', 'invoicing' );?> </label><?php echo $billing_cycle; ?></p>
-            <p class="wpi-meta-row wpi-billed-times"><label><?php _e( 'Times Billed:', 'invoicing' );?> </label><?php echo $times_billed; ?></p>
-            <?php if ( !empty( $payments ) || $invoice->is_paid() ) { ?>
-                <p class="wpi-meta-row wpi-start-date"><label><?php _e( 'Start Date:', 'invoicing' );?> </label><?php echo $invoice->get_subscription_start(); ?></p>
-                <p class="wpi-meta-row wpi-end-date"><label><?php _e( 'Expiration Date:', 'invoicing' );?> </label><?php echo $invoice->get_subscription_end(); ?></p>
-                <?php if ( $status_label = $invoice->get_subscription_status_label( $subscription_status ) ) { ?>
-                <p class="wpi-meta-row wpi-sub-status"><label><?php _e( 'Subscription Status:', 'invoicing' );?> </label><?php echo $status_label; ?></p>
+            <p class="wpi-meta-row wpi-bill-cycle"><label><?php _e('Billing Cycle:', 'invoicing'); ?> </label><?php echo $billing_cycle; ?></p>
+            <p class="wpi-meta-row wpi-billed-times"><label><?php _e('Times Billed:', 'invoicing'); ?> </label><?php echo $times_billed; ?></p>
+            <?php if (!empty($payments) || $invoice->is_paid()) { ?>
+                <p class="wpi-meta-row wpi-start-date"><label><?php _e('Start Date:', 'invoicing'); ?> </label><?php echo $invoice->get_subscription_start(); ?></p>
+                <p class="wpi-meta-row wpi-end-date"><label><?php _e('Expiration Date:', 'invoicing'); ?> </label><?php echo $invoice->get_subscription_end(); ?></p>
+                <?php if ($status_label = $invoice->get_subscription_status_label($subscription_status)) { ?>
+                <p class="wpi-meta-row wpi-sub-status"><label><?php _e('Subscription Status:', 'invoicing'); ?> </label><?php echo $status_label; ?></p>
                 <?php } ?>
-                <?php if ( $subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date() ) { ?>
-                <p class="wpi-meta-row wpi-trial-date"><label><?php _e( 'Trial Until:', 'invoicing' );?> </label><?php echo $trial_end_date; ?></p>
+                <?php if ($subscription_status == 'trialing' && $trial_end_date = $invoice->get_trial_end_date()) { ?>
+                <p class="wpi-meta-row wpi-trial-date"><label><?php _e('Trial Until:', 'invoicing'); ?> </label><?php echo $trial_end_date; ?></p>
                 <?php } ?>
-                <?php if ( $cancelled_date = $invoice->get_cancelled_date() ) { ?>
-                <p class="wpi-meta-row wpi-cancel-date"><label><?php _e( 'Cancelled On:', 'invoicing' );?> </label><?php echo $cancelled_date; ?></p>
+                <?php if ($cancelled_date = $invoice->get_cancelled_date()) { ?>
+                <p class="wpi-meta-row wpi-cancel-date"><label><?php _e('Cancelled On:', 'invoicing'); ?> </label><?php echo $cancelled_date; ?></p>
                 <?php } ?>
-                <?php if ( !empty( $payments ) ) { ?>
-                <p><strong><?php _e( 'Renewal Payments:', 'invoicing' ); ?></strong></p>
+                <?php if (!empty($payments)) { ?>
+                <p><strong><?php _e('Renewal Payments:', 'invoicing'); ?></strong></p>
                 <ul id="wpi-sub-payments">
-                <?php foreach ( $payments as $invoice_id ) { ?>
+                <?php foreach ($payments as $invoice_id) { ?>
                     <li>
-                        <a href="<?php echo esc_url( get_edit_post_link( $invoice_id ) ); ?>"><?php echo wpinv_get_invoice_number( $invoice_id ); ?></a>&nbsp;&ndash;&nbsp;
-                        <span><?php echo wpinv_get_invoice_date( $invoice_id ); ?>&nbsp;&ndash;&nbsp;</span>
-                        <span><?php echo wpinv_payment_total( $invoice_id, true ); ?></span>
+                        <a href="<?php echo esc_url(get_edit_post_link($invoice_id)); ?>"><?php echo wpinv_get_invoice_number($invoice_id); ?></a>&nbsp;&ndash;&nbsp;
+                        <span><?php echo wpinv_get_invoice_date($invoice_id); ?>&nbsp;&ndash;&nbsp;</span>
+                        <span><?php echo wpinv_payment_total($invoice_id, true); ?></span>
                     </li>
                 <?php } ?>
                 </ul>
@@ -172,49 +172,49 @@ 
         }
     }
     
-    public static function renewals( $post ) {
+    public static function renewals($post) {
         global $wpi_mb_invoice;
         
-        if ( wpinv_is_subscription_payment( $wpi_mb_invoice ) ) {
-            $parent_url = get_edit_post_link( $wpi_mb_invoice->parent_invoice );
-            $parent_id  = wpinv_get_invoice_number( $wpi_mb_invoice->parent_invoice );
+        if (wpinv_is_subscription_payment($wpi_mb_invoice)) {
+            $parent_url = get_edit_post_link($wpi_mb_invoice->parent_invoice);
+            $parent_id  = wpinv_get_invoice_number($wpi_mb_invoice->parent_invoice);
         ?>
-        <p class="wpi-meta-row wpi-sub-id"><label><?php _e( 'Subscription ID:', 'invoicing' );?> </label><?php echo $wpi_mb_invoice->get_subscription_id(); ?></p>
-        <p class="wpi-meta-row wpi-parent-id"><label><?php _e( 'Parent Invoice:', 'invoicing' );?> </label><a href="<?php echo esc_url( $parent_url ); ?>"><?php echo $parent_id; ?></a></p>
+        <p class="wpi-meta-row wpi-sub-id"><label><?php _e('Subscription ID:', 'invoicing'); ?> </label><?php echo $wpi_mb_invoice->get_subscription_id(); ?></p>
+        <p class="wpi-meta-row wpi-parent-id"><label><?php _e('Parent Invoice:', 'invoicing'); ?> </label><a href="<?php echo esc_url($parent_url); ?>"><?php echo $parent_id; ?></a></p>
         <?php
         }
     }
     
-    public static function payment_meta( $post ) {
+    public static function payment_meta($post) {
         global $wpi_mb_invoice;
 
-        $set_dateway = empty( $wpi_mb_invoice->gateway ) ? true : false;
-        if ( !$set_dateway && !$wpi_mb_invoice->get_meta( '_wpinv_checkout', true ) && !$wpi_mb_invoice->is_paid() && !$wpi_mb_invoice->is_refunded() ) {
+        $set_dateway = empty($wpi_mb_invoice->gateway) ? true : false;
+        if (!$set_dateway && !$wpi_mb_invoice->get_meta('_wpinv_checkout', true) && !$wpi_mb_invoice->is_paid() && !$wpi_mb_invoice->is_refunded()) {
             $set_dateway = true;
         }
         
         ?>
         <p class="wpi-meta-row">
-        <?php if ( $set_dateway ) { $gateways = wpinv_get_enabled_payment_gateways( true ); ?>
-            <label for="wpinv_gateway"><?php _e( 'Gateway:', 'invoicing' ) ; ?></label>
+        <?php if ($set_dateway) { $gateways = wpinv_get_enabled_payment_gateways(true); ?>
+            <label for="wpinv_gateway"><?php _e('Gateway:', 'invoicing'); ?></label>
             <select required="required" id="wpinv_gateway" name="wpinv_gateway">
-                <?php foreach ( $gateways as $name => $gateway ) {
-                    if ( $wpi_mb_invoice->is_recurring() && !wpinv_gateway_support_subscription( $name ) ) {
+                <?php foreach ($gateways as $name => $gateway) {
+                    if ($wpi_mb_invoice->is_recurring() && !wpinv_gateway_support_subscription($name)) {
                         continue;
                     }
                     ?>
-                <option value="<?php echo $name;?>" <?php selected( $wpi_mb_invoice->gateway, $name );?>><?php echo !empty( $gateway['admin_label'] ) ? $gateway['admin_label'] : $gateway['checkout_label']; ?></option>
+                <option value="<?php echo $name; ?>" <?php selected($wpi_mb_invoice->gateway, $name); ?>><?php echo !empty($gateway['admin_label']) ? $gateway['admin_label'] : $gateway['checkout_label']; ?></option>
                 <?php } ?>
             </select>
         <?php } else { 
-            echo wp_sprintf( __( '<label>Gateway:</label> %s', 'invoicing' ), wpinv_get_gateway_checkout_label( $wpi_mb_invoice->gateway ) );
+            echo wp_sprintf(__('<label>Gateway:</label> %s', 'invoicing'), wpinv_get_gateway_checkout_label($wpi_mb_invoice->gateway));
         } ?>
         </p>
-        <?php if ( $key = $wpi_mb_invoice->get_key() ) { ?>
-        <p class="wpi-meta-row"><?php echo wp_sprintf( __( '<label>Key:</label> %s', 'invoicing' ), $key ); ?></p>
+        <?php if ($key = $wpi_mb_invoice->get_key()) { ?>
+        <p class="wpi-meta-row"><?php echo wp_sprintf(__('<label>Key:</label> %s', 'invoicing'), $key); ?></p>
         <?php } ?>
-        <?php if ( $wpi_mb_invoice->is_paid() || $wpi_mb_invoice->is_refunded() ) { ?>
-        <p class="wpi-meta-row"><?php echo wp_sprintf( __( '<label>Transaction ID:</label> %s', 'invoicing' ), wpinv_payment_link_transaction_id( $wpi_mb_invoice ) ); ?></p>
+        <?php if ($wpi_mb_invoice->is_paid() || $wpi_mb_invoice->is_refunded()) { ?>
+        <p class="wpi-meta-row"><?php echo wp_sprintf(__('<label>Transaction ID:</label> %s', 'invoicing'), wpinv_payment_link_transaction_id($wpi_mb_invoice)); ?></p>
         <?php } ?>
         <?php
     }

includes/wpinv-invoice-functions.php

Spacing +713 added lines, -713 removed lines

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

includes/wpinv-general-functions.php

Spacing +159 added lines, -159 removed lines

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

includes/admin/register-settings.php

Spacing +509 added lines, -509 removed lines

@@ -1,66 +1,66 @@ 
 <?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_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
     global $wpinv_options;
 
-    $value = isset( $wpinv_options[ $key ] ) ? $wpinv_options[ $key ] : $default;
-    $value = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value = isset($wpinv_options[$key]) ? $wpinv_options[$key] : $default;
+    $value = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
-    if ( empty( $value ) ) {
-        $remove_option = wpinv_delete_option( $key );
+    if (empty($value)) {
+        $remove_option = wpinv_delete_option($key);
         return $remove_option;
     }
 
     // First let's grab the current settings
-    $options = get_option( 'wpinv_settings' );
+    $options = get_option('wpinv_settings');
 
     // Let other plugin alter the value
-    $value = apply_filters( 'wpinv_update_option', $value, $key );
+    $value = apply_filters('wpinv_update_option', $value, $key);
 
     // Next let's try to update the value
-    $options[ $key ] = $value;
-    $did_update = update_option( 'wpinv_settings', $options );
+    $options[$key] = $value;
+    $did_update = update_option('wpinv_settings', $options);
 
     // If it's updated, let's update the global variable
-    if ( $did_update ) {
+    if ($did_update) {
         global $wpinv_options;
-        $wpinv_options[ $key ] = $value;
+        $wpinv_options[$key] = $value;
     }
 
     return $did_update;
 }
 
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // First let's grab the current settings
-    $options = get_option( 'wpinv_settings' );
+    $options = get_option('wpinv_settings');
 
     // Next let's try to update the value
-    if( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
+    if (isset($options[$key])) {
+        unset($options[$key]);
     }
 
-    $did_update = update_option( 'wpinv_settings', $options );
+    $did_update = update_option('wpinv_settings', $options);
 
     // If it updated, let's update the global variable
-    if ( $did_update ){
+    if ($did_update) {
         global $wpinv_options;
         $wpinv_options = $options;
     }
@@ -69,37 +69,37 @@ 
 }
 
 function wpinv_get_settings() {
-    $settings = get_option( 'wpinv_settings' );
+    $settings = get_option('wpinv_settings');
 
-    if ( empty( $settings ) ) {
+    if (empty($settings)) {
         // Update old settings with new single option
-        $general_settings   = is_array( get_option( 'wpinv_settings_general' ) )    ? get_option( 'wpinv_settings_general' )    : array();
-        $gateways_settings  = is_array( get_option( 'wpinv_settings_gateways' ) )   ? get_option( 'wpinv_settings_gateways' )   : array();
-        $email_settings     = is_array( get_option( 'wpinv_settings_emails' ) )     ? get_option( 'wpinv_settings_emails' )     : array();
-        $tax_settings       = is_array( get_option( 'wpinv_settings_taxes' ) )      ? get_option( 'wpinv_settings_taxes' )      : array();
-        $misc_settings      = is_array( get_option( 'wpinv_settings_misc' ) )       ? get_option( 'wpinv_settings_misc' )       : array();
-        $tool_settings      = is_array( get_option( 'wpinv_settings_tools' ) )      ? get_option( 'wpinv_settings_tools' )      : array();
+        $general_settings   = is_array(get_option('wpinv_settings_general')) ? get_option('wpinv_settings_general') : array();
+        $gateways_settings  = is_array(get_option('wpinv_settings_gateways')) ? get_option('wpinv_settings_gateways') : array();
+        $email_settings     = is_array(get_option('wpinv_settings_emails')) ? get_option('wpinv_settings_emails') : array();
+        $tax_settings       = is_array(get_option('wpinv_settings_taxes')) ? get_option('wpinv_settings_taxes') : array();
+        $misc_settings      = is_array(get_option('wpinv_settings_misc')) ? get_option('wpinv_settings_misc') : array();
+        $tool_settings      = is_array(get_option('wpinv_settings_tools')) ? get_option('wpinv_settings_tools') : array();
 
-        $settings = array_merge( $general_settings, $gateways_settings, $tax_settings, $tool_settings );
+        $settings = array_merge($general_settings, $gateways_settings, $tax_settings, $tool_settings);
 
-        update_option( 'wpinv_settings', $settings );
+        update_option('wpinv_settings', $settings);
 
     }
-    return apply_filters( 'wpinv_get_settings', $settings );
+    return apply_filters('wpinv_get_settings', $settings);
 }
 
 function wpinv_register_settings() {
-    if ( false == get_option( 'wpinv_settings' ) ) {
-        add_option( 'wpinv_settings' );
+    if (false == get_option('wpinv_settings')) {
+        add_option('wpinv_settings');
     }
     
     $register_settings = wpinv_get_registered_settings();
     
-    foreach ( $register_settings as $tab => $sections ) {
-        foreach ( $sections as $section => $settings) {
+    foreach ($register_settings as $tab => $sections) {
+        foreach ($sections as $section => $settings) {
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
@@ -111,42 +111,42 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
+            foreach ($settings as $option) {
                 // For backwards compatibility
-                if ( empty( $option['id'] ) ) {
+                if (empty($option['id'])) {
                     continue;
                 }
 
-                $name = isset( $option['name'] ) ? $option['name'] : '';
+                $name = isset($option['name']) ? $option['name'] : '';
 
                 add_settings_field(
                     'wpinv_settings[' . $option['id'] . ']',
                     $name,
-                    function_exists( 'wpinv_' . $option['type'] . '_callback' ) ? 'wpinv_' . $option['type'] . '_callback' : 'wpinv_missing_callback',
+                    function_exists('wpinv_' . $option['type'] . '_callback') ? 'wpinv_' . $option['type'] . '_callback' : 'wpinv_missing_callback',
                     'wpinv_settings_' . $tab . '_' . $section,
                     'wpinv_settings_' . $tab . '_' . $section,
                     array(
                         'section'     => $section,
-                        'id'          => isset( $option['id'] )          ? $option['id']          : null,
-                        'desc'        => ! empty( $option['desc'] )      ? $option['desc']        : '',
-                        'name'        => isset( $option['name'] )        ? $option['name']        : null,
-                        'size'        => isset( $option['size'] )        ? $option['size']        : null,
-                        'options'     => isset( $option['options'] )     ? $option['options']     : '',
-                        'selected'    => isset( $option['selected'] )    ? $option['selected']    : null,
-                        'std'         => isset( $option['std'] )         ? $option['std']         : '',
-                        'min'         => isset( $option['min'] )         ? $option['min']         : null,
-                        'max'         => isset( $option['max'] )         ? $option['max']         : null,
-                        'step'        => isset( $option['step'] )        ? $option['step']        : null,
-                        'chosen'      => isset( $option['chosen'] )      ? $option['chosen']      : null,
-                        'placeholder' => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-                        'allow_blank' => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-                        'readonly'    => isset( $option['readonly'] )    ? $option['readonly']    : false,
-                        'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
-                        'onchange'    => !empty( $option['onchange'] )   ? $option['onchange']    : '',
-                        'custom'      => !empty( $option['custom'] )     ? $option['custom']      : '',
-                        'class'       =>  !empty( $option['class'] )     ? $option['class']      : '',
-                        'cols'        => !empty( $option['cols'] ) && (int)$option['cols'] > 0 ? (int)$option['cols'] : 50,
-                        'rows'        => !empty( $option['rows'] ) && (int)$option['rows'] > 0 ? (int)$option['rows'] : 5,
+                        'id'          => isset($option['id']) ? $option['id'] : null,
+                        'desc'        => !empty($option['desc']) ? $option['desc'] : '',
+                        'name'        => isset($option['name']) ? $option['name'] : null,
+                        'size'        => isset($option['size']) ? $option['size'] : null,
+                        'options'     => isset($option['options']) ? $option['options'] : '',
+                        'selected'    => isset($option['selected']) ? $option['selected'] : null,
+                        'std'         => isset($option['std']) ? $option['std'] : '',
+                        'min'         => isset($option['min']) ? $option['min'] : null,
+                        'max'         => isset($option['max']) ? $option['max'] : null,
+                        'step'        => isset($option['step']) ? $option['step'] : null,
+                        'chosen'      => isset($option['chosen']) ? $option['chosen'] : null,
+                        'placeholder' => isset($option['placeholder']) ? $option['placeholder'] : null,
+                        'allow_blank' => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+                        'readonly'    => isset($option['readonly']) ? $option['readonly'] : false,
+                        'faux'        => isset($option['faux']) ? $option['faux'] : false,
+                        'onchange'    => !empty($option['onchange']) ? $option['onchange'] : '',
+                        'custom'      => !empty($option['custom']) ? $option['custom'] : '',
+                        'class'       =>  !empty($option['class']) ? $option['class'] : '',
+                        'cols'        => !empty($option['cols']) && (int)$option['cols'] > 0 ? (int)$option['cols'] : 50,
+                        'rows'        => !empty($option['rows']) && (int)$option['rows'] > 0 ? (int)$option['rows'] : 5,
                     )
                 );
             }
@@ -154,180 +154,180 @@ 
     }
 
     // Creates our settings in the options table
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 function wpinv_get_registered_settings() {
-    $pages = wpinv_get_pages( true );
+    $pages = wpinv_get_pages(true);
     
     $currencies = wpinv_get_currencies();
     
     $currency_code_options = array();
-    foreach ( $currencies as $code => $name ) {
-        $currency_code_options[ $code ] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol( $code ) . ')';
+    foreach ($currencies as $code => $name) {
+        $currency_code_options[$code] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol($code) . ')';
     }
     
     $due_payment_options       = array();
-    $due_payment_options[0]    = __( 'Now', 'invoicing' );
-    for ( $i = 1; $i <= 30; $i++ ) {
+    $due_payment_options[0]    = __('Now', 'invoicing');
+    for ($i = 1; $i <= 30; $i++) {
         $due_payment_options[$i] = $i;
     }
     
     $invoice_number_padd_options = array();
-    for ( $i = 0; $i <= 20; $i++ ) {
+    for ($i = 0; $i <= 20; $i++) {
         $invoice_number_padd_options[$i] = $i;
     }
     
     $currency_symbol = wpinv_currency_symbol();
     
     $last_number = '';
-    if ( $last_invoice_number = get_option( 'wpinv_last_invoice_number' ) ) {
-        $last_invoice_number = is_numeric( $last_invoice_number ) ? $last_invoice_number : wpinv_clean_invoice_number( $last_invoice_number );
+    if ($last_invoice_number = get_option('wpinv_last_invoice_number')) {
+        $last_invoice_number = is_numeric($last_invoice_number) ? $last_invoice_number : wpinv_clean_invoice_number($last_invoice_number);
 
-        if ( !empty( $last_invoice_number ) ) {
-            $last_number = ' ' . wp_sprintf( __( "( Last Invoice's sequential number: <b>%s</b> )", 'invoicing' ), $last_invoice_number );
+        if (!empty($last_invoice_number)) {
+            $last_number = ' ' . wp_sprintf(__("( Last Invoice's sequential number: <b>%s</b> )", 'invoicing'), $last_invoice_number);
         }
     }
     
     $alert_wrapper_start = '<p style="color: #F00">';
     $alert_wrapper_close = '</p>';
     $wpinv_settings = array(
-        'general' => apply_filters( 'wpinv_settings_general',
+        'general' => apply_filters('wpinv_settings_general',
             array(
                 'main' => array(
                     'location_settings' => array(
                         'id'   => 'location_settings',
-                        'name' => '<h3>' . __( 'Default Location', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Default Location', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'default_country' => array(
                         'id'      => 'default_country',
-                        'name'    => __( 'Default Country', 'invoicing' ),
-                        'desc'    => __( 'Where does your store operate from?', 'invoicing' ),
+                        'name'    => __('Default Country', 'invoicing'),
+                        'desc'    => __('Where does your store operate from?', 'invoicing'),
                         'type'    => 'select',
                         'options' => wpinv_get_country_list(),
                         'std'     => 'GB',
                         'chosen'  => true,
-                        'placeholder' => __( 'Select a country', 'invoicing' ),
+                        'placeholder' => __('Select a country', 'invoicing'),
                     ),
                     'default_state' => array(
                         'id'      => 'default_state',
-                        'name'    => __( 'Default State / Province', 'invoicing' ),
-                        'desc'    => __( 'What state / province does your store operate from?', 'invoicing' ),
+                        'name'    => __('Default State / Province', 'invoicing'),
+                        'desc'    => __('What state / province does your store operate from?', 'invoicing'),
                         'type'    => 'country_states',
-                        'placeholder' => __( 'Select a state', 'invoicing' ),
+                        'placeholder' => __('Select a state', 'invoicing'),
                     ),
                     'store_name' => array(
                         'id'   => 'store_name',
-                        'name' => __( 'Store Name', 'invoicing' ),
-                        'desc' => __( 'Store name to print on invoices.', 'invoicing' ),
+                        'name' => __('Store Name', 'invoicing'),
+                        'desc' => __('Store name to print on invoices.', 'invoicing'),
                         'std'     => get_option('blogname'),
                         'type' => 'text',
                     ),
                     'logo' => array(
                         'id'   => 'logo',
-                        'name' => __( 'Logo URL', 'invoicing' ),
-                        'desc' => __( 'Store logo to print on invoices.', 'invoicing' ),
+                        'name' => __('Logo URL', 'invoicing'),
+                        'desc' => __('Store logo to print on invoices.', 'invoicing'),
                         'type' => 'text',
                     ),
                     'store_address' => array(
                         'id'   => 'store_address',
-                        'name' => __( 'Store Address', 'invoicing' ),
-                        'desc' => __( 'Enter the store address to display on invoice', 'invoicing' ),
+                        'name' => __('Store Address', 'invoicing'),
+                        'desc' => __('Enter the store address to display on invoice', 'invoicing'),
                         'type' => 'textarea',
                     ),
                     'page_settings' => array(
                         'id'   => 'page_settings',
-                        'name' => '<h3>' . __( 'Page Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Page Settings', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'checkout_page' => array(
                         'id'          => 'checkout_page',
-                        'name'        => __( 'Checkout Page', 'invoicing' ),
-                        'desc'        => __( 'This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing' ),
+                        'name'        => __('Checkout Page', 'invoicing'),
+                        'desc'        => __('This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'success_page' => array(
                         'id'          => 'success_page',
-                        'name'        => __( 'Success Page', 'invoicing' ),
-                        'desc'        => __( 'This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing' ),
+                        'name'        => __('Success Page', 'invoicing'),
+                        'desc'        => __('This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'failure_page' => array(
                         'id'          => 'failure_page',
-                        'name'        => __( 'Failed Transaction Page', 'invoicing' ),
-                        'desc'        => __( 'This is the page buyers are sent to if their transaction is cancelled or fails', 'invoicing' ),
+                        'name'        => __('Failed Transaction Page', 'invoicing'),
+                        'desc'        => __('This is the page buyers are sent to if their transaction is cancelled or fails', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'invoice_history_page' => array(
                         'id'          => 'invoice_history_page',
-                        'name'        => __( 'Invoice History Page', 'invoicing' ),
-                        'desc'        => __( 'This page shows an invoice history for the current user', 'invoicing' ),
+                        'name'        => __('Invoice History Page', 'invoicing'),
+                        'desc'        => __('This page shows an invoice history for the current user', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     )
                 ),
                 'currency_section' => array(
                     'currency_settings' => array(
                         'id'   => 'currency_settings',
-                        'name' => '<h3>' . __( 'Currency Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Currency Settings', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'currency' => array(
                         'id'      => 'currency',
-                        'name'    => __( 'Currency', 'invoicing' ),
-                        'desc'    => __( 'Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing' ),
+                        'name'    => __('Currency', 'invoicing'),
+                        'desc'    => __('Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing'),
                         'type'    => 'select',
                         'options' => $currency_code_options,
                         'chosen'  => true,
                     ),
                     'currency_position' => array(
                         'id'      => 'currency_position',
-                        'name'    => __( 'Currency Position', 'invoicing' ),
-                        'desc'    => __( 'Choose the location of the currency sign.', 'invoicing' ),
+                        'name'    => __('Currency Position', 'invoicing'),
+                        'desc'    => __('Choose the location of the currency sign.', 'invoicing'),
                         'type'    => 'select',
                         'options'  => array(
-                            'left'        => __( 'Left', 'invoicing' ) . ' (' . $currency_symbol . wpinv_format_amount( '99.99' ) . ')',
-                            'right'       => __( 'Right', 'invoicing' ) . ' ('. wpinv_format_amount( '99.99' ) . $currency_symbol . ')',
-                            'left_space'  => __( 'Left with space', 'invoicing' ) . ' (' . $currency_symbol . ' ' . wpinv_format_amount( '99.99' ) . ')',
-                            'right_space' => __( 'Right with space', 'invoicing' ) . ' (' . wpinv_format_amount( '99.99' ) . ' ' . $currency_symbol . ')'
+                            'left'        => __('Left', 'invoicing') . ' (' . $currency_symbol . wpinv_format_amount('99.99') . ')',
+                            'right'       => __('Right', 'invoicing') . ' (' . wpinv_format_amount('99.99') . $currency_symbol . ')',
+                            'left_space'  => __('Left with space', 'invoicing') . ' (' . $currency_symbol . ' ' . wpinv_format_amount('99.99') . ')',
+                            'right_space' => __('Right with space', 'invoicing') . ' (' . wpinv_format_amount('99.99') . ' ' . $currency_symbol . ')'
                         )
                     ),
                     'thousands_separator' => array(
                         'id'   => 'thousands_separator',
-                        'name' => __( 'Thousands Separator', 'invoicing' ),
-                        'desc' => __( 'The symbol (usually , or .) to separate thousands', 'invoicing' ),
+                        'name' => __('Thousands Separator', 'invoicing'),
+                        'desc' => __('The symbol (usually , or .) to separate thousands', 'invoicing'),
                         'type' => 'text',
                         'size' => 'small',
                         'std'  => ',',
                     ),
                     'decimal_separator' => array(
                         'id'   => 'decimal_separator',
-                        'name' => __( 'Decimal Separator', 'invoicing' ),
-                        'desc' => __( 'The symbol (usually , or .) to separate decimal points', 'invoicing' ),
+                        'name' => __('Decimal Separator', 'invoicing'),
+                        'desc' => __('The symbol (usually , or .) to separate decimal points', 'invoicing'),
                         'type' => 'text',
                         'size' => 'small',
                         'std'  => '.',
                     ),
                     'decimals' => array(
                         'id'   => 'decimals',
-                        'name' => __( 'Number of Decimals', 'invoicing' ),
-                        'desc' => __( 'This sets the number of decimal points shown in displayed prices.', 'invoicing' ),
+                        'name' => __('Number of Decimals', 'invoicing'),
+                        'desc' => __('This sets the number of decimal points shown in displayed prices.', 'invoicing'),
                         'type' => 'number',
                         'size' => 'small',
                         'std'  => '2',
@@ -339,29 +339,29 @@ 
                 'labels' => array(
                     'labels' => array(
                         'id'   => 'labels_settings',
-                        'name' => '<h3>' . __( 'Invoice Labels', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Invoice Labels', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'vat_name' => array(
                         'id' => 'vat_name',
-                        'name' => __( 'VAT Name', 'invoicing' ),
-                        'desc' => __( 'Enter the VAT name', 'invoicing' ),
+                        'name' => __('VAT Name', 'invoicing'),
+                        'desc' => __('Enter the VAT name', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => 'VAT'
                     ),
                     'vat_invoice_notice_label' => array(
                         'id' => 'vat_invoice_notice_label',
-                        'name' => __( 'Invoice Notice Label', 'invoicing' ),
-                        'desc' => __( 'Use this to add an invoice notice section (label) to your invoices', 'invoicing' ),
+                        'name' => __('Invoice Notice Label', 'invoicing'),
+                        'desc' => __('Use this to add an invoice notice section (label) to your invoices', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                     ),
                     'vat_invoice_notice' => array(
                         'id' => 'vat_invoice_notice',
-                        'name' => __( 'Invoice notice', 'invoicing' ),
-                        'desc' =>   __( 'Use this to add an invoice notice section (description) to your invoices', 'invoicing' ),
+                        'name' => __('Invoice notice', 'invoicing'),
+                        'desc' =>   __('Use this to add an invoice notice section (description) to your invoices', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                     )
@@ -373,22 +373,22 @@ 
                 'main' => array(
                     'gateway_settings' => array(
                         'id'   => 'api_header',
-                        'name' => '<h3>' . __( 'Gateway Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Gateway Settings', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'gateways' => array(
                         'id'      => 'gateways',
-                        'name'    => __( 'Payment Gateways', 'invoicing' ),
-                        'desc'    => __( 'Choose the payment gateways you want to enable.', 'invoicing' ),
+                        'name'    => __('Payment Gateways', 'invoicing'),
+                        'desc'    => __('Choose the payment gateways you want to enable.', 'invoicing'),
                         'type'    => 'gateways',
                         'std'     => array('manual'=>1),
                         'options' => wpinv_get_payment_gateways(),
                     ),
                     'default_gateway' => array(
                         'id'      => 'default_gateway',
-                        'name'    => __( 'Default Gateway', 'invoicing' ),
-                        'desc'    => __( 'This gateway will be loaded automatically with the checkout page.', 'invoicing' ),
+                        'name'    => __('Default Gateway', 'invoicing'),
+                        'desc'    => __('This gateway will be loaded automatically with the checkout page.', 'invoicing'),
                         'type'    => 'gateway_select',
                         'std'     => 'manual',
                         'options' => wpinv_get_payment_gateways(),
@@ -402,19 +402,19 @@ 
                 'main' => array(
                     'tax_settings' => array(
                         'id'   => 'tax_settings',
-                        'name' => '<h3>' . __( 'Tax Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Tax Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'enable_taxes' => array(
                         'id'   => 'enable_taxes',
-                        'name' => __( 'Enable Taxes', 'invoicing' ),
-                        'desc' => __( 'Check this to enable taxes on invoices.', 'invoicing' ),
+                        'name' => __('Enable Taxes', 'invoicing'),
+                        'desc' => __('Check this to enable taxes on invoices.', 'invoicing'),
                         'type' => 'checkbox',
                     ),
                     'tax_rate' => array(
                         'id'   => 'tax_rate',
-                        'name' => __( 'Fallback Tax Rate', 'invoicing' ),
-                        'desc' => __( 'Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing' ),
+                        'name' => __('Fallback Tax Rate', 'invoicing'),
+                        'desc' => __('Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing'),
                         'type' => 'number',
                         'size' => 'small',
                         'min'  => '0',
@@ -426,8 +426,8 @@ 
                 'rates' => array(
                     'tax_rates' => array(
                         'id'   => 'tax_rates',
-                        'name' => '<h3>' . __( 'Tax Rates', 'invoicing' ) . '</h3>',
-                        'desc' => __( 'Enter tax rates for specific regions.', 'invoicing' ),
+                        'name' => '<h3>' . __('Tax Rates', 'invoicing') . '</h3>',
+                        'desc' => __('Enter tax rates for specific regions.', 'invoicing'),
                         'type' => 'tax_rates',
                     ),
                 )
@@ -439,62 +439,62 @@ 
                 'main' => array(
                     'email_settings_header' => array(
                         'id'   => 'email_settings_header',
-                        'name' => '<h3>' . __( 'Email Sender Options', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Email Sender Options', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'email_from_name' => array(
                         'id'   => 'email_from_name',
-                        'name' => __( 'From Name', 'invoicing' ),
-                        'desc' => __( 'Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing' ),
-                        'std' => esc_attr( get_bloginfo( 'name', 'display' ) ),
+                        'name' => __('From Name', 'invoicing'),
+                        'desc' => __('Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing'),
+                        'std' => esc_attr(get_bloginfo('name', 'display')),
                         'type' => 'text',
                     ),
                     'email_from' => array(
                         'id'   => 'email_from',
-                        'name' => __( 'From Email', 'invoicing' ),
-                        'desc' => sprintf (__( 'Email address to send invoice emails from. This will act as the "from" and "reply-to" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing' ), $alert_wrapper_start, $alert_wrapper_close),
-                        'std' => get_option( 'admin_email' ),
+                        'name' => __('From Email', 'invoicing'),
+                        'desc' => sprintf(__('Email address to send invoice emails from. This will act as the "from" and "reply-to" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing'), $alert_wrapper_start, $alert_wrapper_close),
+                        'std' => get_option('admin_email'),
                         'type' => 'text',
                     ),
                     'overdue_settings_header' => array(
                         'id'   => 'overdue_settings_header',
-                        'name' => '<h3>' . __( 'Due Date Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Due Date Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'overdue_active' => array(
                         'id'   => 'overdue_active',
-                        'name' => __( 'Enable Due Date', 'invoicing' ),
-                        'desc' => __( 'Check this to enable due date option for invoices.', 'invoicing' ),
+                        'name' => __('Enable Due Date', 'invoicing'),
+                        'desc' => __('Check this to enable due date option for invoices.', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => false,
                     ),
                     'overdue_days' => array(
                         'id'          => 'overdue_days',
-                        'name'        => __( 'Default Due Date', 'invoicing' ),
-                        'desc'        => __( 'Number of days each Invoice is due after the created date. This will automatically set the date in the "Due Date" field. Can be overridden on individual Invoices.', 'invoicing' ),
+                        'name'        => __('Default Due Date', 'invoicing'),
+                        'desc'        => __('Number of days each Invoice is due after the created date. This will automatically set the date in the "Due Date" field. Can be overridden on individual Invoices.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $due_payment_options,
                         'chosen'      => true,
                         'std'         => 0,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'email_template_header' => array(
                         'id'   => 'email_template_header',
-                        'name' => '<h3>' . __( 'Email Template', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Email Template', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'email_header_image' => array(
                         'id'   => 'email_header_image',
-                        'name' => __( 'Header Image', 'invoicing' ),
-                        'desc' => __( 'URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing' ),
+                        'name' => __('Header Image', 'invoicing'),
+                        'desc' => __('URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing'),
                         'std' => '',
                         'type' => 'text',
                     ),
                     'email_footer_text' => array(
                         'id'   => 'email_footer_text',
-                        'name' => __( 'Footer Text', 'invoicing' ),
-                        'desc' => __( 'The text to appear in the footer of all invoice emails.', 'invoicing' ),
-                        'std' => get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GeoDirectory', 'invoicing' ),
+                        'name' => __('Footer Text', 'invoicing'),
+                        'desc' => __('The text to appear in the footer of all invoice emails.', 'invoicing'),
+                        'std' => get_bloginfo('name', 'display') . ' - ' . __('Powered by GeoDirectory', 'invoicing'),
                         'type' => 'textarea',
                         'class' => 'regular-text',
                         'rows' => 2,
@@ -502,29 +502,29 @@ 
                     ),
                     'email_base_color' => array(
                         'id'   => 'email_base_color',
-                        'name' => __( 'Base Color', 'invoicing' ),
-                        'desc' => __( 'The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing' ),
+                        'name' => __('Base Color', 'invoicing'),
+                        'desc' => __('The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing'),
                         'std' => '#557da2',
                         'type' => 'color',
                     ),
                     'email_background_color' => array(
                         'id'   => 'email_background_color',
-                        'name' => __( 'Background Color', 'invoicing' ),
-                        'desc' => __( 'The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing' ),
+                        'name' => __('Background Color', 'invoicing'),
+                        'desc' => __('The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing'),
                         'std' => '#f5f5f5',
                         'type' => 'color',
                     ),
                     'email_body_background_color' => array(
                         'id'   => 'email_body_background_color',
-                        'name' => __( 'Body Background Color', 'invoicing' ),
-                        'desc' => __( 'The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing' ),
+                        'name' => __('Body Background Color', 'invoicing'),
+                        'desc' => __('The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing'),
                         'std' => '#fdfdfd',
                         'type' => 'color',
                     ),
                     'email_text_color' => array(
                         'id'   => 'email_text_color',
-                        'name' => __( 'Body Text Color', 'invoicing' ),
-                        'desc' => __( 'The main body text color. Default <code>#505050</code>.', 'invoicing' ),
+                        'name' => __('Body Text Color', 'invoicing'),
+                        'desc' => __('The main body text color. Default <code>#505050</code>.', 'invoicing'),
                         'std' => '#505050',
                         'type' => 'color',
                     ),
@@ -543,19 +543,19 @@ 
                 'main' => array(
                     'invoice_number_format_settings' => array(
                         'id'   => 'invoice_number_format_settings',
-                        'name' => '<h3>' . __( 'Invoice Number', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Invoice Number', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'sequential_invoice_number' => array(
                         'id'   => 'sequential_invoice_number',
-                        'name' => __( 'Sequential Invoice Numbers', 'invoicing' ),
-                        'desc' => __( 'Check this box to enable sequential invoice numbers.', 'invoicing' ),
+                        'name' => __('Sequential Invoice Numbers', 'invoicing'),
+                        'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing'),
                         'type' => 'checkbox',
                     ),
                     'invoice_sequence_start' => array(
                         'id'   => 'invoice_sequence_start',
-                        'name' => __( 'Sequential Starting Number', 'invoicing' ),
-                        'desc' => __( 'The number at which the invoice number sequence should begin.', 'invoicing' ) . $last_number,
+                        'name' => __('Sequential Starting Number', 'invoicing'),
+                        'desc' => __('The number at which the invoice number sequence should begin.', 'invoicing') . $last_number,
                         'type' => 'number',
                         'size' => 'small',
                         'std'  => '1',
@@ -563,8 +563,8 @@ 
                     ),
                     'invoice_number_padd' => array(
                         'id'      => 'invoice_number_padd',
-                        'name'    => __( 'Minimum Digits', 'invoicing' ),
-                        'desc'    => __( 'If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing' ),
+                        'name'    => __('Minimum Digits', 'invoicing'),
+                        'desc'    => __('If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing'),
                         'type'    => 'select',
                         'options' => $invoice_number_padd_options,
                         'std'     => 5,
@@ -572,8 +572,8 @@ 
                     ),
                     'invoice_number_prefix' => array(
                         'id' => 'invoice_number_prefix',
-                        'name' => __( 'Invoice Number Prefix', 'invoicing' ),
-                        'desc' => __( 'Prefix for all invoice numbers. Ex: WPINV-', 'invoicing' ),
+                        'name' => __('Invoice Number Prefix', 'invoicing'),
+                        'desc' => __('Prefix for all invoice numbers. Ex: WPINV-', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => 'WPINV-',
@@ -581,32 +581,32 @@ 
                     ),
                     'invoice_number_postfix' => array(
                         'id' => 'invoice_number_postfix',
-                        'name' => __( 'Invoice Number Postfix', 'invoicing' ),
-                        'desc' => __( 'Postfix for all invoice numbers.', 'invoicing' ),
+                        'name' => __('Invoice Number Postfix', 'invoicing'),
+                        'desc' => __('Postfix for all invoice numbers.', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => ''
                     ),
                     'checkout_settings' => array(
                         'id'   => 'checkout_settings',
-                        'name' => '<h3>' . __( 'Checkout Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Checkout Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'login_to_checkout' => array(
                         'id'   => 'login_to_checkout',
-                        'name' => __( 'Require Login To Checkout', 'invoicing' ),
-                        'desc' => __( 'If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing' ),
+                        'name' => __('Require Login To Checkout', 'invoicing'),
+                        'desc' => __('If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing'),
                         'type' => 'checkbox',
                     ),
                     'uninstall_settings' => array(
                         'id'   => 'uninstall_settings',
-                        'name' => '<h3>' . __( 'Uninstall Settings', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Uninstall Settings', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'remove_data_on_unistall' => array(
                         'id'   => 'remove_data_on_unistall',
-                        'name' => __( 'Remove Data on Uninstall?', 'invoicing' ),
-                        'desc' => __( 'Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing' ),
+                        'name' => __('Remove Data on Uninstall?', 'invoicing'),
+                        'desc' => __('Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => ''
                     ),
@@ -614,74 +614,74 @@ 
                 'fields' => array(
                     'fields_settings' => array(
                         'id'   => 'fields_settings',
-                        'name' => '<h3>' . __( 'Address Fields', 'invoicing' ) . '</h3>',
-                        'desc' => __( 'Tick fields which are mandatory in invoice address fields.', 'invoicing' ),
+                        'name' => '<h3>' . __('Address Fields', 'invoicing') . '</h3>',
+                        'desc' => __('Tick fields which are mandatory in invoice address fields.', 'invoicing'),
                         'type' => 'header',
                     ),
                     'fname_mandatory' => array(
                         'id'   => 'fname_mandatory',
-                        'name' => __( 'First Name', 'invoicing' ),
+                        'name' => __('First Name', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'lname_mandatory' => array(
                         'id'   => 'lname_mandatory',
-                        'name' => __( 'Last Name', 'invoicing' ),
+                        'name' => __('Last Name', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'address_mandatory' => array(
                         'id'   => 'address_mandatory',
-                        'name' => __( 'Address', 'invoicing' ),
+                        'name' => __('Address', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'city_mandatory' => array(
                         'id'   => 'city_mandatory',
-                        'name' => __( 'City', 'invoicing' ),
+                        'name' => __('City', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'country_mandatory' => array(
                         'id'   => 'country_mandatory',
-                        'name' => __( 'Country', 'invoicing' ),
+                        'name' => __('Country', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'state_mandatory' => array(
                         'id'   => 'state_mandatory',
-                        'name' => __( 'State / Province', 'invoicing' ),
+                        'name' => __('State / Province', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'zip_mandatory' => array(
                         'id'   => 'zip_mandatory',
-                        'name' => __( 'ZIP / Postcode', 'invoicing' ),
+                        'name' => __('ZIP / Postcode', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'phone_mandatory' => array(
                         'id'   => 'phone_mandatory',
-                        'name' => __( 'Phone Number', 'invoicing' ),
+                        'name' => __('Phone Number', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'address_autofill_settings' => array(
                         'id'   => 'address_autofill_settings',
-                        'name' => '<h3>' . __( 'Google Address Auto Complete', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Google Address Auto Complete', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'address_autofill_active' => array(
                         'id'   => 'address_autofill_active',
-                        'name' => __( 'Enable/Disable', 'invoicing' ),
-                        'desc' => __( 'Enable google address auto complete', 'invoicing' ),
+                        'name' => __('Enable/Disable', 'invoicing'),
+                        'desc' => __('Enable google address auto complete', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => 0
                     ),
                     'address_autofill_api' => array(
                         'id' => 'address_autofill_api',
-                        'name' => __( 'Google Place API Key', 'invoicing' ),
-                        'desc' => wp_sprintf(__( 'Enter google place API key. For more information go to google place API %sdocumenation%s', 'invoicing' ), '<a href="https://developers.google.com/maps/documentation/javascript/places-autocomplete" target="_blank">', '</a>' ),
+                        'name' => __('Google Place API Key', 'invoicing'),
+                        'desc' => wp_sprintf(__('Enter google place API key. For more information go to google place API %sdocumenation%s', 'invoicing'), '<a href="https://developers.google.com/maps/documentation/javascript/places-autocomplete" target="_blank">', '</a>'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => ''
@@ -695,8 +695,8 @@ 
                 'main' => array(
                     'tool_settings' => array(
                         'id'   => 'tool_settings',
-                        'name' => '<h3>' . __( 'Diagnostic Tools', 'invoicing' ) . '</h3>',
-                        'desc' => __( 'Invoicing diagnostic tools', 'invoicing' ),
+                        'name' => '<h3>' . __('Diagnostic Tools', 'invoicing') . '</h3>',
+                        'desc' => __('Invoicing diagnostic tools', 'invoicing'),
                         'type' => 'tools',
                     ),
                 ),
@@ -704,135 +704,135 @@ 
         )
     );
 
-    return apply_filters( 'wpinv_registered_settings', $wpinv_settings );
+    return apply_filters('wpinv_registered_settings', $wpinv_settings);
 }
 
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
     global $wpinv_options;
 
-    if ( empty( $_POST['_wp_http_referer'] ) ) {
+    if (empty($_POST['_wp_http_referer'])) {
         return $input;
     }
 
-    parse_str( $_POST['_wp_http_referer'], $referrer );
+    parse_str($_POST['_wp_http_referer'], $referrer);
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][ $key ]['type'] ) ? $settings[ $tab ][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$key]['type']) ? $settings[$tab][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[$key] = apply_filters( 'wpinv_settings_sanitize_' . $type, $value, $key );
+            $input[$key] = apply_filters('wpinv_settings_sanitize_' . $type, $value, $key);
         }
 
         // General filter
-        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = $section == 'main' ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = $section == 'main' ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings = array_merge( $main_settings, $section_settings );
+    $found_settings = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( empty( $input[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (empty($input[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
 
-function wpinv_settings_sanitize_misc_accounting( $input ) {
+function wpinv_settings_sanitize_misc_accounting($input) {
     global $wpinv_options, $wpi_session;
 
-    if ( !current_user_can( 'manage_options' ) ) {
+    if (!current_user_can('manage_options')) {
         return $input;
     }
 
-    if( ! empty( $input['enable_sequential'] ) && !wpinv_get_option( 'enable_sequential' ) ) {
+    if (!empty($input['enable_sequential']) && !wpinv_get_option('enable_sequential')) {
         // Shows an admin notice about upgrading previous order numbers
-        $wpi_session->set( 'upgrade_sequential', '1' );
+        $wpi_session->set('upgrade_sequential', '1');
     }
 
     return $input;
 }
-add_filter( 'wpinv_settings_misc-accounting_sanitize', 'wpinv_settings_sanitize_misc_accounting' );
+add_filter('wpinv_settings_misc-accounting_sanitize', 'wpinv_settings_sanitize_misc_accounting');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if( !current_user_can( 'manage_options' ) ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!current_user_can('manage_options')) {
         return $input;
     }
 
-    $new_rates = !empty( $_POST['tax_rates'] ) ? array_values( $_POST['tax_rates'] ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? array_values($_POST['tax_rates']) : array();
 
     $tax_rates = array();
 
-    if ( !empty( $new_rates ) ) {
-        foreach ( $new_rates as $rate ) {
-            if ( isset( $rate['country'] ) && empty( $rate['country'] ) && empty( $rate['state'] ) ) {
+    if (!empty($new_rates)) {
+        foreach ($new_rates as $rate) {
+            if (isset($rate['country']) && empty($rate['country']) && empty($rate['state'])) {
                 continue;
             }
             
-            $rate['rate'] = wpinv_sanitize_amount( $rate['rate'], 4 );
+            $rate['rate'] = wpinv_sanitize_amount($rate['rate'], 4);
             
             $tax_rates[] = $rate;
         }
     }
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
-function wpinv_sanitize_text_field( $input ) {
-    return trim( $input );
+function wpinv_sanitize_text_field($input) {
+    return trim($input);
 }
-add_filter( 'wpinv_settings_sanitize_text', 'wpinv_sanitize_text_field' );
+add_filter('wpinv_settings_sanitize_text', 'wpinv_sanitize_text_field');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-    $tabs['emails']   = __( 'Emails', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
-
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+    $tabs['emails']   = __('Emails', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
+
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
-    } else if ( $tab ) {
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
+    } else if ($tab) {
         $tabs = false;
     }
 
@@ -842,136 +842,136 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
     $sections = array(
-        'general' => apply_filters( 'wpinv_settings_sections_general', array(
-            'main' => __( 'General Settings', 'invoicing' ),
-            'currency_section' => __( 'Currency Settings', 'invoicing' ),
-            'labels' => __( 'Label Texts', 'invoicing' ),
-        ) ),
-        'gateways' => apply_filters( 'wpinv_settings_sections_gateways', array(
-            'main' => __( 'Gateway Settings', 'invoicing' ),
-        ) ),
-        'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
-            'main' => __( 'Tax Settings', 'invoicing' ),
-            'rates' => __( 'Tax Rates', 'invoicing' ),
-        ) ),
-        'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
-            'main' => __( 'Email Settings', 'invoicing' ),
-        ) ),
-        'misc' => apply_filters( 'wpinv_settings_sections_misc', array(
-            'main' => __( 'Miscellaneous', 'invoicing' ),
-            'fields' => __( 'Fields Settings', 'invoicing' ),
-        ) ),
-        'tools' => apply_filters( 'wpinv_settings_sections_tools', array(
-            'main' => __( 'Diagnostic Tools', 'invoicing' ),
-        ) ),
+        'general' => apply_filters('wpinv_settings_sections_general', array(
+            'main' => __('General Settings', 'invoicing'),
+            'currency_section' => __('Currency Settings', 'invoicing'),
+            'labels' => __('Label Texts', 'invoicing'),
+        )),
+        'gateways' => apply_filters('wpinv_settings_sections_gateways', array(
+            'main' => __('Gateway Settings', 'invoicing'),
+        )),
+        'taxes' => apply_filters('wpinv_settings_sections_taxes', array(
+            'main' => __('Tax Settings', 'invoicing'),
+            'rates' => __('Tax Rates', 'invoicing'),
+        )),
+        'emails' => apply_filters('wpinv_settings_sections_emails', array(
+            'main' => __('Email Settings', 'invoicing'),
+        )),
+        'misc' => apply_filters('wpinv_settings_sections_misc', array(
+            'main' => __('Miscellaneous', 'invoicing'),
+            'fields' => __('Fields Settings', 'invoicing'),
+        )),
+        'tools' => apply_filters('wpinv_settings_sections_tools', array(
+            'main' => __('Diagnostic Tools', 'invoicing'),
+        )),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
+function wpinv_get_pages($with_slug = false, $default_label = NULL) {
 	$pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== NULL && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
         echo $args['desc'];
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 	global $wpinv_options;
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	} elseif (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key($args['id']) . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '" />';
     
 	echo $html;
 }
 
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$name = '';
 	} else {
 		$name = 'name="wpinv_settings[' . $sanitize_id . ']"';
 	}
 
-	$checked = isset( $wpinv_options[ $args['id'] ] ) ? checked( 1, $wpinv_options[ $args['id'] ], false ) : '';
+	$checked = isset($wpinv_options[$args['id']]) ? checked(1, $wpinv_options[$args['id']], false) : '';
 	$html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 	global $wpinv_options;
 	
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$sanitize_id = wpinv_sanitize_key($args['id']);
 	
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option):
+			$sanitize_key = wpinv_sanitize_key($key);
+			if (isset($wpinv_options[$args['id']][$sanitize_key])) { 
 				$enabled = $sanitize_key;
 			} else { 
 				$enabled = NULL; 
 			}
-			echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label><br/>';
+			echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($sanitize_key) . '" ' . checked($sanitize_key, $enabled, false) . '/>&nbsp;';
+			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post($option) . '</label><br/>';
 		endforeach;
 		echo '<p class="description">' . $args['desc'] . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
+			if (isset($wpinv_options[$args['id']][$key])) {
 				$enabled = $option;
 			} else {
 				$enabled = NULL;
@@ -979,196 +979,196 @@ 
 
 			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+					echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
+					$card = strtolower(str_replace(' ', '', $option));
 
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+					if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+						$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+						$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 						$content_dir = WP_CONTENT_DIR;
 
-						if ( function_exists( 'wp_normalize_path' ) ) {
+						if (function_exists('wp_normalize_path')) {
 							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
+							$image = wp_normalize_path($image);
+							$content_dir = wp_normalize_path($content_dir);
 						}
 
-						$image = str_replace( $content_dir, content_url(), $image );
+						$image = str_replace($content_dir, content_url(), $image);
 					}
 
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+					echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
 			echo $option . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
     
-    foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+    foreach ($args['options'] as $key => $option) :
+		$sanitize_key = wpinv_sanitize_key($key);
         
         $checked = false;
 
-		if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
+		if (isset($wpinv_options[$args['id']]) && $wpinv_options[$args['id']] == $key)
 			$checked = true;
-		elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
+		elseif (isset($args['std']) && $args['std'] == $key && !isset($wpinv_options[$args['id']]))
 			$checked = true;
 
 		echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
+		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html($option) . '</label><br/>';
 	endforeach;
 
-	echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+	echo '<p class="description">' . wp_kses_post($args['desc']) . '</p>';
 }
 
-function wpinv_gateways_callback( $args ) {
+function wpinv_gateways_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+	foreach ($args['options'] as $key => $option) :
+		$sanitize_key = wpinv_sanitize_key($key);
         
-        if ( isset( $wpinv_options['gateways'][ $key ] ) )
+        if (isset($wpinv_options['gateways'][$key]))
 			$enabled = '1';
 		else
 			$enabled = null;
 
-		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
+		echo '<input name="wpinv_settings[' . esc_attr($args['id']) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
+		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html($option['admin_label']) . '</label><br/>';
 	endforeach;
 }
 
 function wpinv_gateway_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
 	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']">';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            $selected = selected( $key, $args['selected'], false );
+	foreach ($args['options'] as $key => $option) :
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            $selected = selected($key, $args['selected'], false);
         } else {
-            $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
+            $selected = isset($wpinv_options[$args['id']]) ? selected($key, $wpinv_options[$args['id']], false) : '';
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+		echo '<option value="' . wpinv_sanitize_key($key) . '"' . $selected . '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+	$class = !empty($args['class']) ? sanitize_html_class($args['class']) : '';
 
 	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
-	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
-	$html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$size     = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html     = '<input type="text" class="' . sanitize_html_class($size) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '"' . $readonly . '/>';
+	$html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_number_callback( $args ) {
+function wpinv_number_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$max  = isset( $args['max'] ) ? $args['max'] : 999999;
-	$min  = isset( $args['min'] ) ? $args['min'] : 0;
-	$step = isset( $args['step'] ) ? $args['step'] : 1;
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+	$max  = isset($args['max']) ? $args['max'] : 999999;
+	$min  = isset($args['min']) ? $args['min'] : 0;
+	$step = isset($args['step']) ? $args['step'] : 1;
+	$class = !empty($args['class']) ? sanitize_html_class($args['class']) : '';
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="number" step="' . esc_attr($step) . '" max="' . esc_attr($max) . '" min="' . esc_attr($min) . '" class="' . sanitize_html_class($size) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '"/>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_textarea_callback( $args ) {
+function wpinv_textarea_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
     
-    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $class = (isset($args['class']) && !is_null($args['class'])) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<textarea class="' . sanitize_html_class($class) . ' txtarea-' . sanitize_html_class($size) . ' wpi-' . esc_attr(sanitize_html_class($sanitize_id)) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="password" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
 function wpinv_missing_callback($args) {
 	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+		__('The callback function used for the %s setting is missing.', 'invoicing'),
 		'<strong>' . $args['id'] . '</strong>'
 	);
 }
@@ -1176,137 +1176,137 @@ 
 function wpinv_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
     
-    if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
         $value = $args['selected'];
     }
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
 	}
 
-	if ( isset( $args['chosen'] ) ) {
+	if (isset($args['chosen'])) {
 		$chosen = 'class="wpinv-chosen"';
 	} else {
 		$chosen = '';
 	}
     
-    if( !empty( $args['onchange'] ) ) {
-        $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $onchange = ' onchange="' . esc_attr($args['onchange']) . '"';
     } else {
         $onchange = '';
     }
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" ' . $chosen . 'data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" ' . $chosen . 'data-placeholder="' . esc_html($placeholder) . '"' . $onchange . ' />';
 
-	foreach ( $args['options'] as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+	foreach ($args['options'] as $option => $name) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($name) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+	foreach ($args['options'] as $option => $color) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($color['label']) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wpinv_options, $wp_version;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
+		if (empty($args['allow_blank']) && empty($value)) {
+			$value = isset($args['std']) ? $args['std'] : '';
 		}
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+	if ($wp_version >= 3.3 && function_exists('wp_editor')) {
 		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ) ) );
+		wp_editor(stripslashes($value), 'wpinv_settings_' . esc_attr($args['id']), array('textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']', 'textarea_rows' => absint($rows)));
 		$html = ob_get_clean();
 	} else {
-		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	$html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+	if (isset($wpinv_options[$args['id']])) {
 		$value = $wpinv_options[$args['id']];
 	} else {
 		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="text" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr(stripslashes($value)) . '"/>';
+	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __('Upload File', 'invoicing') . '"/></span>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+	$default = isset($args['std']) ? $args['std'] : '';
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '" data-default-color="' . esc_attr($default) . '" />';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -1314,9 +1314,9 @@ 
 function wpinv_country_states_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -1324,17 +1324,17 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$chosen = ( $args['chosen'] ? ' wpinv-chosen' : '' );
-	$class = empty( $states ) ? ' class="wpinv-no-states' . $chosen . '"' : 'class="' . $chosen . '"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$chosen = ($args['chosen'] ? ' wpinv-chosen' : '');
+	$class = empty($states) ? ' class="wpinv-no-states' . $chosen . '"' : 'class="' . $chosen . '"';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"' . $class . 'data-placeholder="' . esc_html($placeholder) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+	foreach ($states as $option => $name) {
+		$selected = isset($wpinv_options[$args['id']]) ? selected($option, $wpinv_options[$args['id']], false) : '';
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($name) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -1349,25 +1349,25 @@ 
 	<table id="wpinv_tax_rates" class="wp-list-table widefat fixed posts">
 		<thead>
 			<tr>
-				<th scope="col" class="wpinv_tax_country"><?php _e( 'Country', 'invoicing' ); ?></th>
-				<th scope="col" class="wpinv_tax_state"><?php _e( 'State / Province', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_tax_global" title="<?php esc_attr_e( 'Apply rate to whole country, regardless of state / province', 'invoicing' ); ?>"><?php _e( 'Country Wide', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_tax_rate"><?php _e( 'Rate %', 'invoicing' ); ?></th> 
-                <th scope="col" class="wpinv_tax_name"><?php _e( 'Tax Name', 'invoicing' ); ?></th>
-				<th scope="col" class="wpinv_tax_action"><?php _e( 'Remove', 'invoicing' ); ?></th>
+				<th scope="col" class="wpinv_tax_country"><?php _e('Country', 'invoicing'); ?></th>
+				<th scope="col" class="wpinv_tax_state"><?php _e('State / Province', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_tax_global" title="<?php esc_attr_e('Apply rate to whole country, regardless of state / province', 'invoicing'); ?>"><?php _e('Country Wide', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_tax_rate"><?php _e('Rate %', 'invoicing'); ?></th> 
+                <th scope="col" class="wpinv_tax_name"><?php _e('Tax Name', 'invoicing'); ?></th>
+				<th scope="col" class="wpinv_tax_action"><?php _e('Remove', 'invoicing'); ?></th>
 			</tr>
 		</thead>
         <tbody>
-		<?php if( !empty( $rates ) ) : ?>
-			<?php foreach( $rates as $key => $rate ) : ?>
+		<?php if (!empty($rates)) : ?>
+			<?php foreach ($rates as $key => $rate) : ?>
             <?php 
-            $sanitized_key = wpinv_sanitize_key( $key );
+            $sanitized_key = wpinv_sanitize_key($key);
             ?>
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
+					echo wpinv_html_select(array(
+						'options'          => wpinv_get_country_list(true),
 						'name'             => 'tax_rates[' . $sanitized_key . '][country]',
                         'id'               => 'tax_rates[' . $sanitized_key . '][country]',
 						'selected'         => $rate['country'],
@@ -1375,72 +1375,72 @@ 
 						'show_option_none' => false,
 						'class'            => 'wpinv-tax-country',
 						'chosen'           => false,
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) );
+						'placeholder'      => __('Choose a country', 'invoicing')
+					));
 					?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php
-					$states = wpinv_get_country_states( $rate['country'] );
-					if( !empty( $states ) ) {
-						echo wpinv_html_select( array(
-							'options'          => array_merge( array( '' => '' ), $states ),
+					$states = wpinv_get_country_states($rate['country']);
+					if (!empty($states)) {
+						echo wpinv_html_select(array(
+							'options'          => array_merge(array('' => ''), $states),
 							'name'             => 'tax_rates[' . $sanitized_key . '][state]',
                             'id'               => 'tax_rates[' . $sanitized_key . '][state]',
 							'selected'         => $rate['state'],
 							'show_option_all'  => false,
 							'show_option_none' => false,
 							'chosen'           => false,
-							'placeholder'      => __( 'Choose a state', 'invoicing' )
-						) );
+							'placeholder'      => __('Choose a state', 'invoicing')
+						));
 					} else {
-						echo wpinv_html_text( array(
+						echo wpinv_html_text(array(
 							'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
-							'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
+							'value' => !empty($rate['state']) ? $rate['state'] : '',
                             'id'    => 'tax_rates[' . $sanitized_key . '][state]',
-						) );
+						));
 					}
 					?>
 				</td>
 				<td class="wpinv_tax_global">
-					<input type="checkbox" name="tax_rates[<?php echo $sanitized_key; ?>][global]" id="tax_rates[<?php echo $sanitized_key; ?>][global]" value="1"<?php checked( true, ! empty( $rate['global'] ) ); ?>/>
-					<label for="tax_rates[<?php echo $sanitized_key; ?>][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
+					<input type="checkbox" name="tax_rates[<?php echo $sanitized_key; ?>][global]" id="tax_rates[<?php echo $sanitized_key; ?>][global]" value="1"<?php checked(true, !empty($rate['global'])); ?>/>
+					<label for="tax_rates[<?php echo $sanitized_key; ?>][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
 				</td>
-				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[<?php echo $sanitized_key; ?>][rate]" value="<?php echo esc_html( $rate['rate'] ); ?>"/></td>
-                <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[<?php echo $sanitized_key; ?>][name]" value="<?php echo esc_html( $rate['name'] ); ?>"/></td>
-				<td class="wpinv_tax_action"><span class="wpinv_remove_tax_rate button-secondary"><?php _e( 'Remove Rate', 'invoicing' ); ?></span></td>
+				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[<?php echo $sanitized_key; ?>][rate]" value="<?php echo esc_html($rate['rate']); ?>"/></td>
+                <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[<?php echo $sanitized_key; ?>][name]" value="<?php echo esc_html($rate['name']); ?>"/></td>
+				<td class="wpinv_tax_action"><span class="wpinv_remove_tax_rate button-secondary"><?php _e('Remove Rate', 'invoicing'); ?></span></td>
 			</tr>
 			<?php endforeach; ?>
 		<?php else : ?>
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
+					echo wpinv_html_select(array(
+						'options'          => wpinv_get_country_list(true),
 						'name'             => 'tax_rates[0][country]',
 						'show_option_all'  => false,
 						'show_option_none' => false,
 						'class'            => 'wpinv-tax-country',
 						'chosen'           => false,
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) ); ?>
+						'placeholder'      => __('Choose a country', 'invoicing')
+					)); ?>
 				</td>
 				<td class="wpinv_tax_state">
-					<?php echo wpinv_html_text( array(
+					<?php echo wpinv_html_text(array(
 						'name' => 'tax_rates[0][state]'
-					) ); ?>
+					)); ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[0][global]" id="tax_rates[0][global]" value="1"/>
-					<label for="tax_rates[0][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
+					<label for="tax_rates[0][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
 				</td>
-				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[0][rate]" placeholder="<?php echo (float)wpinv_get_option( 'tax_rate', 0 ) ;?>" value="<?php echo (float)wpinv_get_option( 'tax_rate', 0 ) ;?>"/></td>
+				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[0][rate]" placeholder="<?php echo (float)wpinv_get_option('tax_rate', 0); ?>" value="<?php echo (float)wpinv_get_option('tax_rate', 0); ?>"/></td>
                 <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[0][name]" /></td>
-				<td><span class="wpinv_remove_tax_rate button-secondary"><?php _e( 'Remove Rate', 'invoicing' ); ?></span></td>
+				<td><span class="wpinv_remove_tax_rate button-secondary"><?php _e('Remove Rate', 'invoicing'); ?></span></td>
 			</tr>
 		<?php endif; ?>
         </tbody>
-        <tfoot><tr><td colspan="5"></td><td class="wpinv_tax_action"><span class="button-secondary" id="wpinv_add_tax_rate"><?php _e( 'Add Tax Rate', 'invoicing' ); ?></span></td></tr></tfoot>
+        <tfoot><tr><td colspan="5"></td><td class="wpinv_tax_action"><span class="button-secondary" id="wpinv_add_tax_rate"><?php _e('Add Tax Rate', 'invoicing'); ?></span></td></tr></tfoot>
 	</table>
 	<?php
 	echo ob_get_clean();
@@ -1451,54 +1451,54 @@ 
     ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
-    <?php if ( $args['desc'] ) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+    <?php if ($args['desc']) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php _e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php _e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php _e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php _e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php _e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php _e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
-            <?php do_action( 'wpinv_tools_row' ); ?>
+            <?php do_action('wpinv_tools_row'); ?>
         <tbody>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
     echo ob_get_clean();
 }
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return 'manage_options';
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
-function wpinv_settings_sanitize_input( $value, $key ) {
-    if ( $key == 'tax_rate' || $key == 'eu_fallback_rate' ) {
-        $value = wpinv_sanitize_amount( $value, 4 );
+function wpinv_settings_sanitize_input($value, $key) {
+    if ($key == 'tax_rate' || $key == 'eu_fallback_rate') {
+        $value = wpinv_sanitize_amount($value, 4);
         $value = $value >= 100 ? 99 : $value;
     }
         
     return $value;
 }
-add_filter( 'wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2 );
+add_filter('wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2);
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = !empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = !empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
     
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
\ No newline at end of file
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
\ No newline at end of file

includes/wpinv-helper-functions.php

Spacing +364 added lines, -364 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' => '&#x62f;.&#x625;',
         'AFN' => '&#x60b;',
         'ALL' => 'L',
@@ -291,208 +291,208 @@ 
         'YER' => '&#xfdfc;',
         'ZAR' => '&#82;',
         'ZMW' => 'ZK',
-    ) );
+    ));
 
-    $currency_symbol = isset( $symbols[$currency] ) ? $symbols[$currency] : $currency;
+    $currency_symbol = isset($symbols[$currency]) ? $symbols[$currency] : $currency;
 
-    return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
+    return apply_filters('wpinv_currency_symbol', $currency_symbol, $currency);
 }
 
 function wpinv_currency_position() {
-    $position = wpinv_get_option( 'currency_position', 'left' );
+    $position = wpinv_get_option('currency_position', 'left');
     
-    return apply_filters( 'wpinv_currency_position', $position );
+    return apply_filters('wpinv_currency_position', $position);
 }
 
 function wpinv_thousands_separator() {
-    $thousand_sep = wpinv_get_option( 'thousands_separator', ',' );
+    $thousand_sep = wpinv_get_option('thousands_separator', ',');
     
-    return apply_filters( 'wpinv_thousands_separator', $thousand_sep );
+    return apply_filters('wpinv_thousands_separator', $thousand_sep);
 }
 
 function wpinv_decimal_separator() {
-    $decimal_sep = wpinv_get_option( 'decimal_separator', '.' );
+    $decimal_sep = wpinv_get_option('decimal_separator', '.');
     
-    return apply_filters( 'wpinv_decimal_separator', $decimal_sep );
+    return apply_filters('wpinv_decimal_separator', $decimal_sep);
 }
 
 function wpinv_decimals() {
-    $decimals = apply_filters( 'wpinv_decimals', wpinv_get_option( 'decimals', 2 ) );
+    $decimals = apply_filters('wpinv_decimals', wpinv_get_option('decimals', 2));
     
-    return absint( $decimals );
+    return absint($decimals);
 }
 
 function wpinv_get_currencies() {
     $currencies = array(
-        'USD' => __( 'US Dollar', 'invoicing' ),
-        'EUR' => __( 'Euro', 'invoicing' ),
-        'GBP' => __( 'Pound Sterling', 'invoicing' ),
-        'AFN' => __( 'Afghan Afghani', 'invoicing' ),
-        'ALL' => __( 'Albanian Lek', 'invoicing' ),
-        'AMD' => __( 'Armenian Dram', 'invoicing' ),
-        'ANG' => __( 'Netherlands Antillean Guilder', 'invoicing' ),
-        'AOA' => __( 'Angolan Kwanza', 'invoicing' ),
-        'ARS' => __( 'Argentine Peso', 'invoicing' ),
-        'AUD' => __( 'Australian Dollar', 'invoicing' ),
-        'AWG' => __( 'Aruban Florin', 'invoicing' ),
-        'AZN' => __( 'Azerbaijani Manat', 'invoicing' ),
-        'BAM' => __( 'Bosnia and Herzegovina Convertible Marka', 'invoicing' ),
-        'BBD' => __( 'Barbadian Dollar', 'invoicing' ),
-        'BDT' => __( 'Bangladeshi Taka', 'invoicing' ),
-        'BGN' => __( 'Bulgarian Lev', 'invoicing' ),
-        'BHD' => __( 'Bahraini Dinar', 'invoicing' ),
-        'BIF' => __( 'Burundian Franc', 'invoicing' ),
-        'BMD' => __( 'Bermudian Dollar', 'invoicing' ),
-        'BND' => __( 'Brunei Dollar', 'invoicing' ),
-        'BOB' => __( 'Bolivian Boliviano', 'invoicing' ),
-        'BRL' => __( 'Brazilian Real', 'invoicing' ),
-        'BSD' => __( 'Bahamian Dollar', 'invoicing' ),
-        'BTC' => __( 'Bitcoin', 'invoicing' ),
-        'BTN' => __( 'Bhutanese Ngultrum', 'invoicing' ),
-        'BWP' => __( 'Botswana Pula', 'invoicing' ),
-        'BYR' => __( 'Belarusian Ruble', 'invoicing' ),
-        'BZD' => __( 'Belize Dollar', 'invoicing' ),
-        'CAD' => __( 'Canadian Dollar', 'invoicing' ),
-        'CDF' => __( 'Congolese Franc', 'invoicing' ),
-        'CHF' => __( 'Swiss Franc', 'invoicing' ),
-        'CLP' => __( 'Chilean Peso', 'invoicing' ),
-        'CNY' => __( 'Chinese Yuan', 'invoicing' ),
-        'COP' => __( 'Colombian Peso', 'invoicing' ),
-        'CRC' => __( 'Costa Rican Colon', 'invoicing' ),
-        'CUC' => __( 'Cuban Convertible Peso', 'invoicing' ),
-        'CUP' => __( 'Cuban Peso', 'invoicing' ),
-        'CVE' => __( 'Cape Verdean escudo', 'invoicing' ),
-        'CZK' => __( 'Czech Koruna', 'invoicing' ),
-        'DJF' => __( 'Djiboutian Franc', 'invoicing' ),
-        'DKK' => __( 'Danish Krone', 'invoicing' ),
-        'DOP' => __( 'Dominican Peso', 'invoicing' ),
-        'DZD' => __( 'Algerian Dinar', 'invoicing' ),
-        'EGP' => __( 'Egyptian Pound', 'invoicing' ),
-        'ERN' => __( 'Eritrean Nakfa', 'invoicing' ),
-        'ETB' => __( 'Ethiopian irr', 'invoicing' ),
-        'FJD' => __( 'Fijian Dollar', 'invoicing' ),
-        'FKP' => __( 'Falkland Islands Pound', 'invoicing' ),
-        'GEL' => __( 'Georgian lari', 'invoicing' ),
-        'GGP' => __( 'Guernsey Pound', 'invoicing' ),
-        'GHS' => __( 'Ghana cedi', 'invoicing' ),
-        'GIP' => __( 'Gibraltar Pound', 'invoicing' ),
-        'GMD' => __( 'Gambian Dalasi', 'invoicing' ),
-        'GNF' => __( 'Guinean Franc', 'invoicing' ),
-        'GTQ' => __( 'Guatemalan Quetzal', 'invoicing' ),
-        'GYD' => __( 'Guyanese Dollar', 'invoicing' ),
-        'HKD' => __( 'Hong Kong Dollar', 'invoicing' ),
-        'HNL' => __( 'Honduran Lempira', 'invoicing' ),
-        'HRK' => __( 'Croatian Kuna', 'invoicing' ),
-        'HTG' => __( 'Haitian Gourde', 'invoicing' ),
-        'HUF' => __( 'Hungarian Forint', 'invoicing' ),
-        'IDR' => __( 'Indonesian Rupiah', 'invoicing' ),
-        'ILS' => __( 'Israeli New Shekel', 'invoicing' ),
-        'IMP' => __( 'Manx Pound', 'invoicing' ),
-        'INR' => __( 'Indian Rupee', 'invoicing' ),
-        'IQD' => __( 'Iraqi Dinar', 'invoicing' ),
-        'IRR' => __( 'Iranian Rial', 'invoicing' ),
-        'IRT' => __( 'Iranian Toman', 'invoicing' ),
-        'ISK' => __( 'Icelandic Krona', 'invoicing' ),
-        'JEP' => __( 'Jersey Pound', 'invoicing' ),
-        'JMD' => __( 'Jamaican Dollar', 'invoicing' ),
-        'JOD' => __( 'Jordanian Dinar', 'invoicing' ),
-        'JPY' => __( 'Japanese Yen', 'invoicing' ),
-        'KES' => __( 'Kenyan Shilling', 'invoicing' ),
-        'KGS' => __( 'Kyrgyzstani Som', 'invoicing' ),
-        'KHR' => __( 'Cambodian Riel', 'invoicing' ),
-        'KMF' => __( 'Comorian Franc', 'invoicing' ),
-        'KPW' => __( 'North Korean Won', 'invoicing' ),
-        'KRW' => __( 'South Korean Won', 'invoicing' ),
-        'KWD' => __( 'Kuwaiti Dinar', 'invoicing' ),
-        'KYD' => __( 'Cayman Islands Dollar', 'invoicing' ),
-        'KZT' => __( 'Kazakhstani Tenge', 'invoicing' ),
-        'LAK' => __( 'Lao Kip', 'invoicing' ),
-        'LBP' => __( 'Lebanese Pound', 'invoicing' ),
-        'LKR' => __( 'Sri Lankan Rupee', 'invoicing' ),
-        'LRD' => __( 'Liberian Dollar', 'invoicing' ),
-        'LSL' => __( 'Lesotho Loti', 'invoicing' ),
-        'LYD' => __( 'Libyan Dinar', 'invoicing' ),
-        'MAD' => __( 'Moroccan Dirham', 'invoicing' ),
-        'MDL' => __( 'Moldovan Leu', 'invoicing' ),
-        'MGA' => __( 'Malagasy Ariary', 'invoicing' ),
-        'MKD' => __( 'Macedonian Denar', 'invoicing' ),
-        'MMK' => __( 'Burmese Kyat', 'invoicing' ),
-        'MNT' => __( 'Mongolian Tughrik', 'invoicing' ),
-        'MOP' => __( 'Macanese Pataca', 'invoicing' ),
-        'MRO' => __( 'Mauritanian Ouguiya', 'invoicing' ),
-        'MUR' => __( 'Mauritian Rupee', 'invoicing' ),
-        'MVR' => __( 'Maldivian Rufiyaa', 'invoicing' ),
-        'MWK' => __( 'Malawian Kwacha', 'invoicing' ),
-        'MXN' => __( 'Mexican Peso', 'invoicing' ),
-        'MYR' => __( 'Malaysian Ringgit', 'invoicing' ),
-        'MZN' => __( 'Mozambican Metical', 'invoicing' ),
-        'NAD' => __( 'Namibian Dollar', 'invoicing' ),
-        'NGN' => __( 'Nigerian Naira', 'invoicing' ),
-        'NIO' => __( 'Nicaraguan Cordoba', 'invoicing' ),
-        'NOK' => __( 'Norwegian Krone', 'invoicing' ),
-        'NPR' => __( 'Nepalese Rupee', 'invoicing' ),
-        'NZD' => __( 'New Zealand Dollar', 'invoicing' ),
-        'OMR' => __( 'Omani Rial', 'invoicing' ),
-        'PAB' => __( 'Panamanian Balboa', 'invoicing' ),
-        'PEN' => __( 'Peruvian Nuevo Sol', 'invoicing' ),
-        'PGK' => __( 'Papua New Guinean Kina', 'invoicing' ),
-        'PHP' => __( 'Philippine Peso', 'invoicing' ),
-        'PKR' => __( 'Pakistani Rupee', 'invoicing' ),
-        'PLN' => __( 'Polish Zloty', 'invoicing' ),
-        'PRB' => __( 'Transnistrian Ruble', 'invoicing' ),
-        'PYG' => __( 'Paraguayan Guarani', 'invoicing' ),
-        'QAR' => __( 'Qatari Riyal', 'invoicing' ),
-        'RON' => __( 'Romanian Leu', 'invoicing' ),
-        'RSD' => __( 'Serbian Dinar', 'invoicing' ),
-        'RUB' => __( 'Russian Ruble', 'invoicing' ),
-        'RWF' => __( 'Rwandan Franc', 'invoicing' ),
-        'SAR' => __( 'Saudi Riyal', 'invoicing' ),
-        'SBD' => __( 'Solomon Islands Dollar', 'invoicing' ),
-        'SCR' => __( 'Seychellois Rupee', 'invoicing' ),
-        'SDG' => __( 'Sudanese Pound', 'invoicing' ),
-        'SEK' => __( 'Swedish Krona', 'invoicing' ),
-        'SGD' => __( 'Singapore Dollar', 'invoicing' ),
-        'SHP' => __( 'Saint Helena Pound', 'invoicing' ),
-        'SLL' => __( 'Sierra Leonean Leone', 'invoicing' ),
-        'SOS' => __( 'Somali Shilling', 'invoicing' ),
-        'SRD' => __( 'Surinamese Dollar', 'invoicing' ),
-        'SSP' => __( 'South Sudanese Pound', 'invoicing' ),
-        'STD' => __( 'Sao Tomean Dobra', 'invoicing' ),
-        'SYP' => __( 'Syrian Pound', 'invoicing' ),
-        'SZL' => __( 'Swazi Lilangeni', 'invoicing' ),
-        'THB' => __( 'Thai Baht', 'invoicing' ),
-        'TJS' => __( 'Tajikistani Somoni', 'invoicing' ),
-        'TMT' => __( 'Turkmenistan Manat', 'invoicing' ),
-        'TND' => __( 'Tunisian Dinar', 'invoicing' ),
-        'TOP' => __( 'Tongan Pa&#x2bb;anga', 'invoicing' ),
-        'TRY' => __( 'Turkish Lira', 'invoicing' ),
-        'TTD' => __( 'Trinidad and Tobago Dollar', 'invoicing' ),
-        'TWD' => __( 'New Taiwan Dollar', 'invoicing' ),
-        'TZS' => __( 'Tanzanian Shilling', 'invoicing' ),
-        'UAH' => __( 'Ukrainian Hryvnia', 'invoicing' ),
-        'UGX' => __( 'Ugandan Shilling', 'invoicing' ),
-        'UYU' => __( 'Uruguayan Peso', 'invoicing' ),
-        'UZS' => __( 'Uzbekistani Som', 'invoicing' ),
-        'VEF' => __( 'Venezuelan Bol&iacute;var', 'invoicing' ),
-        'VND' => __( 'Vietnamese Dong', 'invoicing' ),
-        'VUV' => __( 'Vanuatu Vatu', 'invoicing' ),
-        'WST' => __( 'Samoan Tala', 'invoicing' ),
-        'XAF' => __( 'Central African CFA Franc', 'invoicing' ),
-        'XCD' => __( 'East Caribbean Dollar', 'invoicing' ),
-        'XOF' => __( 'West African CFA Franc', 'invoicing' ),
-        'XPF' => __( 'CFP Franc', 'invoicing' ),
-        'YER' => __( 'Yemeni Rial', 'invoicing' ),
-        'ZAR' => __( 'South African Rand', 'invoicing' ),
-        'ZMW' => __( 'Zambian Kwacha', 'invoicing' ),
+        'USD' => __('US Dollar', 'invoicing'),
+        'EUR' => __('Euro', 'invoicing'),
+        'GBP' => __('Pound Sterling', 'invoicing'),
+        'AFN' => __('Afghan Afghani', 'invoicing'),
+        'ALL' => __('Albanian Lek', 'invoicing'),
+        'AMD' => __('Armenian Dram', 'invoicing'),
+        'ANG' => __('Netherlands Antillean Guilder', 'invoicing'),
+        'AOA' => __('Angolan Kwanza', 'invoicing'),
+        'ARS' => __('Argentine Peso', 'invoicing'),
+        'AUD' => __('Australian Dollar', 'invoicing'),
+        'AWG' => __('Aruban Florin', 'invoicing'),
+        'AZN' => __('Azerbaijani Manat', 'invoicing'),
+        'BAM' => __('Bosnia and Herzegovina Convertible Marka', 'invoicing'),
+        'BBD' => __('Barbadian Dollar', 'invoicing'),
+        'BDT' => __('Bangladeshi Taka', 'invoicing'),
+        'BGN' => __('Bulgarian Lev', 'invoicing'),
+        'BHD' => __('Bahraini Dinar', 'invoicing'),
+        'BIF' => __('Burundian Franc', 'invoicing'),
+        'BMD' => __('Bermudian Dollar', 'invoicing'),
+        'BND' => __('Brunei Dollar', 'invoicing'),
+        'BOB' => __('Bolivian Boliviano', 'invoicing'),
+        'BRL' => __('Brazilian Real', 'invoicing'),
+        'BSD' => __('Bahamian Dollar', 'invoicing'),
+        'BTC' => __('Bitcoin', 'invoicing'),
+        'BTN' => __('Bhutanese Ngultrum', 'invoicing'),
+        'BWP' => __('Botswana Pula', 'invoicing'),
+        'BYR' => __('Belarusian Ruble', 'invoicing'),
+        'BZD' => __('Belize Dollar', 'invoicing'),
+        'CAD' => __('Canadian Dollar', 'invoicing'),
+        'CDF' => __('Congolese Franc', 'invoicing'),
+        'CHF' => __('Swiss Franc', 'invoicing'),
+        'CLP' => __('Chilean Peso', 'invoicing'),
+        'CNY' => __('Chinese Yuan', 'invoicing'),
+        'COP' => __('Colombian Peso', 'invoicing'),
+        'CRC' => __('Costa Rican Colon', 'invoicing'),
+        'CUC' => __('Cuban Convertible Peso', 'invoicing'),
+        'CUP' => __('Cuban Peso', 'invoicing'),
+        'CVE' => __('Cape Verdean escudo', 'invoicing'),
+        'CZK' => __('Czech Koruna', 'invoicing'),
+        'DJF' => __('Djiboutian Franc', 'invoicing'),
+        'DKK' => __('Danish Krone', 'invoicing'),
+        'DOP' => __('Dominican Peso', 'invoicing'),
+        'DZD' => __('Algerian Dinar', 'invoicing'),
+        'EGP' => __('Egyptian Pound', 'invoicing'),
+        'ERN' => __('Eritrean Nakfa', 'invoicing'),
+        'ETB' => __('Ethiopian irr', 'invoicing'),
+        'FJD' => __('Fijian Dollar', 'invoicing'),
+        'FKP' => __('Falkland Islands Pound', 'invoicing'),
+        'GEL' => __('Georgian lari', 'invoicing'),
+        'GGP' => __('Guernsey Pound', 'invoicing'),
+        'GHS' => __('Ghana cedi', 'invoicing'),
+        'GIP' => __('Gibraltar Pound', 'invoicing'),
+        'GMD' => __('Gambian Dalasi', 'invoicing'),
+        'GNF' => __('Guinean Franc', 'invoicing'),
+        'GTQ' => __('Guatemalan Quetzal', 'invoicing'),
+        'GYD' => __('Guyanese Dollar', 'invoicing'),
+        'HKD' => __('Hong Kong Dollar', 'invoicing'),
+        'HNL' => __('Honduran Lempira', 'invoicing'),
+        'HRK' => __('Croatian Kuna', 'invoicing'),
+        'HTG' => __('Haitian Gourde', 'invoicing'),
+        'HUF' => __('Hungarian Forint', 'invoicing'),
+        'IDR' => __('Indonesian Rupiah', 'invoicing'),
+        'ILS' => __('Israeli New Shekel', 'invoicing'),
+        'IMP' => __('Manx Pound', 'invoicing'),
+        'INR' => __('Indian Rupee', 'invoicing'),
+        'IQD' => __('Iraqi Dinar', 'invoicing'),
+        'IRR' => __('Iranian Rial', 'invoicing'),
+        'IRT' => __('Iranian Toman', 'invoicing'),
+        'ISK' => __('Icelandic Krona', 'invoicing'),
+        'JEP' => __('Jersey Pound', 'invoicing'),
+        'JMD' => __('Jamaican Dollar', 'invoicing'),
+        'JOD' => __('Jordanian Dinar', 'invoicing'),
+        'JPY' => __('Japanese Yen', 'invoicing'),
+        'KES' => __('Kenyan Shilling', 'invoicing'),
+        'KGS' => __('Kyrgyzstani Som', 'invoicing'),
+        'KHR' => __('Cambodian Riel', 'invoicing'),
+        'KMF' => __('Comorian Franc', 'invoicing'),
+        'KPW' => __('North Korean Won', 'invoicing'),
+        'KRW' => __('South Korean Won', 'invoicing'),
+        'KWD' => __('Kuwaiti Dinar', 'invoicing'),
+        'KYD' => __('Cayman Islands Dollar', 'invoicing'),
+        'KZT' => __('Kazakhstani Tenge', 'invoicing'),
+        'LAK' => __('Lao Kip', 'invoicing'),
+        'LBP' => __('Lebanese Pound', 'invoicing'),
+        'LKR' => __('Sri Lankan Rupee', 'invoicing'),
+        'LRD' => __('Liberian Dollar', 'invoicing'),
+        'LSL' => __('Lesotho Loti', 'invoicing'),
+        'LYD' => __('Libyan Dinar', 'invoicing'),
+        'MAD' => __('Moroccan Dirham', 'invoicing'),
+        'MDL' => __('Moldovan Leu', 'invoicing'),
+        'MGA' => __('Malagasy Ariary', 'invoicing'),
+        'MKD' => __('Macedonian Denar', 'invoicing'),
+        'MMK' => __('Burmese Kyat', 'invoicing'),
+        'MNT' => __('Mongolian Tughrik', 'invoicing'),
+        'MOP' => __('Macanese Pataca', 'invoicing'),
+        'MRO' => __('Mauritanian Ouguiya', 'invoicing'),
+        'MUR' => __('Mauritian Rupee', 'invoicing'),
+        'MVR' => __('Maldivian Rufiyaa', 'invoicing'),
+        'MWK' => __('Malawian Kwacha', 'invoicing'),
+        'MXN' => __('Mexican Peso', 'invoicing'),
+        'MYR' => __('Malaysian Ringgit', 'invoicing'),
+        'MZN' => __('Mozambican Metical', 'invoicing'),
+        'NAD' => __('Namibian Dollar', 'invoicing'),
+        'NGN' => __('Nigerian Naira', 'invoicing'),
+        'NIO' => __('Nicaraguan Cordoba', 'invoicing'),
+        'NOK' => __('Norwegian Krone', 'invoicing'),
+        'NPR' => __('Nepalese Rupee', 'invoicing'),
+        'NZD' => __('New Zealand Dollar', 'invoicing'),
+        'OMR' => __('Omani Rial', 'invoicing'),
+        'PAB' => __('Panamanian Balboa', 'invoicing'),
+        'PEN' => __('Peruvian Nuevo Sol', 'invoicing'),
+        'PGK' => __('Papua New Guinean Kina', 'invoicing'),
+        'PHP' => __('Philippine Peso', 'invoicing'),
+        'PKR' => __('Pakistani Rupee', 'invoicing'),
+        'PLN' => __('Polish Zloty', 'invoicing'),
+        'PRB' => __('Transnistrian Ruble', 'invoicing'),
+        'PYG' => __('Paraguayan Guarani', 'invoicing'),
+        'QAR' => __('Qatari Riyal', 'invoicing'),
+        'RON' => __('Romanian Leu', 'invoicing'),
+        'RSD' => __('Serbian Dinar', 'invoicing'),
+        'RUB' => __('Russian Ruble', 'invoicing'),
+        'RWF' => __('Rwandan Franc', 'invoicing'),
+        'SAR' => __('Saudi Riyal', 'invoicing'),
+        'SBD' => __('Solomon Islands Dollar', 'invoicing'),
+        'SCR' => __('Seychellois Rupee', 'invoicing'),
+        'SDG' => __('Sudanese Pound', 'invoicing'),
+        'SEK' => __('Swedish Krona', 'invoicing'),
+        'SGD' => __('Singapore Dollar', 'invoicing'),
+        'SHP' => __('Saint Helena Pound', 'invoicing'),
+        'SLL' => __('Sierra Leonean Leone', 'invoicing'),
+        'SOS' => __('Somali Shilling', 'invoicing'),
+        'SRD' => __('Surinamese Dollar', 'invoicing'),
+        'SSP' => __('South Sudanese Pound', 'invoicing'),
+        'STD' => __('Sao Tomean Dobra', 'invoicing'),
+        'SYP' => __('Syrian Pound', 'invoicing'),
+        'SZL' => __('Swazi Lilangeni', 'invoicing'),
+        'THB' => __('Thai Baht', 'invoicing'),
+        'TJS' => __('Tajikistani Somoni', 'invoicing'),
+        'TMT' => __('Turkmenistan Manat', 'invoicing'),
+        'TND' => __('Tunisian Dinar', 'invoicing'),
+        'TOP' => __('Tongan Pa&#x2bb;anga', 'invoicing'),
+        'TRY' => __('Turkish Lira', 'invoicing'),
+        'TTD' => __('Trinidad and Tobago Dollar', 'invoicing'),
+        'TWD' => __('New Taiwan Dollar', 'invoicing'),
+        'TZS' => __('Tanzanian Shilling', 'invoicing'),
+        'UAH' => __('Ukrainian Hryvnia', 'invoicing'),
+        'UGX' => __('Ugandan Shilling', 'invoicing'),
+        'UYU' => __('Uruguayan Peso', 'invoicing'),
+        'UZS' => __('Uzbekistani Som', 'invoicing'),
+        'VEF' => __('Venezuelan Bol&iacute;var', 'invoicing'),
+        'VND' => __('Vietnamese Dong', 'invoicing'),
+        'VUV' => __('Vanuatu Vatu', 'invoicing'),
+        'WST' => __('Samoan Tala', 'invoicing'),
+        'XAF' => __('Central African CFA Franc', 'invoicing'),
+        'XCD' => __('East Caribbean Dollar', 'invoicing'),
+        'XOF' => __('West African CFA Franc', 'invoicing'),
+        'XPF' => __('CFP Franc', 'invoicing'),
+        'YER' => __('Yemeni Rial', 'invoicing'),
+        'ZAR' => __('South African Rand', 'invoicing'),
+        'ZMW' => __('Zambian Kwacha', 'invoicing'),
     );
     
     //asort( $currencies ); // this
 
-    return apply_filters( 'wpinv_currencies', $currencies );
+    return apply_filters('wpinv_currencies', $currencies);
 }
 
-function wpinv_price( $amount = '', $currency = '' ) {
-    if( empty( $currency ) ) {
+function wpinv_price($amount = '', $currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
@@ -500,14 +500,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" :
@@ -519,15 +519,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" :
@@ -538,83 +538,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;
@@ -630,32 +630,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;
         }
     }
@@ -663,65 +663,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;
@@ -730,18 +730,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;
@@ -750,22 +750,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];
     }
 
@@ -785,12 +785,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;
 }
 
 /**
@@ -802,28 +802,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);
 }
 
 /**
@@ -837,12 +837,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);
 }
 
 /**
@@ -856,12 +856,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);
 }
 
 /**
@@ -876,16 +876,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);
 }
 
 /**
@@ -897,48 +897,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;
         }
     }

uninstall.php

Spacing +19 added lines, -19 removed lines

@@ -9,58 +9,58 @@
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
     exit;
 }
 
 global $wpdb, $wp_version;
 
-$remove_data = get_option( 'wpinv_remove_data_on_invoice_unistall' );
+$remove_data = get_option('wpinv_remove_data_on_invoice_unistall');
 
 /*
  * Only remove ALL product and page data if WPINV_REMOVE_ALL_DATA constant is set to true in user's
  * wp-config.php. This is to prevent data loss when deleting the plugin from the backend
  * and to ensure only the site owner can perform this action.
  */
-if ( defined( 'WPINV_REMOVE_ALL_DATA' ) ) {
+if (defined('WPINV_REMOVE_ALL_DATA')) {
     $remove_data = true === WPINV_REMOVE_ALL_DATA ? true : false;
 }
 
-if ( $remove_data ) {
+if ($remove_data) {
     // Load Invoicing file.
-    include_once( 'invoicing.php' );
+    include_once('invoicing.php');
 
     // Roles + caps.
-    include_once( dirname( __FILE__ ) . '/includes/admin/install.php' );
+    include_once(dirname(__FILE__) . '/includes/admin/install.php');
     wpinv_remove_admin_caps();
     
-    $settings = get_option( 'wpinv_settings' );
+    $settings = get_option('wpinv_settings');
     
     // Delete pages.
-    $wpi_pages = array( 'checkout_page', 'success_page', 'failure_page', 'invoice_history_page', 'quote_history_page' );
-    foreach ( $wpi_pages as $page ) {
-        if ( !empty( $page ) && !empty( $settings[ $page ] ) ) {
-            wp_delete_post( $settings[ $page ], true );
+    $wpi_pages = array('checkout_page', 'success_page', 'failure_page', 'invoice_history_page', 'quote_history_page');
+    foreach ($wpi_pages as $page) {
+        if (!empty($page) && !empty($settings[$page])) {
+            wp_delete_post($settings[$page], true);
         }
     }
     
     // Delete posts + data.
-    $wpdb->query( "DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'wpi_invoice', 'wpi_item', 'wpi_discount', 'wpi_quote' );" );
-    $wpdb->query( "DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;" );
+    $wpdb->query("DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'wpi_invoice', 'wpi_item', 'wpi_discount', 'wpi_quote' );");
+    $wpdb->query("DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;");
     
     // Delete comments.
-    $wpdb->query( "DELETE FROM {$wpdb->comments} WHERE comment_type LIKE 'wpinv_note';" );
-    $wpdb->query( "DELETE meta FROM {$wpdb->commentmeta} meta LEFT JOIN {$wpdb->comments} comments ON comments.comment_ID = meta.comment_id WHERE comments.comment_ID IS NULL;" );
+    $wpdb->query("DELETE FROM {$wpdb->comments} WHERE comment_type LIKE 'wpinv_note';");
+    $wpdb->query("DELETE meta FROM {$wpdb->commentmeta} meta LEFT JOIN {$wpdb->comments} comments ON comments.comment_ID = meta.comment_id WHERE comments.comment_ID IS NULL;");
     
     // Delete user meta.
-    $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE '%_wpinv_%' OR meta_key LIKE '%_wpi_invoice%' OR meta_key LIKE '%_wpi_item%' OR meta_key LIKE '%_wpi_discount%' OR meta_key LIKE '_wpi_stripe%' OR meta_key LIKE '%_wpi_quote%';" );
+    $wpdb->query("DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE '%_wpinv_%' OR meta_key LIKE '%_wpi_invoice%' OR meta_key LIKE '%_wpi_item%' OR meta_key LIKE '%_wpi_discount%' OR meta_key LIKE '_wpi_stripe%' OR meta_key LIKE '%_wpi_quote%';");
     
     // Cleanup Cron Schedule
-    wp_clear_scheduled_hook( 'wp_session_garbage_collection' );
-    wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
+    wp_clear_scheduled_hook('wp_session_garbage_collection');
+    wp_clear_scheduled_hook('wpinv_register_schedule_event_twicedaily');
     
     // Delete options.
-    $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpinv_%' OR option_name LIKE '_wpinv_%' OR option_name LIKE '\_transient\_wpinv\_%';" );
+    $wpdb->query("DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpinv_%' OR option_name LIKE '_wpinv_%' OR option_name LIKE '\_transient\_wpinv\_%';");
     
     // Clear any cached data that has been removed
     wp_cache_flush();

includes/gateways/paypal.php

Spacing +259 added lines, -259 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_paypal_cc_form', '__return_false' );
-add_filter( 'wpinv_paypal_support_subscription', '__return_true' );
+add_action('wpinv_paypal_cc_form', '__return_false');
+add_filter('wpinv_paypal_support_subscription', '__return_true');
 
-function wpinv_process_paypal_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_paypal_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     // Collect payment data
@@ -25,30 +25,30 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
 
     // Check payment
-    if ( ! $invoice ) {
+    if (!$invoice) {
         // Record the error
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $payment );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing'), json_encode($payment_data)), $payment);
         // Problems? send back
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     } else {
         // Only send to PayPal if the pending payment is created successfully
-        $listener_url = wpinv_get_ipn_url( 'paypal' );
+        $listener_url = wpinv_get_ipn_url('paypal');
 
         // Get the success url
-        $return_url = add_query_arg( array(
+        $return_url = add_query_arg(array(
                 'payment-confirm' => 'paypal',
                 'invoice-id' => $invoice->ID
-            ), get_permalink( wpinv_get_option( 'success_page', false ) ) );
+            ), get_permalink(wpinv_get_option('success_page', false)));
 
         // Get the PayPal redirect uri
-        $paypal_redirect = trailingslashit( wpinv_get_paypal_redirect() ) . '?';
+        $paypal_redirect = trailingslashit(wpinv_get_paypal_redirect()) . '?';
 
         // Setup PayPal arguments
         $paypal_args = array(
-            'business'      => wpinv_get_option( 'paypal_email', false ),
+            'business'      => wpinv_get_option('paypal_email', false),
             'email'         => $invoice->get_email(),
             'first_name'    => $invoice->get_first_name(),
             'last_name'     => $invoice->get_last_name(),
@@ -57,16 +57,16 @@ 
             'shipping'      => '0',
             'no_note'       => '1',
             'currency_code' => wpinv_get_currency(),
-            'charset'       => get_bloginfo( 'charset' ),
+            'charset'       => get_bloginfo('charset'),
             'custom'        => $invoice->ID,
             'rm'            => '2',
             'return'        => $return_url,
-            'cancel_return' => wpinv_get_failed_transaction_uri( '?invoice-id=' . $invoice->ID ),
+            'cancel_return' => wpinv_get_failed_transaction_uri('?invoice-id=' . $invoice->ID),
             'notify_url'    => $listener_url,
-            'cbt'           => get_bloginfo( 'name' ),
+            'cbt'           => get_bloginfo('name'),
             'bn'            => 'WPInvoicing_SP',
             'lc'            => 'US', // this will force paypal site to english
-            'landing_page'  => apply_filters( 'wpinv_paypal_standard_landing_page', 'billing', $invoice ), // 'login' or 'billing'. login - PayPal account login, billing - Non-PayPal account.
+            'landing_page'  => apply_filters('wpinv_paypal_standard_landing_page', 'billing', $invoice), // 'login' or 'billing'. login - PayPal account login, billing - Non-PayPal account.
         );
 
         $paypal_args['address1'] = $invoice->get_address();
@@ -80,57 +80,57 @@ 
             'upload' => '1'
         );
 
-        $paypal_args = array_merge( $paypal_extra_args, $paypal_args );
+        $paypal_args = array_merge($paypal_extra_args, $paypal_args);
 
         // Add cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {
                 $item['quantity'] = $item['quantity'] > 0 ? $item['quantity'] : 1;
-                $item_amount = wpinv_sanitize_amount( $item['subtotal'] / $item['quantity'], 2 );
+                $item_amount = wpinv_sanitize_amount($item['subtotal'] / $item['quantity'], 2);
 
-                if ( $item_amount <= 0 ) {
+                if ($item_amount <= 0) {
                     $item_amount = 0;
                 }
 
-                $paypal_args['item_number_' . $i ]      = $item['id'];
-                $paypal_args['item_name_' . $i ]        = stripslashes_deep( html_entity_decode( wpinv_get_cart_item_name( $item ), ENT_COMPAT, 'UTF-8' ) );
-                $paypal_args['quantity_' . $i ]         = $item['quantity'];
-                $paypal_args['amount_' . $i ]           = $item_amount;
-                $paypal_args['discount_amount_' . $i ]  = wpinv_sanitize_amount( $item['discount'], 2 );
+                $paypal_args['item_number_' . $i]      = $item['id'];
+                $paypal_args['item_name_' . $i]        = stripslashes_deep(html_entity_decode(wpinv_get_cart_item_name($item), ENT_COMPAT, 'UTF-8'));
+                $paypal_args['quantity_' . $i]         = $item['quantity'];
+                $paypal_args['amount_' . $i]           = $item_amount;
+                $paypal_args['discount_amount_' . $i]  = wpinv_sanitize_amount($item['discount'], 2);
 
                 $i++;
             }
         }
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() ) {
-            $paypal_args['tax_cart'] = wpinv_sanitize_amount( (float)$invoice->get_tax(), 2 );
+        if (wpinv_use_taxes()) {
+            $paypal_args['tax_cart'] = wpinv_sanitize_amount((float)$invoice->get_tax(), 2);
         }
 
-        $paypal_args = apply_filters( 'wpinv_paypal_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_args', $paypal_args, $purchase_data, $invoice);
 
         // Build query
-        $paypal_redirect .= http_build_query( $paypal_args );
+        $paypal_redirect .= http_build_query($paypal_args);
 
         // Fix for some sites that encode the entities
-        $paypal_redirect = str_replace( '&amp;', '&', $paypal_redirect );
+        $paypal_redirect = str_replace('&amp;', '&', $paypal_redirect);
 
         // Get rid of cart contents
         wpinv_empty_cart();
         
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
     }
 }
-add_action( 'wpinv_gateway_paypal', 'wpinv_process_paypal_payment' );
+add_action('wpinv_gateway_paypal', 'wpinv_process_paypal_payment');
 
-function wpinv_get_paypal_recurring_args( $paypal_args, $purchase_data, $invoice ) {
-    if ( $invoice->is_recurring() && $item_id = $invoice->get_recurring() ) {
-        $item   = new WPInv_Item( $item_id );
+function wpinv_get_paypal_recurring_args($paypal_args, $purchase_data, $invoice) {
+    if ($invoice->is_recurring() && $item_id = $invoice->get_recurring()) {
+        $item = new WPInv_Item($item_id);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return $paypal_args;
         }
 
@@ -138,24 +138,24 @@ 
         $interval           = $item->get_recurring_interval();
         $bill_times         = (int)$item->get_recurring_limit();
         
-        $initial_amount     = wpinv_sanitize_amount( $invoice->get_total(), 2 );
-        $recurring_amount   = wpinv_sanitize_amount( $invoice->get_recurring_details( 'total' ), 2 );
+        $initial_amount     = wpinv_sanitize_amount($invoice->get_total(), 2);
+        $recurring_amount   = wpinv_sanitize_amount($invoice->get_recurring_details('total'), 2);
         
         $paypal_args['cmd'] = '_xclick-subscriptions';
         $paypal_args['sra'] = '1';
         $paypal_args['src'] = '1';
         
         // Set item description
-        $paypal_args['item_name']   = stripslashes_deep( html_entity_decode( wpinv_get_cart_item_name( array( 'id' => $item->ID ) ), ENT_COMPAT, 'UTF-8' ) );
+        $paypal_args['item_name'] = stripslashes_deep(html_entity_decode(wpinv_get_cart_item_name(array('id' => $item->ID)), ENT_COMPAT, 'UTF-8'));
         
-        if ( $invoice->is_free_trial() && $item->has_free_trial() ) {
+        if ($invoice->is_free_trial() && $item->has_free_trial()) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $item->get_trial_interval();
             $paypal_args['t1']  = $item->get_trial_period();
             
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
-        } else if ( $initial_amount != $recurring_amount && $bill_times != 1 ) {
+        } else if ($initial_amount != $recurring_amount && $bill_times != 1) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $interval;
             $paypal_args['t1']  = $period;
@@ -163,63 +163,63 @@ 
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
             
-            if ( $bill_times > 1 ) {
+            if ($bill_times > 1) {
                 $bill_times--;
             }
         } else {
-            $paypal_args['a3']  = $initial_amount;
+            $paypal_args['a3'] = $initial_amount;
         }
         
         $paypal_args['p3']  = $interval;
         $paypal_args['t3']  = $period;
         
-        if ( $bill_times > 1 ) {
+        if ($bill_times > 1) {
             // Make sure it's not over the max of 52
-            $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+            $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
         }
                 
         // Remove cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {                
-                if ( isset( $paypal_args['item_number_' . $i] ) ) {
-                    unset( $paypal_args['item_number_' . $i] );
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {                
+                if (isset($paypal_args['item_number_' . $i])) {
+                    unset($paypal_args['item_number_' . $i]);
                 }
-                if ( isset( $paypal_args['item_name_' . $i] ) ) {
-                    unset( $paypal_args['item_name_' . $i] );
+                if (isset($paypal_args['item_name_' . $i])) {
+                    unset($paypal_args['item_name_' . $i]);
                 }
-                if ( isset( $paypal_args['quantity_' . $i] ) ) {
-                    unset( $paypal_args['quantity_' . $i] );
+                if (isset($paypal_args['quantity_' . $i])) {
+                    unset($paypal_args['quantity_' . $i]);
                 }
-                if ( isset( $paypal_args['amount_' . $i] ) ) {
-                    unset( $paypal_args['amount_' . $i] );
+                if (isset($paypal_args['amount_' . $i])) {
+                    unset($paypal_args['amount_' . $i]);
                 }
-                if ( isset( $paypal_args['discount_amount_' . $i] ) ) {
-                    unset( $paypal_args['discount_amount_' . $i] );
+                if (isset($paypal_args['discount_amount_' . $i])) {
+                    unset($paypal_args['discount_amount_' . $i]);
                 }
 
                 $i++;
             }
         }
         
-        if ( isset( $paypal_args['tax_cart'] ) ) {
-            unset( $paypal_args['tax_cart'] );
+        if (isset($paypal_args['tax_cart'])) {
+            unset($paypal_args['tax_cart']);
         }
                 
-        if ( isset( $paypal_args['upload'] ) ) {
-            unset( $paypal_args['upload'] );
+        if (isset($paypal_args['upload'])) {
+            unset($paypal_args['upload']);
         }
         
-        $paypal_args = apply_filters( 'wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice);
     }
     
     return $paypal_args;
 }
-add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
+add_filter('wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3);
 
 function wpinv_process_paypal_ipn() {
 	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
 		return;
 	}
 
@@ -227,11 +227,11 @@ 
 	$post_data = '';
 
 	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
+	if (ini_get('allow_url_fopen')) {
+		$post_data = file_get_contents('php://input');
 	} else {
 		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
+		ini_set('post_max_size', '12M');
 	}
 	// Start the encoded data collection with notification command
 	$encoded_data = 'cmd=_notify-validate';
@@ -240,43 +240,43 @@ 
 	$arg_separator = wpinv_get_php_arg_separator_output();
 
 	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
+	if ($post_data || strlen($post_data) > 0) {
 		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
+		$encoded_data .= $arg_separator . $post_data;
 	} else {
 		// Check if POST is empty
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			// Nothing to do
 			return;
 		} else {
 			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
+			foreach ($_POST as $key => $value) {
 				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
+				$encoded_data .= $arg_separator . "$key=" . urlencode($value);
 			}
 		}
 	}
 
 	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
+	parse_str($encoded_data, $encoded_data_array);
 
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&amp;', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
+	foreach ($encoded_data_array as $key => $value) {
+		if (false !== strpos($key, 'amp;')) {
+			$new_key = str_replace('&amp;', '&', $key);
+			$new_key = str_replace('amp;', '&', $new_key);
 
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
+			unset($encoded_data_array[$key]);
+			$encoded_data_array[$new_key] = $value;
 		}
 	}
 
 	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
+	$paypal_redirect = wpinv_get_paypal_redirect(true);
 
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+	if (!wpinv_get_option('disable_paypal_verification', false)) {
 		// Validate the IPN
 
-		$remote_post_vars      = array(
+		$remote_post_vars = array(
 			'method'           => 'POST',
 			'timeout'          => 45,
 			'redirection'      => 5,
@@ -294,21 +294,21 @@ 
 		);
 
 		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+		$api_response = wp_remote_post(wpinv_get_paypal_redirect(), $remote_post_vars);
 
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if (is_wp_error($api_response)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Something went wrong
 		}
 
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if ($api_response['body'] !== 'VERIFIED' && wpinv_get_option('disable_paypal_verification', false)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Response not okay
 		}
 	}
 
 	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+	if (!is_array($encoded_data_array) && !empty($encoded_data_array))
 		return;
 
 	$defaults = array(
@@ -316,215 +316,215 @@ 
 		'payment_status' => ''
 	);
 
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+	$encoded_data_array = wp_parse_args($encoded_data_array, $defaults);
 
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+	$invoice_id = isset($encoded_data_array['custom']) ? absint($encoded_data_array['custom']) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+	wpinv_error_log($encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__);
 
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+	if (has_action('wpinv_paypal_' . $encoded_data_array['txn_type'])) {
 		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id);
 	} else {
 		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_web_accept', $encoded_data_array, $invoice_id);
 	}
 	exit;
 }
-add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
+add_action('wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn');
 
-function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+function wpinv_process_paypal_web_accept_and_cart($data, $invoice_id) {
+	if ($data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded') {
 		return;
 	}
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
 	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+	$purchase_key   = isset($data['invoice']) ? $data['invoice'] : $data['item_number'];
 	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+	$payment_status = strtolower($data['payment_status']);
+	$currency_code  = strtolower($data['mc_currency']);
+	$business_email = isset($data['business']) && is_email($data['business']) ? trim($data['business']) : trim($data['receiver_email']);
+	$payment_meta   = wpinv_get_invoice_meta($invoice_id);
 
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+	if (wpinv_get_payment_gateway($invoice_id) != 'paypal') {
 		return; // this isn't a PayPal standard IPN
 	}
 
 	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ) );
+	if (strcasecmp($business_email, trim(wpinv_get_option('paypal_email', false))) != 0) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid business email in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid PayPal business email.', 'invoicing'));
 		return;
 	}
 
 	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ) );
+	if ($currency_code != strtolower($payment_meta['currency'])) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid currency in PayPal IPN.', 'invoicing'));
 		return;
 	}
 
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+	if (!wpinv_get_payment_user_email($invoice_id)) {
 		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
 		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_email', $data['payer_email']);
 
 		// Setup and store the customer's details
 		$user_info = array(
 			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
+			'email'      => sanitize_text_field($data['payer_email']),
+			'first_name' => sanitize_text_field($data['first_name']),
+			'last_name'  => sanitize_text_field($data['last_name']),
 			'discount'   => '',
 		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+		$user_info['address'] = !empty($data['address_street']) ? sanitize_text_field($data['address_street']) : false;
+		$user_info['city']    = !empty($data['address_city']) ? sanitize_text_field($data['address_city']) : false;
+		$user_info['state']   = !empty($data['address_state']) ? sanitize_text_field($data['address_state']) : false;
+		$user_info['country'] = !empty($data['address_country_code']) ? sanitize_text_field($data['address_country_code']) : false;
+		$user_info['zip']     = !empty($data['address_zip']) ? sanitize_text_field($data['address_zip']) : false;
 
 		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_payment_meta', $payment_meta);
 	}
 
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+	if ($payment_status == 'refunded' || $payment_status == 'reversed') {
 		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
+		wpinv_process_paypal_refund($data, $invoice_id);
 	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
+		if (get_post_status($invoice_id) == 'publish') {
 			return; // Only paid payments once
 		}
 
 		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
+		$payment_amount = wpinv_payment_total($invoice_id);
 
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+		if (number_format((float)$paypal_amount, 2) < number_format((float)$payment_amount, 2)) {
 			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ) );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid payment amount in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid amount in PayPal IPN.', 'invoicing'));
 			return;
 		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+		if ($purchase_key != wpinv_get_payment_key($invoice_id)) {
 			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ) );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid purchase key in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing'));
 			return;
 		}
 
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ) );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'wpi-pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+		if ('complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode('paypal')) {
+			wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $data['txn_id']));
+			wpinv_set_payment_transaction_id($invoice_id, $data['txn_id']);
+			wpinv_update_payment_status($invoice_id, 'publish');
+		} else if ('wpi-pending' == $payment_status && isset($data['pending_reason'])) {
 			// Look for possible pending reasons, such as an echeck
 			$note = '';
 
-			switch( strtolower( $data['pending_reason'] ) ) {
+			switch (strtolower($data['pending_reason'])) {
 				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+					$note = __('Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing');
 					break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+					$note = __('Payment must be accepted manually through PayPal due to international account regulations', 'invoicing');
 					break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+					$note = __('Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing');
 					break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+					$note = __('Payment was sent to non-confirmed or non-registered email address.', 'invoicing');
 					break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+					$note = __('PayPal account must be upgraded before this payment can be accepted', 'invoicing');
 					break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+					$note = __('PayPal account is not verified. Verify account in order to accept this payment', 'invoicing');
 					break;
 
 				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+					$note = __('Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing');
 					break;
 			}
 
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note );
+			if (!empty($note)) {
+				wpinv_insert_payment_note($invoice_id, $note);
 			}
 		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ) );
+			wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal IPN has been received with invalid payment status: %s', 'invoicing'), $payment_status));
 		}
 	}
 }
-add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
+add_action('wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2);
 
 // Process PayPal subscription sign ups
-add_action( 'wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup' );
+add_action('wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup');
 
 // Process PayPal subscription payments
-add_action( 'wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment' );
+add_action('wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment');
 
 // Process PayPal subscription cancellations
-add_action( 'wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel' );
+add_action('wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel');
 
 // Process PayPal subscription end of term notices
-add_action( 'wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot' );
+add_action('wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot');
 
 // Process PayPal payment failed
-add_action( 'wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed' );
+add_action('wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed');
 
 
 /**
  * Process the subscription started IPN.
  */
-function wpinv_process_paypal_subscr_signup( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
-    if( empty( $parent_invoice_id ) ) {
+function wpinv_process_paypal_subscr_signup($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
+    if (empty($parent_invoice_id)) {
         return;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
-    if ( $invoice->is_free_trial() && !empty( $ipn_data['invoice'] ) ) {
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Invoice ID: %s', 'invoicing' ) , $ipn_data['invoice'] ) );
-        wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['invoice'] );
+    if ($invoice->is_free_trial() && !empty($ipn_data['invoice'])) {
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Invoice ID: %s', 'invoicing'), $ipn_data['invoice']));
+        wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['invoice']);
     }
     
-    wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    wpinv_update_payment_status($parent_invoice_id, 'publish');
     sleep(1);
-    wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $ipn_data['subscr_id'] ) );
+    wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']));
     
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
 
-    $cart_details   = $invoice->cart_details;
+    $cart_details = $invoice->cart_details;
 
-    if ( !empty( $cart_details ) ) {
-        foreach ( $cart_details as $cart_item ) {
-            $item = new WPInv_Item( $cart_item['id'] );
+    if (!empty($cart_details)) {
+        foreach ($cart_details as $cart_item) {
+            $item = new WPInv_Item($cart_item['id']);
             
             $status = $invoice->is_free_trial() && $item->has_free_trial() ? 'trialing' : 'active';
             
@@ -533,15 +533,15 @@ 
                 'status'            => $status,
                 'period'            => $item->get_recurring_period(),
                 'initial_amount'    => $invoice->get_total(),
-                'recurring_amount'  => $invoice->get_recurring_details( 'total' ),
+                'recurring_amount'  => $invoice->get_recurring_details('total'),
                 'interval'          => $item->get_recurring_interval(),
                 'bill_times'        => $item->get_recurring_limit(),
-                'expiration'        => $invoice->get_new_expiration( $cart_item['id'] ),
+                'expiration'        => $invoice->get_new_expiration($cart_item['id']),
                 'profile_id'        => $ipn_data['subscr_id'],
-                'created'           => date_i18n( 'Y-m-d H:i:s', strtotime( $ipn_data['subscr_date'] ) )
+                'created'           => date_i18n('Y-m-d H:i:s', strtotime($ipn_data['subscr_date']))
             );
             
-            if ( $item->has_free_trial() ) {
+            if ($item->has_free_trial()) {
                 $args['trial_period']      = $item->get_trial_period();
                 $args['trial_interval']    = $item->get_trial_interval();
             } else {
@@ -550,7 +550,7 @@ 
             }
             
 
-            $subscription->update_subscription( $args );
+            $subscription->update_subscription($args);
         }
     }
 }
@@ -558,39 +558,39 @@ 
 /**
  * Process the subscription payment received IPN.
  */
-function wpinv_process_paypal_subscr_payment( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_process_paypal_subscr_payment($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
     
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
     
-    $transaction_id = wpinv_get_payment_transaction_id( $parent_invoice_id );
-    $signup_date    = strtotime( $subscription->get_subscription_created() );
-    $today          = date_i18n( 'Y-m-d', $signup_date ) == date_i18n( 'Y-m-d', strtotime( $ipn_data['payment_date'] ) );
+    $transaction_id = wpinv_get_payment_transaction_id($parent_invoice_id);
+    $signup_date    = strtotime($subscription->get_subscription_created());
+    $today          = date_i18n('Y-m-d', $signup_date) == date_i18n('Y-m-d', strtotime($ipn_data['payment_date']));
 
     // Look to see if payment is same day as signup and we have set the transaction ID on the parent payment yet.
-    if ( $today && ( !$transaction_id || $transaction_id == $parent_invoice_id ) ) {
-        wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    if ($today && (!$transaction_id || $transaction_id == $parent_invoice_id)) {
+        wpinv_update_payment_status($parent_invoice_id, 'publish');
         sleep(1);
         
         // This is the very first payment
-        wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['txn_id'] );
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ) );
+        wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['txn_id']);
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']));
         return;
     }
     
-    if ( wpinv_get_id_by_transaction_id( $ipn_data['txn_id'] ) ) {
+    if (wpinv_get_id_by_transaction_id($ipn_data['txn_id'])) {
         return; // Payment already recorded
     }
 
-    $currency_code = strtolower( $ipn_data['mc_currency'] );
+    $currency_code = strtolower($ipn_data['mc_currency']);
 
     // verify details
-    if ( $currency_code != strtolower( wpinv_get_currency() ) ) {
+    if ($currency_code != strtolower(wpinv_get_currency())) {
         // the currency code is invalid
-        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: ', 'invoicing' ), json_encode( $ipn_data ) ) );
+        wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: ', 'invoicing'), json_encode($ipn_data)));
         return;
     }
 
@@ -599,11 +599,11 @@ 
         'transaction_id' => $ipn_data['txn_id']
     );
     
-    $invoice = wpinv_recurring_add_subscription_payment( $parent_invoice_id, $args );
+    $invoice = wpinv_recurring_add_subscription_payment($parent_invoice_id, $args);
     
-    if ( !empty( $invoice ) ) {
+    if (!empty($invoice)) {
         sleep(1);
-        wpinv_insert_payment_note( $invoice->ID, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ) );
+        wpinv_insert_payment_note($invoice->ID, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']));
 
         $invoice->renew_subscription();
     }
@@ -612,10 +612,10 @@ 
 /**
  * Process the subscription canceled IPN.
  */
-function wpinv_process_paypal_subscr_cancel( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_cancel($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -625,10 +625,10 @@ 
 /**
  * Process the subscription expired IPN.
  */
-function wpinv_process_paypal_subscr_eot( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_eot($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -638,45 +638,45 @@ 
 /**
  * Process the subscription payment failed IPN.
  */
-function wpinv_process_paypal_subscr_failed( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_failed($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
     $subscription->failing_subscription();
 
-    do_action( 'wpinv_recurring_payment_failed', $subscription );
+    do_action('wpinv_recurring_payment_failed', $subscription);
 }
 
 /**
  * Retrieve the subscription this IPN notice is for.
  */
-function wpinv_get_paypal_subscription( $ipn_data = array() ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_get_paypal_subscription($ipn_data = array()) {
+    $parent_invoice_id = absint($ipn_data['custom']);
 
-    if( empty( $parent_invoice_id ) ) {
+    if (empty($parent_invoice_id)) {
         return false;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    $subscription = wpinv_get_subscription( $ipn_data['subscr_id'], true );
+    $subscription = wpinv_get_subscription($ipn_data['subscr_id'], true);
 
-    if ( empty( $subscription ) ) {
-        $subs         = wpinv_get_subscriptions( array( 'parent_invoice_id' => $parent_invoice_id, 'numberposts' => 1 ) );
-        $subscription = reset( $subs );
+    if (empty($subscription)) {
+        $subs         = wpinv_get_subscriptions(array('parent_invoice_id' => $parent_invoice_id, 'numberposts' => 1));
+        $subscription = reset($subs);
 
-        if ( $subscription && $subscription->ID > 0 ) {
+        if ($subscription && $subscription->ID > 0) {
             // Update the profile ID so it is set for future renewals
-            $subscription->update_subscription( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+            $subscription->update_subscription(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
         } else {
             $subscription = $invoice;
-            $subscription->update_subscription( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+            $subscription->update_subscription(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
             // No subscription found with a matching payment ID, bail
             //return false;
         }
@@ -686,39 +686,39 @@ 
 
 }
 
-function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
+function wpinv_process_paypal_refund($data, $invoice_id = 0) {
 	// Collect payment details
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+	if (get_post_status($invoice_id) == 'wpi-refunded') {
 		return; // Only refund payments once
 	}
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
+	$payment_amount = wpinv_payment_total($invoice_id);
 	$refund_amount  = $data['mc_gross'] * -1;
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Partial PayPal refund processed: %s', 'invoicing' ), $data['parent_txn_id'] ) );
+	if (number_format((float)$refund_amount, 2) < number_format((float)$payment_amount, 2)) {
+		wpinv_insert_payment_note($invoice_id, sprintf(__('Partial PayPal refund processed: %s', 'invoicing'), $data['parent_txn_id']));
 		return; // This is a partial refund
 	}
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ) );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ) );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Payment #%s Refunded for reason: %s', 'invoicing'), $data['parent_txn_id'], $data['reason_code']));
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Refund Transaction ID: %s', 'invoicing'), $data['txn_id']));
+	wpinv_update_payment_status($invoice_id, 'wpi-refunded');
 }
 
-function wpinv_get_paypal_redirect( $ssl_check = false ) {
-    if ( is_ssl() || ! $ssl_check ) {
+function wpinv_get_paypal_redirect($ssl_check = false) {
+    if (is_ssl() || !$ssl_check) {
         $protocol = 'https://';
     } else {
         $protocol = 'http://';
     }
 
     // Check the current payment mode
-    if ( wpinv_is_test_mode( 'paypal' ) ) {
+    if (wpinv_is_test_mode('paypal')) {
         // Test mode
         $paypal_uri = $protocol . 'www.sandbox.paypal.com/cgi-bin/webscr';
     } else {
@@ -726,67 +726,67 @@ 
         $paypal_uri = $protocol . 'www.paypal.com/cgi-bin/webscr';
     }
 
-    return apply_filters( 'wpinv_paypal_uri', $paypal_uri );
+    return apply_filters('wpinv_paypal_uri', $paypal_uri);
 }
 
-function wpinv_paypal_success_page_content( $content ) {
+function wpinv_paypal_success_page_content($content) {
     global $wpi_invoice;
     
     $session = wpinv_get_checkout_session();
 
-    if ( empty( $_GET['invoice-id'] ) && empty( $session['invoice_key'] )  ) {
+    if (empty($_GET['invoice-id']) && empty($session['invoice_key'])) {
         return $content;
     }
 
-    $invoice_id = !empty( $_GET['invoice-id'] ) ? absint( $_GET['invoice-id'] ) : wpinv_get_invoice_id_by_key( $session['invoice_key'] );
+    $invoice_id = !empty($_GET['invoice-id']) ? absint($_GET['invoice-id']) : wpinv_get_invoice_id_by_key($session['invoice_key']);
 
-    if ( empty(  $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return $content;
     }
 
-    $wpi_invoice = wpinv_get_invoice( $invoice_id );
+    $wpi_invoice = wpinv_get_invoice($invoice_id);
     
-    if ( !empty( $wpi_invoice ) && 'wpi-pending' == $wpi_invoice->status ) {
+    if (!empty($wpi_invoice) && 'wpi-pending' == $wpi_invoice->status) {
         // Payment is still pending so show processing indicator to fix the Race Condition, issue #
         ob_start();
-        wpinv_get_template_part( 'wpinv-payment-processing' );
+        wpinv_get_template_part('wpinv-payment-processing');
         $content = ob_get_clean();
     }
 
     return $content;
 }
-add_filter( 'wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content' );
+add_filter('wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content');
 
-function wpinv_paypal_get_transaction_id( $invoice_id ) {
+function wpinv_paypal_get_transaction_id($invoice_id) {
     $transaction_id = '';
-    $notes = wpinv_get_invoice_notes( $invoice_id );
+    $notes = wpinv_get_invoice_notes($invoice_id);
 
-    foreach ( $notes as $note ) {
-        if ( preg_match( '/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match ) ) {
+    foreach ($notes as $note) {
+        if (preg_match('/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match)) {
             $transaction_id = $match[1];
             continue;
         }
     }
 
-    return apply_filters( 'wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id );
+    return apply_filters('wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id);
 }
-add_filter( 'wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1 );
+add_filter('wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1);
 
-function wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice ) {
-    if ( $invoice->is_free_trial() || $transaction_id == $invoice_id ) { // Free trial does not have transaction at PayPal.
+function wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice) {
+    if ($invoice->is_free_trial() || $transaction_id == $invoice_id) { // Free trial does not have transaction at PayPal.
         $transaction_url = $invoice->get_view_url();
     } else {
-        $sandbox = wpinv_is_test_mode( 'paypal' ) ? '.sandbox' : '';
+        $sandbox = wpinv_is_test_mode('paypal') ? '.sandbox' : '';
         $transaction_url = 'https://www' . $sandbox . '.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=' . $transaction_id;
     }
 
-    $transaction_link = '<a href="' . esc_url( $transaction_url ) . '" target="_blank">' . $transaction_id . '</a>';
+    $transaction_link = '<a href="' . esc_url($transaction_url) . '" target="_blank">' . $transaction_id . '</a>';
 
-    return apply_filters( 'wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $invoice );
+    return apply_filters('wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $invoice);
 }
-add_filter( 'wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3 );
+add_filter('wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3);
 
 function wpinv_gateway_paypal_button_label($label) {
-    return __( 'Proceed to PayPal', 'invoicing' );
+    return __('Proceed to PayPal', 'invoicing');
 }
-add_filter( 'wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1 );
\ No newline at end of file
+add_filter('wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1);
\ No newline at end of file

includes/wpinv-email-functions.php

Spacing +506 added lines, -506 removed lines

@@ -7,12 +7,12 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_init_transactional_emails() {
-    $email_actions = apply_filters( 'wpinv_email_actions', array(
+    $email_actions = apply_filters('wpinv_email_actions', array(
         'wpinv_status_wpi-pending_to_wpi-processing',
         'wpinv_status_wpi-pending_to_publish',
         'wpinv_status_wpi-pending_to_wpi-cancelled',
@@ -28,79 +28,79 @@ 
         'wpinv_fully_refunded',
         'wpinv_partially_refunded',
         'wpinv_new_invoice_note'
-    ) );
+    ));
 
-    foreach ( $email_actions as $action ) {
-        add_action( $action, 'wpinv_send_transactional_email', 10, 10 );
+    foreach ($email_actions as $action) {
+        add_action($action, 'wpinv_send_transactional_email', 10, 10);
     }
 }
-add_action( 'init', 'wpinv_init_transactional_emails' );
+add_action('init', 'wpinv_init_transactional_emails');
 
 // New invoice email
-add_action( 'wpinv_status_wpi-pending_to_wpi-processing_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_wpi-pending_to_publish_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_wpi-pending_to_wpi-onhold_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_wpi-failed_to_wpi-processing_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_wpi-failed_to_publish_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_wpi-failed_to_wpi-onhold_notification', 'wpinv_new_invoice_notification' );
+add_action('wpinv_status_wpi-pending_to_wpi-processing_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_wpi-pending_to_publish_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_wpi-pending_to_wpi-onhold_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_wpi-failed_to_wpi-processing_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_wpi-failed_to_publish_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_wpi-failed_to_wpi-onhold_notification', 'wpinv_new_invoice_notification');
 
 // Cancelled invoice email
-add_action( 'wpinv_status_wpi-pending_to_wpi-cancelled_notification', 'wpinv_cancelled_invoice_notification' );
-add_action( 'wpinv_status_wpi-onhold_to_wpi-cancelled_notification', 'wpinv_cancelled_invoice_notification' );
+add_action('wpinv_status_wpi-pending_to_wpi-cancelled_notification', 'wpinv_cancelled_invoice_notification');
+add_action('wpinv_status_wpi-onhold_to_wpi-cancelled_notification', 'wpinv_cancelled_invoice_notification');
 
 // Failed invoice email
-add_action( 'wpinv_status_wpi-pending_to_wpi-failed_notification', 'wpinv_failed_invoice_notification' );
-add_action( 'wpinv_status_wpi-onhold_to_wpi-failed_notification', 'wpinv_failed_invoice_notification' );
+add_action('wpinv_status_wpi-pending_to_wpi-failed_notification', 'wpinv_failed_invoice_notification');
+add_action('wpinv_status_wpi-onhold_to_wpi-failed_notification', 'wpinv_failed_invoice_notification');
 
 // On hold invoice email
-add_action( 'wpinv_status_wpi-pending_to_wpi-onhold_notification', 'wpinv_onhold_invoice_notification' );
-add_action( 'wpinv_status_wpi-failed_to_wpi-onhold_notification', 'wpinv_onhold_invoice_notification' );
+add_action('wpinv_status_wpi-pending_to_wpi-onhold_notification', 'wpinv_onhold_invoice_notification');
+add_action('wpinv_status_wpi-failed_to_wpi-onhold_notification', 'wpinv_onhold_invoice_notification');
 
 // Processing invoice email
-add_action( 'wpinv_status_wpi-pending_to_wpi-processing_notification', 'wpinv_processing_invoice_notification' );
+add_action('wpinv_status_wpi-pending_to_wpi-processing_notification', 'wpinv_processing_invoice_notification');
 
 // Paid invoice email
-add_action( 'wpinv_status_publish_notification', 'wpinv_completed_invoice_notification' );
+add_action('wpinv_status_publish_notification', 'wpinv_completed_invoice_notification');
 
 // Refunded invoice email
-add_action( 'wpinv_fully_refunded_notification', 'wpinv_fully_refunded_notification' );
-add_action( 'wpinv_partially_refunded_notification', 'wpinv_partially_refunded_notification' );
+add_action('wpinv_fully_refunded_notification', 'wpinv_fully_refunded_notification');
+add_action('wpinv_partially_refunded_notification', 'wpinv_partially_refunded_notification');
 
 // Invoice note
-add_action( 'wpinv_new_invoice_note_notification', 'wpinv_new_invoice_note_notification' );
+add_action('wpinv_new_invoice_note_notification', 'wpinv_new_invoice_note_notification');
 
-add_action( 'wpinv_email_header', 'wpinv_email_header' );
-add_action( 'wpinv_email_footer', 'wpinv_email_footer' );
-add_action( 'wpinv_email_invoice_details', 'wpinv_email_invoice_details', 10, 3 );
-add_action( 'wpinv_email_invoice_items', 'wpinv_email_invoice_items', 10, 3 );
-add_action( 'wpinv_email_billing_details', 'wpinv_email_billing_details', 10, 3 );
-add_action( 'wpinv_email_before_note_details', 'wpinv_email_before_note_details', 10, 4 );
+add_action('wpinv_email_header', 'wpinv_email_header');
+add_action('wpinv_email_footer', 'wpinv_email_footer');
+add_action('wpinv_email_invoice_details', 'wpinv_email_invoice_details', 10, 3);
+add_action('wpinv_email_invoice_items', 'wpinv_email_invoice_items', 10, 3);
+add_action('wpinv_email_billing_details', 'wpinv_email_billing_details', 10, 3);
+add_action('wpinv_email_before_note_details', 'wpinv_email_before_note_details', 10, 4);
 
 function wpinv_send_transactional_email() {
     $args       = func_get_args();
     $function   = current_filter() . '_notification';
-    do_action_ref_array( $function, $args );
+    do_action_ref_array($function, $args);
 }
     
-function wpinv_new_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_new_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'new_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -117,41 +117,41 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_cancelled_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_cancelled_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'cancelled_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -168,41 +168,41 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_failed_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_failed_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'failed_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -219,41 +219,41 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_onhold_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_onhold_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'onhold_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -270,49 +270,49 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_processing_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_processing_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'processing_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -329,49 +329,49 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_completed_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_completed_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'completed_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -388,49 +388,49 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_fully_refunded_notification( $invoice_id, $new_status = '' ) {
+function wpinv_fully_refunded_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'refunded_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -447,50 +447,50 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'           => $invoice,
             'email_type'        => $email_type,
             'email_heading'     => $email_heading,
             'sent_to_admin'     => false,
             'plain_text'        => false,
             'partial_refund'    => false
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_partially_refunded_notification( $invoice_id, $new_status = '' ) {
+function wpinv_partially_refunded_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'refunded_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -507,53 +507,53 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'           => $invoice,
             'email_type'        => $email_type,
             'email_heading'     => $email_heading,
             'sent_to_admin'     => false,
             'plain_text'        => false,
             'partial_refund'    => true
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_new_invoice_note_notification( $invoice_id, $new_status = '' ) {
+function wpinv_new_invoice_note_notification($invoice_id, $new_status = '') {
 }
 
-function wpinv_user_invoice_notification( $invoice_id ) {
+function wpinv_user_invoice_notification($invoice_id) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'user_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    if ( !("wpi_invoice" === $invoice->post_type) ) {
+    if (!("wpi_invoice" === $invoice->post_type)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -570,53 +570,53 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( $sent ) {
-        $note = __( 'Invoice has been emailed to the user.', 'invoicing' );
+    if ($sent) {
+        $note = __('Invoice has been emailed to the user.', 'invoicing');
     } else {
-        $note = __( 'Fail to send invoice to the user!', 'invoicing' );
+        $note = __('Fail to send invoice to the user!', 'invoicing');
     }
     
-    $invoice->add_note( $note, '', '', true ); // Add system note.
+    $invoice->add_note($note, '', '', true); // Add system note.
 
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_user_note_notification( $invoice_id, $args = array() ) {
+function wpinv_user_note_notification($invoice_id, $args = array()) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'user_note';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
     
@@ -624,7 +624,7 @@ 
         'user_note' => ''
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
         
     $search                     = array();
     $search['invoice_number']   = '{invoice_number}';
@@ -643,46 +643,46 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
             'customer_note' => $args['user_note']
-        ) );
+        ));
         
-    $content        = wpinv_email_format_text( $content );
+    $content = wpinv_email_format_text($content);
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
         
     return $sent;
 }
 
 function wpinv_mail_get_from_address() {
-    $from_address = apply_filters( 'wpinv_mail_from_address', wpinv_get_option( 'email_from' ) );
-    return sanitize_email( $from_address );
+    $from_address = apply_filters('wpinv_mail_from_address', wpinv_get_option('email_from'));
+    return sanitize_email($from_address);
 }
 
 function wpinv_mail_get_from_name() {
-    $from_name = apply_filters( 'wpinv_mail_from_name', wpinv_get_option( 'email_from_name' ) );
-    return wp_specialchars_decode( esc_html( $from_name ), ENT_QUOTES );
+    $from_name = apply_filters('wpinv_mail_from_name', wpinv_get_option('email_from_name'));
+    return wp_specialchars_decode(esc_html($from_name), ENT_QUOTES);
 }
 
-function wpinv_mail_admin_bcc_active( $mail_type = '' ) {
-    $active = apply_filters( 'wpinv_mail_admin_bcc_active', wpinv_get_option( 'email_' . $mail_type . '_admin_bcc' ) );
-    return ( $active ? true : false );
+function wpinv_mail_admin_bcc_active($mail_type = '') {
+    $active = apply_filters('wpinv_mail_admin_bcc_active', wpinv_get_option('email_' . $mail_type . '_admin_bcc'));
+    return ($active ? true : false);
 }
     
-function wpinv_mail_get_content_type(  $content_type = 'text/html', $email_type = 'html' ) {
-    $email_type = apply_filters( 'wpinv_mail_content_type', $email_type );
+function wpinv_mail_get_content_type($content_type = 'text/html', $email_type = 'html') {
+    $email_type = apply_filters('wpinv_mail_content_type', $email_type);
     
-    switch ( $email_type ) {
+    switch ($email_type) {
         case 'html' :
             $content_type = 'text/html';
             break;
@@ -697,35 +697,35 @@ 
     return $content_type;
 }
     
-function wpinv_mail_send( $to, $subject, $message, $headers, $attachments ) {
-    add_filter( 'wp_mail_from', 'wpinv_mail_get_from_address' );
-    add_filter( 'wp_mail_from_name', 'wpinv_mail_get_from_name' );
-    add_filter( 'wp_mail_content_type', 'wpinv_mail_get_content_type' );
+function wpinv_mail_send($to, $subject, $message, $headers, $attachments) {
+    add_filter('wp_mail_from', 'wpinv_mail_get_from_address');
+    add_filter('wp_mail_from_name', 'wpinv_mail_get_from_name');
+    add_filter('wp_mail_content_type', 'wpinv_mail_get_content_type');
 
-    $message = wpinv_email_style_body( $message );
-    $message = apply_filters( 'wpinv_mail_content', $message );
+    $message = wpinv_email_style_body($message);
+    $message = apply_filters('wpinv_mail_content', $message);
     
-    $sent  = wp_mail( $to, $subject, $message, $headers, $attachments );
+    $sent = wp_mail($to, $subject, $message, $headers, $attachments);
     
-    if ( !$sent ) {
-        $log_message = wp_sprintf( __( "\nTime: %s\nTo: %s\nSubject: %s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), ( is_array( $to ) ? implode( ', ', $to ) : $to ), $subject );
-        wpinv_error_log( $log_message, __( "Email from Invoicing plugin failed to send", 'invoicing' ), __FILE__, __LINE__ );
+    if (!$sent) {
+        $log_message = wp_sprintf(__("\nTime: %s\nTo: %s\nSubject: %s\n", 'invoicing'), date_i18n('F j Y H:i:s', current_time('timestamp')), (is_array($to) ? implode(', ', $to) : $to), $subject);
+        wpinv_error_log($log_message, __("Email from Invoicing plugin failed to send", 'invoicing'), __FILE__, __LINE__);
     }
 
-    remove_filter( 'wp_mail_from', 'wpinv_mail_get_from_address' );
-    remove_filter( 'wp_mail_from_name', 'wpinv_mail_get_from_name' );
-    remove_filter( 'wp_mail_content_type', 'wpinv_mail_get_content_type' );
+    remove_filter('wp_mail_from', 'wpinv_mail_get_from_address');
+    remove_filter('wp_mail_from_name', 'wpinv_mail_get_from_name');
+    remove_filter('wp_mail_content_type', 'wpinv_mail_get_content_type');
 
     return $sent;
 }
     
 function wpinv_get_emails() {
     $overdue_days_options       = array();
-    $overdue_days_options[0]    = __( 'On the Due Date', 'invoicing' );
-    $overdue_days_options[1]    = __( '1 day after Due Date', 'invoicing' );
+    $overdue_days_options[0]    = __('On the Due Date', 'invoicing');
+    $overdue_days_options[1]    = __('1 day after Due Date', 'invoicing');
     
-    for ( $i = 2; $i <= 10; $i++ ) {
-        $overdue_days_options[$i]   = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+    for ($i = 2; $i <= 10; $i++) {
+        $overdue_days_options[$i] = wp_sprintf(__('%d days after Due Date', 'invoicing'), $i);
     }
 
     // Default, built-in gateways
@@ -733,130 +733,130 @@ 
             'new_invoice' => array(
             'email_new_invoice_header' => array(
                 'id'   => 'email_new_invoice_header',
-                'name' => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'New invoice emails are sent to admin when a new invoice is received.', 'invoicing' ),
+                'name' => '<h3>' . __('New Invoice', 'invoicing') . '</h3>',
+                'desc' => __('New invoice emails are sent to admin when a new invoice is received.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_new_invoice_active' => array(
                 'id'   => 'email_new_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_new_invoice_subject' => array(
                 'id'   => 'email_new_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] New payment invoice ({invoice_number}) - {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] New payment invoice ({invoice_number}) - {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_new_invoice_heading' => array(
                 'id'   => 'email_new_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'New payment invoice', 'invoicing' ),
+                'std'  => __('New payment invoice', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'cancelled_invoice' => array(
             'email_cancelled_invoice_header' => array(
                 'id'   => 'email_cancelled_invoice_header',
-                'name' => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Cancelled invoice emails are sent to admin when invoices have been marked cancelled.', 'invoicing' ),
+                'name' => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Cancelled invoice emails are sent to admin when invoices have been marked cancelled.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_cancelled_invoice_active' => array(
                 'id'   => 'email_cancelled_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_cancelled_invoice_subject' => array(
                 'id'   => 'email_cancelled_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Cancelled invoice ({invoice_number})', 'invoicing' ),
+                'std'  => __('[{site_title}] Cancelled invoice ({invoice_number})', 'invoicing'),
                 'size' => 'large'
             ),
             'email_cancelled_invoice_heading' => array(
                 'id'   => 'email_cancelled_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Cancelled invoice', 'invoicing' ),
+                'std'  => __('Cancelled invoice', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'failed_invoice' => array(
             'email_failed_invoice_header' => array(
                 'id'   => 'email_failed_invoice_header',
-                'name' => '<h3>' . __( 'Failed Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Failed invoice emails are sent to admin when invoices have been marked failed (if they were previously processing or on-hold).', 'invoicing' ),
+                'name' => '<h3>' . __('Failed Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Failed invoice emails are sent to admin when invoices have been marked failed (if they were previously processing or on-hold).', 'invoicing'),
                 'type' => 'header',
             ),
             'email_failed_invoice_active' => array(
                 'id'   => 'email_failed_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_failed_invoice_subject' => array(
                 'id'   => 'email_failed_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Failed invoice ({invoice_number})', 'invoicing' ),
+                'std'  => __('[{site_title}] Failed invoice ({invoice_number})', 'invoicing'),
                 'size' => 'large'
             ),
             'email_failed_invoice_heading' => array(
                 'id'   => 'email_failed_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Failed invoice', 'invoicing' ),
+                'std'  => __('Failed invoice', 'invoicing'),
                 'size' => 'large'
             )
         ),
         'onhold_invoice' => array(
             'email_onhold_invoice_header' => array(
                 'id'   => 'email_onhold_invoice_header',
-                'name' => '<h3>' . __( 'On Hold Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'This is an invoice notification sent to users containing invoice details after an invoice is placed on-hold.', 'invoicing' ),
+                'name' => '<h3>' . __('On Hold Invoice', 'invoicing') . '</h3>',
+                'desc' => __('This is an invoice notification sent to users containing invoice details after an invoice is placed on-hold.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_onhold_invoice_active' => array(
                 'id'   => 'email_onhold_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_onhold_invoice_subject' => array(
                 'id'   => 'email_onhold_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_onhold_invoice_heading' => array(
                 'id'   => 'email_onhold_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Thank you for your invoice', 'invoicing' ),
+                'std'  => __('Thank you for your invoice', 'invoicing'),
                 'size' => 'large'
             ),
             'email_onhold_invoice_admin_bcc' => array(
                 'id'   => 'email_onhold_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
@@ -864,37 +864,37 @@ 
         'processing_invoice' => array(
             'email_processing_invoice_header' => array(
                 'id'   => 'email_processing_invoice_header',
-                'name' => '<h3>' . __( 'Processing Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'This is an invoice notification sent to users containing invoice details after payment.', 'invoicing' ),
+                'name' => '<h3>' . __('Processing Invoice', 'invoicing') . '</h3>',
+                'desc' => __('This is an invoice notification sent to users containing invoice details after payment.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_processing_invoice_active' => array(
                 'id'   => 'email_processing_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_processing_invoice_subject' => array(
                 'id'   => 'email_processing_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_processing_invoice_heading' => array(
                 'id'   => 'email_processing_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Thank you for your invoice', 'invoicing' ),
+                'std'  => __('Thank you for your invoice', 'invoicing'),
                 'size' => 'large'
             ),
             'email_processing_invoice_admin_bcc' => array(
                 'id'   => 'email_processing_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
@@ -902,37 +902,37 @@ 
         'completed_invoice' => array(
             'email_completed_invoice_header' => array(
                 'id'   => 'email_completed_invoice_header',
-                'name' => '<h3>' . __( 'Paid Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Invoice paid emails are sent to users when their invoices are marked paid and usually indicate that their payment has been done.', 'invoicing' ),
+                'name' => '<h3>' . __('Paid Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Invoice paid emails are sent to users when their invoices are marked paid and usually indicate that their payment has been done.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_completed_invoice_active' => array(
                 'id'   => 'email_completed_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_completed_invoice_subject' => array(
                 'id'   => 'email_completed_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing'),
                 'size' => 'large'
             ),
             'email_completed_invoice_heading' => array(
                 'id'   => 'email_completed_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice has been paid', 'invoicing' ),
+                'std'  => __('Your invoice has been paid', 'invoicing'),
                 'size' => 'large'
             ),
             'email_completed_invoice_admin_bcc' => array(
                 'id'   => 'email_completed_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
             ),
             'std'  => 1
@@ -940,37 +940,37 @@ 
         'refunded_invoice' => array(
             'email_refunded_invoice_header' => array(
                 'id'   => 'email_refunded_invoice_header',
-                'name' => '<h3>' . __( 'Refunded Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Invoice refunded emails are sent to users when their invoices are marked refunded.', 'invoicing' ),
+                'name' => '<h3>' . __('Refunded Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Invoice refunded emails are sent to users when their invoices are marked refunded.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_refunded_invoice_active' => array(
                 'id'   => 'email_refunded_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_refunded_invoice_subject' => array(
                 'id'   => 'email_refunded_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing'),
                 'size' => 'large'
             ),
             'email_refunded_invoice_heading' => array(
                 'id'   => 'email_refunded_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice has been refunded', 'invoicing' ),
+                'std'  => __('Your invoice has been refunded', 'invoicing'),
                 'size' => 'large'
             ),
             'email_refunded_invoice_admin_bcc' => array(
                 'id'   => 'email_refunded_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
@@ -978,37 +978,37 @@ 
         'user_invoice' => array(
             'email_user_invoice_header' => array(
                 'id'   => 'email_user_invoice_header',
-                'name' => '<h3>' . __( 'Customer Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Customer invoice emails can be sent to customers containing their invoice information and payment links.', 'invoicing' ),
+                'name' => '<h3>' . __('Customer Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Customer invoice emails can be sent to customers containing their invoice information and payment links.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_user_invoice_active' => array(
                 'id'   => 'email_user_invoice_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_user_invoice_subject' => array(
                 'id'   => 'email_user_invoice_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_user_invoice_heading' => array(
                 'id'   => 'email_user_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice {invoice_number} details', 'invoicing' ),
+                'std'  => __('Your invoice {invoice_number} details', 'invoicing'),
                 'size' => 'large'
             ),
             'email_user_invoice_admin_bcc' => array(
                 'id'   => 'email_user_invoice_admin_bcc',
-                'name' => __( 'Enable Admin BCC', 'invoicing' ),
-                'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+                'name' => __('Enable Admin BCC', 'invoicing'),
+                'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
@@ -1016,177 +1016,177 @@ 
         'user_note' => array(
             'email_user_note_header' => array(
                 'id'   => 'email_user_note_header',
-                'name' => '<h3>' . __( 'Customer Note', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Customer note emails are sent when you add a note to an invoice/quote.', 'invoicing' ),
+                'name' => '<h3>' . __('Customer Note', 'invoicing') . '</h3>',
+                'desc' => __('Customer note emails are sent when you add a note to an invoice/quote.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_user_note_active' => array(
                 'id'   => 'email_user_note_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_user_note_subject' => array(
                 'id'   => 'email_user_note_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Note added to your {invoice_quote} #{invoice_number} from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Note added to your {invoice_quote} #{invoice_number} from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_user_note_heading' => array(
                 'id'   => 'email_user_note_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'A note has been added to your {invoice_quote}', 'invoicing' ),
+                'std'  => __('A note has been added to your {invoice_quote}', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'overdue' => array(
             'email_overdue_header' => array(
                 'id'   => 'email_overdue_header',
-                'name' => '<h3>' . __( 'Payment Reminder', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Payment reminder emails are sent to user automatically.', 'invoicing' ),
+                'name' => '<h3>' . __('Payment Reminder', 'invoicing') . '</h3>',
+                'desc' => __('Payment reminder emails are sent to user automatically.', 'invoicing'),
                 'type' => 'header',
             ),
             'email_overdue_active' => array(
                 'id'   => 'email_overdue_active',
-                'name' => __( 'Enable/Disable', 'invoicing' ),
-                'desc' => __( 'Enable this email notification', 'invoicing' ),
+                'name' => __('Enable/Disable', 'invoicing'),
+                'desc' => __('Enable this email notification', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 1
             ),
             'email_due_reminder_days' => array(
                 'id'        => 'email_due_reminder_days',
-                'name'      => __( 'When to Send', 'sliced-invoices' ),
-                'desc'      => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+                'name'      => __('When to Send', 'sliced-invoices'),
+                'desc'      => __('Check when you would like payment reminders sent out.', 'invoicing'),
                 'default'   => '',
                 'type'      => 'multicheck',
                 'options'   => $overdue_days_options,
             ),
             'email_overdue_subject' => array(
                 'id'   => 'email_overdue_subject',
-                'name' => __( 'Subject', 'invoicing' ),
-                'desc' => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Subject', 'invoicing'),
+                'desc' => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Payment Reminder', 'invoicing' ),
+                'std'  => __('[{site_title}] Payment Reminder', 'invoicing'),
                 'size' => 'large'
             ),
             'email_overdue_heading' => array(
                 'id'   => 'email_overdue_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Payment reminder for your invoice', 'invoicing' ),
+                'std'  => __('Payment reminder for your invoice', 'invoicing'),
                 'size' => 'large'
             ),
             'email_overdue_body' => array(
                 'id'   => 'email_overdue_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email.', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email.', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
+                'std'  => __('<p>Hi {full_name},</p><p>This is just a friendly reminder your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing'),
                 'class' => 'large',
                 'size'  => 10,
             ),
         ),
     );
 
-    return apply_filters( 'wpinv_get_emails', $emails );
+    return apply_filters('wpinv_get_emails', $emails);
 }
 
-function wpinv_settings_emails( $settings = array() ) {
+function wpinv_settings_emails($settings = array()) {
     $emails = wpinv_get_emails();
     
-    if ( !empty( $emails ) ) {
-        foreach ( $emails as $key => $email ) {
+    if (!empty($emails)) {
+        foreach ($emails as $key => $email) {
             $settings[$key] = $email;
         }
     }
     
-    return apply_filters( 'wpinv_settings_get_emails', $settings );
+    return apply_filters('wpinv_settings_get_emails', $settings);
 }
-add_filter( 'wpinv_settings_emails', 'wpinv_settings_emails', 10, 1 );
+add_filter('wpinv_settings_emails', 'wpinv_settings_emails', 10, 1);
 
-function wpinv_settings_sections_emails( $settings ) {
+function wpinv_settings_sections_emails($settings) {
     $emails = wpinv_get_emails();
     
     if (!empty($emails)) {
-        foreach  ($emails as $key => $email) {
-            $settings[$key] = !empty( $email['email_' . $key . '_header']['name'] ) ? strip_tags( $email['email_' . $key . '_header']['name'] ) : $key;
+        foreach ($emails as $key => $email) {
+            $settings[$key] = !empty($email['email_' . $key . '_header']['name']) ? strip_tags($email['email_' . $key . '_header']['name']) : $key;
         }
     }
     
     return $settings;    
 }
-add_filter( 'wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1 );
+add_filter('wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1);
 
-function wpinv_email_is_enabled( $email_type ) {
+function wpinv_email_is_enabled($email_type) {
     $emails = wpinv_get_emails();
-    $enabled = isset( $emails[$email_type] ) && wpinv_get_option( 'email_'. $email_type . '_active', 0 ) ? true : false;
+    $enabled = isset($emails[$email_type]) && wpinv_get_option('email_' . $email_type . '_active', 0) ? true : false;
 
-    return apply_filters( 'wpinv_email_is_enabled', $enabled, $email_type );
+    return apply_filters('wpinv_email_is_enabled', $enabled, $email_type);
 }
 
-function wpinv_email_get_recipient( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    switch ( $email_type ) {
+function wpinv_email_get_recipient($email_type = '', $invoice_id = 0, $invoice = array()) {
+    switch ($email_type) {
         case 'new_invoice':
         case 'cancelled_invoice':
         case 'failed_invoice':
             $recipient  = wpinv_get_admin_email();
         break;
         default:
-            $invoice    = !empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : NULL );
-            $recipient  = !empty( $invoice ) ? $invoice->get_email() : '';
+            $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : NULL);
+            $recipient  = !empty($invoice) ? $invoice->get_email() : '';
         break;
     }
     
-    return apply_filters( 'wpinv_email_recipient', $recipient, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_recipient', $recipient, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_subject( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $subject    = wpinv_get_option( 'email_' . $email_type . '_subject' );
+function wpinv_email_get_subject($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $subject    = wpinv_get_option('email_' . $email_type . '_subject');
     
-    $subject    = wpinv_email_format_text( $subject );
+    $subject    = wpinv_email_format_text($subject);
     
-    return apply_filters( 'wpinv_email_subject', $subject, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_subject', $subject, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_heading( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $email_heading = wpinv_get_option( 'email_' . $email_type . '_heading' );
+function wpinv_email_get_heading($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $email_heading = wpinv_get_option('email_' . $email_type . '_heading');
     
-    $email_heading = wpinv_email_format_text( $email_heading );
+    $email_heading = wpinv_email_format_text($email_heading);
     
-    return apply_filters( 'wpinv_email_heading', $email_heading, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_heading', $email_heading, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_content( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $content    = wpinv_get_option( 'email_' . $email_type . '_body' );
+function wpinv_email_get_content($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $content    = wpinv_get_option('email_' . $email_type . '_body');
     
-    $content    = wpinv_email_format_text( $content );
+    $content    = wpinv_email_format_text($content);
     
-    return apply_filters( 'wpinv_email_content', $content, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_content', $content, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_headers( $email_type = '', $invoice_id = 0, $invoice = array() ) {
+function wpinv_email_get_headers($email_type = '', $invoice_id = 0, $invoice = array()) {
     $from_name = wpinv_mail_get_from_address();
     $from_email = wpinv_mail_get_from_address();
     
-    $invoice    = !empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : NULL );
+    $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : NULL);
     
-    $headers    = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-    $headers    .= "Reply-To: ". $from_email . "\r\n";
+    $headers    = "From: " . stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8')) . " <$from_email>\r\n";
+    $headers    .= "Reply-To: " . $from_email . "\r\n";
     $headers    .= "Content-Type: " . wpinv_mail_get_content_type() . "\r\n";
     
-    return apply_filters( 'wpinv_email_headers', $headers, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_headers', $headers, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_attachments( $email_type = '', $invoice_id = 0, $invoice = array() ) {
+function wpinv_email_get_attachments($email_type = '', $invoice_id = 0, $invoice = array()) {
     $attachments = array();
     
-    return apply_filters( 'wpinv_email_attachments', $attachments, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_attachments', $attachments, $email_type, $invoice_id, $invoice);
 }
 
 function wpinv_email_global_vars() {
@@ -1203,73 +1203,73 @@ 
     $replace['sitename']    = $blogname;
     $replace['site-title']  = $blogname;
     
-    return apply_filters( 'wpinv_email_global_vars', array( $search, $replace ) );
+    return apply_filters('wpinv_email_global_vars', array($search, $replace));
 }
 
-function wpinv_email_format_text( $content ) {
+function wpinv_email_format_text($content) {
     global $wpinv_email_search, $wpinv_email_replace;
     
-    if ( empty( $wpinv_email_search ) ) {
+    if (empty($wpinv_email_search)) {
         $wpinv_email_search = array();
     }
     
-    if ( empty( $wpinv_email_replace ) ) {
+    if (empty($wpinv_email_replace)) {
         $wpinv_email_replace = array();
     }
     
-    $wpinv_email_search     = (array)apply_filters( 'wpinv_email_format_text_search', $wpinv_email_search );
-    $wpinv_email_replace    = (array)apply_filters( 'wpinv_email_format_text_replace', $wpinv_email_replace );
+    $wpinv_email_search     = (array)apply_filters('wpinv_email_format_text_search', $wpinv_email_search);
+    $wpinv_email_replace    = (array)apply_filters('wpinv_email_format_text_replace', $wpinv_email_replace);
     
     $global_vars    = wpinv_email_global_vars();
     
-    $search         = array_merge( $global_vars[0], $wpinv_email_search );
-    $replace        = array_merge( $global_vars[1], $wpinv_email_replace );
+    $search         = array_merge($global_vars[0], $wpinv_email_search);
+    $replace        = array_merge($global_vars[1], $wpinv_email_replace);
     
-    if ( empty( $search ) || empty( $replace ) || !is_array( $search ) || !is_array( $replace ) ) {
+    if (empty($search) || empty($replace) || !is_array($search) || !is_array($replace)) {
         return  $content;
     }
         
-    return str_replace( $search, $replace, $content );
+    return str_replace($search, $replace, $content);
 }
 
-function wpinv_email_style_body( $content ) {
+function wpinv_email_style_body($content) {
     // make sure we only inline CSS for html emails
-    if ( in_array( wpinv_mail_get_content_type(), array( 'text/html', 'multipart/alternative' ) ) && class_exists( 'DOMDocument' ) ) {
+    if (in_array(wpinv_mail_get_content_type(), array('text/html', 'multipart/alternative')) && class_exists('DOMDocument')) {
         ob_start();
-        wpinv_get_template( 'emails/wpinv-email-styles.php' );
-        $css = apply_filters( 'wpinv_email_styles', ob_get_clean() );
+        wpinv_get_template('emails/wpinv-email-styles.php');
+        $css = apply_filters('wpinv_email_styles', ob_get_clean());
         
         // apply CSS styles inline for picky email clients
         try {
-            $emogrifier = new Emogrifier( $content, $css );
+            $emogrifier = new Emogrifier($content, $css);
             $content    = $emogrifier->emogrify();
-        } catch ( Exception $e ) {
-            wpinv_error_log( $e->getMessage(), 'emogrifier' );
+        } catch (Exception $e) {
+            wpinv_error_log($e->getMessage(), 'emogrifier');
         }
     }
     return $content;
 }
 
-function wpinv_email_header( $email_heading = '', $invoice = array(), $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-header.php', array( 'email_heading' => $email_heading, 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_header($email_heading = '', $invoice = array(), $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-header.php', array('email_heading' => $email_heading, 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
 /**
  * Get the email footer.
  */
-function wpinv_email_footer( $invoice = array(), $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-footer.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_footer($invoice = array(), $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-footer.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_wrap_message( $message ) {
+function wpinv_email_wrap_message($message) {
     // Buffer
     ob_start();
 
-    do_action( 'wpinv_email_header' );
+    do_action('wpinv_email_header');
 
-    echo wpautop( wptexturize( $message ) );
+    echo wpautop(wptexturize($message));
 
-    do_action( 'wpinv_email_footer' );
+    do_action('wpinv_email_footer');
 
     // Get contents
     $message = ob_get_clean();
@@ -1277,86 +1277,86 @@ 
     return $message;
 }
 
-function wpinv_email_invoice_details( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-invoice-details.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_invoice_details($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-invoice-details.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_invoice_items( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-invoice-items.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_invoice_items($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-invoice-items.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_billing_details( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-billing-details.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_billing_details($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-billing-details.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_send_customer_invoice( $data = array() ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_customer_invoice($data = array()) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
 
-    if ( !current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to send invoice notification', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to send invoice notification', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
-    $sent = wpinv_user_invoice_notification( $invoice_id );
+    $sent = wpinv_user_invoice_notification($invoice_id);
     
     $status = $sent ? 'email_sent' : 'email_fail';
     
-    $redirect = add_query_arg( array( 'wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false ) );
-    wp_redirect( $redirect );
+    $redirect = add_query_arg(array('wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false));
+    wp_redirect($redirect);
     exit;
 }
-add_action( 'wpinv_send_invoice', 'wpinv_send_customer_invoice' );
+add_action('wpinv_send_invoice', 'wpinv_send_customer_invoice');
 
-function wpinv_send_overdue_reminder( $data = array() ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_overdue_reminder($data = array()) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
 
-    if ( !current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to send reminder notification', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to send reminder notification', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
-    $sent = wpinv_send_payment_reminder_notification( $invoice_id );
+    $sent = wpinv_send_payment_reminder_notification($invoice_id);
     
     $status = $sent ? 'email_sent' : 'email_fail';
     
-    $redirect = add_query_arg( array( 'wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false ) );
-    wp_redirect( $redirect );
+    $redirect = add_query_arg(array('wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false));
+    wp_redirect($redirect);
     exit;
 }
-add_action( 'wpinv_send_reminder', 'wpinv_send_overdue_reminder' );
+add_action('wpinv_send_reminder', 'wpinv_send_overdue_reminder');
 
-function wpinv_send_customer_note_email( $data ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_customer_note_email($data) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
     
-    $sent = wpinv_user_note_notification( $invoice_id, $data );
+    $sent = wpinv_user_note_notification($invoice_id, $data);
 }
-add_action( 'wpinv_new_customer_note', 'wpinv_send_customer_note_email', 10, 1 );
+add_action('wpinv_new_customer_note', 'wpinv_send_customer_note_email', 10, 1);
 
-function wpinv_add_notes_to_invoice_email( $invoice, $email_type, $sent_to_admin ) {
-    if ( !empty( $invoice ) && $email_type == 'user_invoice' && $invoice_notes = wpinv_get_invoice_notes( $invoice->ID, true ) ) {
-        $date_format = get_option( 'date_format' );
-        $time_format = get_option( 'time_format' );
+function wpinv_add_notes_to_invoice_email($invoice, $email_type, $sent_to_admin) {
+    if (!empty($invoice) && $email_type == 'user_invoice' && $invoice_notes = wpinv_get_invoice_notes($invoice->ID, true)) {
+        $date_format = get_option('date_format');
+        $time_format = get_option('time_format');
         ?>
         <div id="wpinv-email-notes">
-            <h3 class="wpinv-notes-t"><?php echo apply_filters( 'wpinv_email_invoice_notes_title', __( 'Invoice Notes', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-notes-t"><?php echo apply_filters('wpinv_email_invoice_notes_title', __('Invoice Notes', 'invoicing')); ?></h3>
             <ol class="wpinv-notes-lists">
         <?php
-        foreach ( $invoice_notes as $note ) {
-            $note_time = strtotime( $note->comment_date );
+        foreach ($invoice_notes as $note) {
+            $note_time = strtotime($note->comment_date);
             ?>
             <li class="comment wpinv-note">
-            <p class="wpinv-note-date meta"><?php printf( __( '%2$s at %3$s', 'invoicing' ), $note->comment_author, date_i18n( $date_format, $note_time ), date_i18n( $time_format, $note_time ), $note_time ); ?></p>
-            <div class="wpinv-note-desc description"><?php echo wpautop( wptexturize( $note->comment_content ) ); ?></div>
+            <p class="wpinv-note-date meta"><?php printf(__('%2$s at %3$s', 'invoicing'), $note->comment_author, date_i18n($date_format, $note_time), date_i18n($time_format, $note_time), $note_time); ?></p>
+            <div class="wpinv-note-desc description"><?php echo wpautop(wptexturize($note->comment_content)); ?></div>
             </li>
             <?php
         }
@@ -1365,21 +1365,21 @@ 
         <?php
     }
 }
-add_action( 'wpinv_email_billing_details', 'wpinv_add_notes_to_invoice_email', 10, 3 );
+add_action('wpinv_email_billing_details', 'wpinv_add_notes_to_invoice_email', 10, 3);
 
 function wpinv_email_payment_reminders() {    
     global $wpi_auto_reminder;
-    if ( !wpinv_get_option( 'email_overdue_active' ) ) {
+    if (!wpinv_get_option('email_overdue_active')) {
         return;
     }
     
-    if ( $reminder_days = wpinv_get_option( 'email_due_reminder_days' ) ) {
-        $reminder_days  = is_array( $reminder_days ) ? array_values( $reminder_days ) : '';
+    if ($reminder_days = wpinv_get_option('email_due_reminder_days')) {
+        $reminder_days  = is_array($reminder_days) ? array_values($reminder_days) : '';
         
-        if ( empty( $reminder_days ) ) {
+        if (empty($reminder_days)) {
             return;
         }
-        $reminder_days  = array_unique( array_map( 'absint', $reminder_days ) );
+        $reminder_days = array_unique(array_map('absint', $reminder_days));
         
         $args = array(
             'post_type'     => 'wpi_invoice',
@@ -1389,7 +1389,7 @@ 
             'meta_query'    => array(
                 array(
                     'key'       =>  '_wpinv_due_date',
-                    'value'     =>  array( '', 'none' ),
+                    'value'     =>  array('', 'none'),
                     'compare'   =>  'NOT IN',
                 )
             ),
@@ -1398,64 +1398,64 @@ 
             'order'         => 'ASC',
         );
         
-        $invoices = get_posts( $args );
+        $invoices = get_posts($args);
         
-        if ( empty( $invoices ) ) {
+        if (empty($invoices)) {
             return;
         }
         
-        $date_to_send   = array();
+        $date_to_send = array();
         
-        foreach ( $invoices as $id ) {
-            $due_date = get_post_meta( $id, '_wpinv_due_date', true );
+        foreach ($invoices as $id) {
+            $due_date = get_post_meta($id, '_wpinv_due_date', true);
             
-            foreach ( $reminder_days as $key => $days ) {
-                if ( $days !== '' ) {
-                    $date_to_send[$id][] = date_i18n( 'Y-m-d', strtotime( $due_date ) + ( $days * DAY_IN_SECONDS ) );
+            foreach ($reminder_days as $key => $days) {
+                if ($days !== '') {
+                    $date_to_send[$id][] = date_i18n('Y-m-d', strtotime($due_date) + ($days * DAY_IN_SECONDS));
                 }
             }
         }
 
-        $today              = date_i18n( 'Y-m-d' );
+        $today              = date_i18n('Y-m-d');
         $wpi_auto_reminder  = true;
 
-        foreach ( $date_to_send as $id => $values ) {
-            if ( in_array( $today, $values ) ) {
-                $sent = get_post_meta( $id, '_wpinv_reminder_sent', true );
+        foreach ($date_to_send as $id => $values) {
+            if (in_array($today, $values)) {
+                $sent = get_post_meta($id, '_wpinv_reminder_sent', true);
 
-                if ( isset( $sent ) && !empty( $sent ) ) {
-                    if ( !in_array( $today, $sent ) ) {
-                        do_action( 'wpinv_send_payment_reminder_notification', $id );
+                if (isset($sent) && !empty($sent)) {
+                    if (!in_array($today, $sent)) {
+                        do_action('wpinv_send_payment_reminder_notification', $id);
                     }
                 } else {
-                    do_action( 'wpinv_send_payment_reminder_notification', $id );
+                    do_action('wpinv_send_payment_reminder_notification', $id);
                 }
             }
         }
         
-        $wpi_auto_reminder  = false;
+        $wpi_auto_reminder = false;
     }
 }
 
-function wpinv_send_payment_reminder_notification( $invoice_id ) {
+function wpinv_send_payment_reminder_notification($invoice_id) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'overdue';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice    = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !$invoice->needs_payment() ) {
+    if (!$invoice->needs_payment()) {
         return false;
     }
     
-    $recipient  = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -1471,70 +1471,70 @@ 
     $replace                    = array();
     $replace['full_name']       = $invoice->get_user_full_name();
     $replace['invoice_number']  = $invoice->get_number();
-    $replace['invoice_due_date']= $invoice->get_due_date( true );
-    $replace['invoice_total']   = $invoice->get_total( true );
-    $replace['invoice_link']    = $invoice->get_view_url( true );
-    $replace['invoice_pay_link']= $replace['invoice_link'];
-    $replace['is_was']          = strtotime( $invoice->get_due_date() ) < strtotime( date_i18n( 'Y-m-d' ) ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' );
+    $replace['invoice_due_date'] = $invoice->get_due_date(true);
+    $replace['invoice_total']   = $invoice->get_total(true);
+    $replace['invoice_link']    = $invoice->get_view_url(true);
+    $replace['invoice_pay_link'] = $replace['invoice_link'];
+    $replace['is_was']          = strtotime($invoice->get_due_date()) < strtotime(date_i18n('Y-m-d')) ? __('was', 'invoicing') : __('is', 'invoicing');
 
     $wpinv_email_search         = $search;
     $wpinv_email_replace        = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $message_body   = wpinv_email_get_content( $email_type, $invoice_id, $invoice );
+    $message_body   = wpinv_email_get_content($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
             'message_body'  => $message_body
-        ) );
+        ));
         
-    $content        = wpinv_email_format_text( $content );
+    $content = wpinv_email_format_text($content);
 
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
-    if ( $sent ) {
-        do_action( 'wpinv_payment_reminder_sent', $invoice_id, $invoice );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
+    if ($sent) {
+        do_action('wpinv_payment_reminder_sent', $invoice_id, $invoice);
     }
         
     return $sent;
 }
-add_action( 'wpinv_send_payment_reminder_notification', 'wpinv_send_payment_reminder_notification', 10, 1 );
+add_action('wpinv_send_payment_reminder_notification', 'wpinv_send_payment_reminder_notification', 10, 1);
 
-function wpinv_payment_reminder_sent( $invoice_id, $invoice ) {
+function wpinv_payment_reminder_sent($invoice_id, $invoice) {
     global $wpi_auto_reminder;
     
-    $sent = get_post_meta( $invoice_id, '_wpinv_reminder_sent', true );
+    $sent = get_post_meta($invoice_id, '_wpinv_reminder_sent', true);
     
-    if ( empty( $sent ) ) {
+    if (empty($sent)) {
         $sent = array();
     }
-    $sent[] = date_i18n( 'Y-m-d' );
+    $sent[] = date_i18n('Y-m-d');
     
-    update_post_meta( $invoice_id, '_wpinv_reminder_sent', $sent );
+    update_post_meta($invoice_id, '_wpinv_reminder_sent', $sent);
     
-    if ( $wpi_auto_reminder ) { // Auto reminder note.
-        $note = __( 'Manual reminder sent to the user.', 'invoicing' );
-        $invoice->add_note( $note, false, false, true );
+    if ($wpi_auto_reminder) { // Auto reminder note.
+        $note = __('Manual reminder sent to the user.', 'invoicing');
+        $invoice->add_note($note, false, false, true);
     } else { // Menual reminder note.
-        $note = __( 'Manual reminder sent to the user.', 'invoicing' );
-        $invoice->add_note( $note );
+        $note = __('Manual reminder sent to the user.', 'invoicing');
+        $invoice->add_note($note);
     }
 }
-add_action( 'wpinv_payment_reminder_sent', 'wpinv_payment_reminder_sent', 10, 2 );
+add_action('wpinv_payment_reminder_sent', 'wpinv_payment_reminder_sent', 10, 2);
 
-function wpinv_email_before_note_details( $invoice, $email_type, $sent_to_admin, $customer_note ) {
+function wpinv_email_before_note_details($invoice, $email_type, $sent_to_admin, $customer_note) {
     if ("wpi_invoice" === $invoice->post_type && !empty($customer_note)) {
         $before_note = '';
-        $before_note .= __( 'Hello, a note has just been added to your invoice:', 'invoicing' );
-        $before_note .= '<blockquote class="wpinv-note">'.wpautop( wptexturize( $customer_note ) ).'</blockquote>';
-        $before_note .= __( 'For your reference, your invoice details are shown below.', 'invoicing' );
+        $before_note .= __('Hello, a note has just been added to your invoice:', 'invoicing');
+        $before_note .= '<blockquote class="wpinv-note">' . wpautop(wptexturize($customer_note)) . '</blockquote>';
+        $before_note .= __('For your reference, your invoice details are shown below.', 'invoicing');
         echo $before_note;
     }
 }
\ No newline at end of file

templates/emails/wpinv-email-styles.php

Spacing +35 added lines, -35 removed lines

@@ -1,25 +1,25 @@ 
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
 // Load colours
-$bg              = wpinv_get_option( 'email_background_color', '#f5f5f5' );
-$body            = wpinv_get_option( 'email_body_background_color', '#fdfdfd' );
-$base            = wpinv_get_option( 'email_base_color', '#557da2' );
-$base_text       = wpinv_light_or_dark( $base, '#202020', '#ffffff' );
-$text            = wpinv_get_option( 'email_text_color', '#505050' );
+$bg              = wpinv_get_option('email_background_color', '#f5f5f5');
+$body            = wpinv_get_option('email_body_background_color', '#fdfdfd');
+$base            = wpinv_get_option('email_base_color', '#557da2');
+$base_text       = wpinv_light_or_dark($base, '#202020', '#ffffff');
+$text            = wpinv_get_option('email_text_color', '#505050');
 
-$bg_darker_10    = wpinv_hex_darker( $bg, 10 );
-$body_darker_10  = wpinv_hex_darker( $body, 10 );
-$base_lighter_20 = wpinv_hex_lighter( $base, 20 );
-$base_lighter_40 = wpinv_hex_lighter( $base, 40 );
-$text_lighter_20 = wpinv_hex_lighter( $text, 20 );
+$bg_darker_10    = wpinv_hex_darker($bg, 10);
+$body_darker_10  = wpinv_hex_darker($body, 10);
+$base_lighter_20 = wpinv_hex_lighter($base, 20);
+$base_lighter_40 = wpinv_hex_lighter($base, 40);
+$text_lighter_20 = wpinv_hex_lighter($text, 20);
 
 // !important; is a gmail hack to prevent styles being stripped if it doesn't like something.
 ?>
 #wrapper {
-    background-color: <?php echo esc_attr( $bg ); ?>;
+    background-color: <?php echo esc_attr($bg); ?>;
     margin: 0;
     -webkit-text-size-adjust: none !important;
     padding: 3%;
@@ -40,15 +40,15 @@ 
 
 #template_container {
     box-shadow: 0 1px 4px rgba(0,0,0,0.1) !important;
-    background-color: <?php echo esc_attr( $body ); ?>;
-    border: 1px solid <?php echo esc_attr( $bg_darker_10 ); ?>;
+    background-color: <?php echo esc_attr($body); ?>;
+    border: 1px solid <?php echo esc_attr($bg_darker_10); ?>;
     border-radius: 3px !important;
 }
 
 #template_header {
-    background-color: <?php echo esc_attr( $base ); ?>;
+    background-color: <?php echo esc_attr($base); ?>;
     border-radius: 3px 3px 0 0 !important;
-    color: <?php echo esc_attr( $base_text ); ?>;
+    color: <?php echo esc_attr($base_text); ?>;
     border-bottom: 0;
     font-weight: bold;
     line-height: 100%;
@@ -61,7 +61,7 @@ 
 }
 
 #template_header h1 {
-    color: <?php echo esc_attr( $base_text ); ?>;
+    color: <?php echo esc_attr($base_text); ?>;
 }
 
 #template_footer td {
@@ -72,7 +72,7 @@ 
 
 #template_footer #credit {
     border:0;
-    color: <?php echo esc_attr( $base_lighter_40 ); ?>;
+    color: <?php echo esc_attr($base_lighter_40); ?>;
     font-family: Arial;
     font-size:12px;
     line-height:125%;
@@ -81,7 +81,7 @@ 
 }
 
 #body_content {
-    background-color: <?php echo esc_attr( $body ); ?>;
+    background-color: <?php echo esc_attr($body); ?>;
 }
 
 #body_content table td {
@@ -101,7 +101,7 @@ 
 }
 
 #body_content_inner {
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
+    color: <?php echo esc_attr($text_lighter_20); ?>;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 14px;
     line-height: 150%;
@@ -109,17 +109,17 @@ 
 }
 
 .td {
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
+    color: <?php echo esc_attr($text_lighter_20); ?>;
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
 }
 
 .text {
-    color: <?php echo esc_attr( $text ); ?>;
+    color: <?php echo esc_attr($text); ?>;
     font-family: Arial,Helvetica,sans-serif;
 }
 
 .link {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
 }
 
 #header_wrapper {
@@ -128,19 +128,19 @@ 
 }
 
 h1 {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 30px;
     font-weight: 300;
     line-height: 150%;
     margin: 0;
     text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
-    text-shadow: 0 1px 0 <?php echo esc_attr( $base_lighter_20 ); ?>;
+    text-shadow: 0 1px 0 <?php echo esc_attr($base_lighter_20); ?>;
     -webkit-font-smoothing: antialiased;
 }
 
 h2 {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
     display: block;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 18px;
@@ -151,7 +151,7 @@ 
 }
 
 h3 {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
     display: block;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 16px;
@@ -162,7 +162,7 @@ 
 }
 
 a {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
     font-weight: normal;
     text-decoration: underline;
 }
@@ -180,7 +180,7 @@ 
 }
 
 .table-bordered {
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
     border-collapse: collapse;
     border-spacing: 0;
     width: 100%;
@@ -188,8 +188,8 @@ 
 
 .table-bordered th,
 .table-bordered td {
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
+    color: <?php echo esc_attr($text_lighter_20); ?>;
     font-size: 14px;
 }
 .small {
@@ -288,9 +288,9 @@ 
   text-decoration: none;
 }
 .btn-default {
-    color: <?php echo esc_attr( $base_text ); ?>;
-    background-color: <?php echo esc_attr( $base ); ?>;
-    border-color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base_text); ?>;
+    background-color: <?php echo esc_attr($base); ?>;
+    border-color: <?php echo esc_attr($base); ?>;
 }
 .btn-primary {
   color: #fff;