AyeCode / invoicing

includes/wpinv-email-functions.php

Doc Comments +6 added lines

@@ -664,6 +664,9 @@ 
     return $sent;
 }
 
+/**
+ * @return string
+ */
 function wpinv_mail_get_from_address() {
     $from_address = apply_filters( 'wpinv_mail_from_address', wpinv_get_option( 'email_from' ) );
     return sanitize_email( $from_address );
@@ -1123,6 +1126,9 @@ 
 }
 add_filter( 'wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1 );
 
+/**
+ * @param string $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;

Spacing +579 added lines, -579 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',
@@ -30,377 +30,377 @@ 
         '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_status_publish_to_wpi-refunded_notification', 'wpinv_fully_refunded_notification' );
-add_action( 'wpinv_status_wpi-processing_to_wpi-refunded_notification', 'wpinv_fully_refunded_notification' );
+add_action('wpinv_fully_refunded_notification', 'wpinv_fully_refunded_notification');
+add_action('wpinv_partially_refunded_notification', 'wpinv_partially_refunded_notification');
+add_action('wpinv_status_publish_to_wpi-refunded_notification', 'wpinv_fully_refunded_notification');
+add_action('wpinv_status_wpi-processing_to_wpi-refunded_notification', 'wpinv_fully_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_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);
 
 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 = '') {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type, true );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type, true);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
             'message_body'  => $message_body,
-        ) );
+        ));
 
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type, true );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type, true);
 
     return $sent;
 }
 
-function wpinv_cancelled_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_cancelled_invoice_notification($invoice_id, $new_status = '') {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type, true );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type, true);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
             'message_body'  => $message_body,
-        ) );
+        ));
 
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type, true );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type, true);
 
     return $sent;
 }
 
-function wpinv_failed_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_failed_invoice_notification($invoice_id, $new_status = '') {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type, true );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type, true);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
             'message_body'  => $message_body,
-        ) );
+        ));
 
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type, true );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type, true);
 
     return $sent;
 }
 
-function wpinv_onhold_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_onhold_invoice_notification($invoice_id, $new_status = '') {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
             'message_body'  => $message_body,
-        ) );
+        ));
     
-    $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);
     }
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type);
 
     return $sent;
 }
 
-function wpinv_processing_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_processing_invoice_notification($invoice_id, $new_status = '') {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type);
 
     $search                     = array();
     $search['invoice_number']   = '{invoice_number}';
     $search['invoice_date']     = '{invoice_date}';
     $search['name']             = '{name}';
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
             'message_body'  => $message_body,
-        ) );
+        ));
 
-    $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);
     }
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type);
 
     return $sent;
 }
 
-function wpinv_completed_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_completed_invoice_notification($invoice_id, $new_status = '') {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
             'message_body'  => $message_body,
-        ) );
+        ));
 
-    $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);
     }
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type);
 
     return $sent;
 }
 
-function wpinv_fully_refunded_notification( $invoice_id, $new_status = '' ) {
+function wpinv_fully_refunded_notification($invoice_id, $new_status = '') {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
@@ -408,50 +408,50 @@ 
             'plain_text'        => false,
             'partial_refund'    => false,
             'message_body'      => $message_body,
-        ) );
+        ));
 
-    $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);
     }
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type);
 
     return $sent;
 }
 
-function wpinv_partially_refunded_notification( $invoice_id, $new_status = '' ) {
+function wpinv_partially_refunded_notification($invoice_id, $new_status = '') {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
@@ -459,95 +459,95 @@ 
             'plain_text'        => false,
             'partial_refund'    => true,
             'message_body'      => $message_body,
-        ) );
+        ));
 
-    $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);
     }
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type);
 
     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) {
     $email_type = 'user_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return -1;
     }
 
-    $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
             'message_body'  => $message_body,
-        ) );
+        ));
 
-    $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);
     }
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type);
 
-    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.
 
     return $sent;
 }
 
-function wpinv_user_note_notification( $invoice_id, $args = array() ) {
+function wpinv_user_note_notification($invoice_id, $args = array()) {
     $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;
     }
 
@@ -555,19 +555,19 @@ 
         'user_note' => ''
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
 
-    $message_body   = str_replace( '{customer_note}', $args['user_note'], $message_body );
+    $message_body   = str_replace('{customer_note}', $args['user_note'], $message_body);
 
-    $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,
@@ -575,36 +575,36 @@ 
             'plain_text'    => false,
             'message_body'  => $message_body,
             'customer_note' => $args['user_note']
-        ) );
+        ));
 
-    $content        = wpinv_email_format_text( $content, $invoice );
+    $content = wpinv_email_format_text($content, $invoice);
 
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type);
 
     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;
@@ -619,35 +619,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
@@ -655,39 +655,39 @@ 
             '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'
             ),
             'email_new_invoice_body' => array(
                 'id'   => 'email_new_invoice_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi Admin,</p><p>You have received payment invoice from {name}.</p>', 'invoicing' ),
+                'std'  => __('<p>Hi Admin,</p><p>You have received payment invoice from {name}.</p>', 'invoicing'),
                 'class' => 'large',
                 'size' => '10'
             ),
@@ -695,39 +695,39 @@ 
         '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'
             ),
             'email_cancelled_invoice_body' => array(
                 'id'   => 'email_cancelled_invoice_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi Admin,</p><p>The invoice #{invoice_number} from {site_title} has been cancelled.</p>', 'invoicing' ),
+                'std'  => __('<p>Hi Admin,</p><p>The invoice #{invoice_number} from {site_title} has been cancelled.</p>', 'invoicing'),
                 'class' => 'large',
                 'size' => '10'
             ),
@@ -735,39 +735,39 @@ 
         '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'
             ),
             'email_failed_invoice_body' => array(
                 'id'   => 'email_failed_invoice_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi Admin,</p><p>Payment for invoice #{invoice_number} from {site_title} has been failed.</p>', 'invoicing' ),
+                'std'  => __('<p>Hi Admin,</p><p>Payment for invoice #{invoice_number} from {site_title} has been failed.</p>', 'invoicing'),
                 'class' => 'large',
                 'size' => '10'
             ),
@@ -775,46 +775,46 @@ 
         '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
             ),
             'email_onhold_invoice_body' => array(
                 'id'   => 'email_onhold_invoice_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {name},</p><p>Your invoice is on-hold until we confirm your payment has been received.</p>', 'invoicing' ),
+                'std'  => __('<p>Hi {name},</p><p>Your invoice is on-hold until we confirm your payment has been received.</p>', 'invoicing'),
                 'class' => 'large',
                 'size' => '10'
             ),
@@ -822,46 +822,46 @@ 
         '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
             ),
             'email_processing_invoice_body' => array(
                 'id'   => 'email_processing_invoice_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {name},</p><p>Your invoice has been received at {site_title} and is now being processed.</p>', 'invoicing' ),
+                'std'  => __('<p>Hi {name},</p><p>Your invoice has been received at {site_title} and is now being processed.</p>', 'invoicing'),
                 'class' => 'large',
                 'size' => '10'
             ),
@@ -869,45 +869,45 @@ 
         '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',
             ),
             'email_completed_invoice_body' => array(
                 'id'   => 'email_completed_invoice_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid.</p>', 'invoicing' ),
+                'std'  => __('<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid.</p>', 'invoicing'),
                 'class' => 'large',
                 'size' => '10'
             ),
@@ -916,46 +916,46 @@ 
         '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
             ),
             'email_refunded_invoice_body' => array(
                 'id'   => 'email_refunded_invoice_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded.</p>', 'invoicing' ),
+                'std'  => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded.</p>', 'invoicing'),
                 'class' => 'large',
                 'size' => '10'
             ),
@@ -963,46 +963,46 @@ 
         '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
             ),
             'email_user_invoice_body' => array(
                 'id'   => 'email_user_invoice_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {name},</p><p>An invoice has been created for you on {site_title}. To view / pay for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
+                'std'  => __('<p>Hi {name},</p><p>An invoice has been created for you on {site_title}. To view / pay 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'
             ),
@@ -1010,39 +1010,39 @@ 
         '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_label} #{invoice_number} from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Note added to your {invoice_label} #{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_label}', 'invoicing' ),
+                'std'  => __('A note has been added to your {invoice_label}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_user_note_body' => array(
                 'id'   => 'email_user_note_body',
-                'name' => __( 'Email Content', 'invoicing' ),
-                'desc' => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {name},</p><p>Following note has been added to your {invoice_label}:</p><blockquote class="wpinv-note">{customer_note}</blockquote>', 'invoicing' ),
+                'std'  => __('<p>Hi {name},</p><p>Following note has been added to your {invoice_label}:</p><blockquote class="wpinv-note">{customer_note}</blockquote>', 'invoicing'),
                 'class' => 'large',
                 'size' => '10'
             ),
@@ -1050,158 +1050,158 @@ 
         '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', 'invoicing' ),
-                'desc'      => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+                'name'      => __('When to Send', 'invoicing'),
+                '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 that 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 that 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' );
-    $subject    = __( $subject, 'invoicing' );
+function wpinv_email_get_subject($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $subject    = wpinv_get_option('email_' . $email_type . '_subject');
+    $subject    = __($subject, 'invoicing');
 
-    $subject    = wpinv_email_format_text( $subject, $invoice );
+    $subject    = wpinv_email_format_text($subject, $invoice);
 
-    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' );
-    $email_heading = __( $email_heading, 'invoicing' );
+function wpinv_email_get_heading($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $email_heading = wpinv_get_option('email_' . $email_type . '_heading');
+    $email_heading = __($email_heading, 'invoicing');
 
-    $email_heading = wpinv_email_format_text( $email_heading, $invoice );
+    $email_heading = wpinv_email_format_text($email_heading, $invoice);
 
-    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' );
-    $content    = __( $content, 'invoicing' );
+function wpinv_email_get_content($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $content    = wpinv_get_option('email_' . $email_type . '_body');
+    $content    = __($content, 'invoicing');
 
-    $content    = wpinv_email_format_text( $content, $invoice );
+    $content    = wpinv_email_format_text($content, $invoice);
 
-    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_format_text( $content, $invoice ) {
+function wpinv_email_format_text($content, $invoice) {
     $replace_array = array(
         '{site_title}'      => wpinv_get_blogname(),
-        '{date}'            => date_i18n( get_option( 'date_format' ), (int) current_time( 'timestamp' ) ),
+        '{date}'            => date_i18n(get_option('date_format'), (int)current_time('timestamp')),
     );
     
-    if ( !empty( $invoice->ID ) ) {
+    if (!empty($invoice->ID)) {
         $replace_array = array_merge(
             $replace_array, 
             array(
@@ -1211,65 +1211,65 @@ 
                 '{last_name}'       => $invoice->get_last_name(),
                 '{email}'           => $invoice->get_email(),
                 '{invoice_number}'  => $invoice->get_number(),
-                '{invoice_total}'   => $invoice->get_total( true ),
-                '{invoice_link}'    => $invoice->get_view_url( true ),
-                '{invoice_pay_link}'=> $invoice->get_view_url( true ),
-                '{invoice_date}'    => $invoice->get_invoice_date( true ),
-                '{invoice_due_date}'=> $invoice->get_due_date( true ),
-                '{invoice_quote}'   => $invoice->get_invoice_quote_type( $invoice->ID ),
-                '{invoice_label}'   => $invoice->get_invoice_quote_type( $invoice->ID ),
-                '{is_was}'          => strtotime( $invoice->get_due_date() ) < strtotime( date_i18n( 'Y-m-d' ) ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+                '{invoice_total}'   => $invoice->get_total(true),
+                '{invoice_link}'    => $invoice->get_view_url(true),
+                '{invoice_pay_link}'=> $invoice->get_view_url(true),
+                '{invoice_date}'    => $invoice->get_invoice_date(true),
+                '{invoice_due_date}'=> $invoice->get_due_date(true),
+                '{invoice_quote}'   => $invoice->get_invoice_quote_type($invoice->ID),
+                '{invoice_label}'   => $invoice->get_invoice_quote_type($invoice->ID),
+                '{is_was}'          => strtotime($invoice->get_due_date()) < strtotime(date_i18n('Y-m-d')) ? __('was', 'invoicing') : __('is', 'invoicing'),
             )
         );
     }
 
-    $replace_array = apply_filters( 'wpinv_email_format_text', $replace_array, $content, $invoice );
+    $replace_array = apply_filters('wpinv_email_format_text', $replace_array, $content, $invoice);
 
-    foreach ( $replace_array as $key => $value ) {
-        $content = str_replace( $key, $value, $content );
+    foreach ($replace_array as $key => $value) {
+        $content = str_replace($key, $value, $content);
     }
 
-    return apply_filters( 'wpinv_email_content_replace', $content );
+    return apply_filters('wpinv_email_content_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,92 +1277,92 @@ 
     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);
 
     if ( -1 === $sent ) {
         $status = 'email_disabled';
-    } elseif ( $sent ) {
+    } elseif ($sent) {
         $status = 'email_sent';
     } else {
         $status = '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
         }
@@ -1371,21 +1371,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',
@@ -1395,7 +1395,7 @@ 
             'meta_query'    => array(
                 array(
                     'key'       =>  '_wpinv_due_date',
-                    'value'     =>  array( '', 'none' ),
+                    'value'     =>  array('', 'none'),
                     'compare'   =>  'NOT IN',
                 )
             ),
@@ -1404,143 +1404,143 @@ 
             '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) {
     $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;
     }
 
-    do_action( 'wpinv_pre_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_pre_send_invoice_notification', $invoice, $email_type);
 
-    $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 );
-    $message_body   = wpinv_email_get_content( $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);
+    $message_body   = wpinv_email_get_content($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,
             'message_body'  => $message_body
-        ) );
+        ));
 
-    $content        = wpinv_email_format_text( $content, $invoice );
+    $content = wpinv_email_format_text($content, $invoice);
 
-    $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);
     }
 
-    do_action( 'wpinv_post_send_invoice_notification', $invoice, $email_type );
+    do_action('wpinv_post_send_invoice_notification', $invoice, $email_type);
 
     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 = __( 'Automated reminder sent to the user.', 'invoicing' );
-        $invoice->add_note( $note, false, false, true );
+    if ($wpi_auto_reminder) { // Auto reminder note.
+        $note = __('Automated 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_invoice_notification_set_locale( $invoice, $email_type, $site = false ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_notification_set_locale($invoice, $email_type, $site = false) {
+    if (empty($invoice)) {
         return;
     }
 
-    if ( is_int( $invoice ) ) {
-        $invoice = new wpinv_get_invoice( $invoice );
+    if (is_int($invoice)) {
+        $invoice = new wpinv_get_invoice($invoice);
     }
 
-    if ( ! empty( $invoice ) && is_object( $invoice ) ) {
-        if ( ! $site && function_exists( 'get_user_locale' ) ) {
-            $locale = get_user_locale( $invoice->get_user_id() );
+    if (!empty($invoice) && is_object($invoice)) {
+        if (!$site && function_exists('get_user_locale')) {
+            $locale = get_user_locale($invoice->get_user_id());
         } else {
             $locale = get_locale();
         }
 
-        wpinv_switch_to_locale( $locale );
+        wpinv_switch_to_locale($locale);
     }
 }
-add_action( 'wpinv_pre_send_invoice_notification', 'wpinv_invoice_notification_set_locale', 10, 3 );
+add_action('wpinv_pre_send_invoice_notification', 'wpinv_invoice_notification_set_locale', 10, 3);
 
-function wpinv_invoice_notification_restore_locale( $invoice, $email_type, $site = false ) {
-    if ( empty( $invoice ) ) {
+function wpinv_invoice_notification_restore_locale($invoice, $email_type, $site = false) {
+    if (empty($invoice)) {
         return;
     }
 
     wpinv_restore_locale();
 }
-add_action( 'wpinv_post_send_invoice_notification', 'wpinv_invoice_notification_restore_locale', 10, 3 );
+add_action('wpinv_post_send_invoice_notification', 'wpinv_invoice_notification_restore_locale', 10, 3);

includes/wpinv-template-functions.php

Doc Comments +9 added lines

@@ -140,6 +140,9 @@ 
 	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
 }
 
+/**
+ * @param string $template_name
+ */
 function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
 	ob_start();
 	wpinv_get_template( $template_name, $args, $template_path, $default_path );
@@ -172,6 +175,9 @@ 
     return apply_filters( 'wpinv_locate_template', $template, $template_name, $template_path );
 }
 
+/**
+ * @param string $slug
+ */
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
 	do_action( 'get_template_part_' . $slug, $slug, $name );
 
@@ -871,6 +877,9 @@ 
     return apply_filters( 'wpinv_get_watermark', $output, $id );
 }
 
+/**
+ * @param integer $id
+ */
 function wpinv_get_watermark( $id ) {
     if ( !$id > 0 ) {
         return NULL;

Indentation +95 added lines, -95 removed lines

@@ -103,29 +103,29 @@ 
 
 function wpinv_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
     if ( ! empty( $args ) && is_array( $args ) ) {
-		extract( $args );
-	}
+        extract( $args );
+    }
 
-	$located = wpinv_locate_template( $template_name, $template_path, $default_path );
-	// Allow 3rd party plugin filter template file from their plugin.
-	$located = apply_filters( 'wpinv_get_template', $located, $template_name, $args, $template_path, $default_path );
+    $located = wpinv_locate_template( $template_name, $template_path, $default_path );
+    // Allow 3rd party plugin filter template file from their plugin.
+    $located = apply_filters( 'wpinv_get_template', $located, $template_name, $args, $template_path, $default_path );
 
-	if ( ! file_exists( $located ) ) {
+    if ( ! file_exists( $located ) ) {
         _doing_it_wrong( __FUNCTION__, sprintf( '<code>%s</code> does not exist.', $located ), '2.1' );
-		return;
-	}
+        return;
+    }
 
-	do_action( 'wpinv_before_template_part', $template_name, $template_path, $located, $args );
+    do_action( 'wpinv_before_template_part', $template_name, $template_path, $located, $args );
 
-	include( $located );
+    include( $located );
 
-	do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
+    do_action( 'wpinv_after_template_part', $template_name, $template_path, $located, $args );
 }
 
 function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-	ob_start();
-	wpinv_get_template( $template_name, $args, $template_path, $default_path );
-	return ob_get_clean();
+    ob_start();
+    wpinv_get_template( $template_name, $args, $template_path, $default_path );
+    return ob_get_clean();
 }
 
 function wpinv_locate_template( $template_name, $template_path = '', $default_path = '' ) {
@@ -155,126 +155,126 @@ 
 }
 
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+    do_action( 'get_template_part_' . $slug, $slug, $name );
 
-	// Setup possible parts
-	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
-	$templates[] = $slug . '.php';
+    // Setup possible parts
+    $templates = array();
+    if ( isset( $name ) )
+        $templates[] = $slug . '-' . $name . '.php';
+    $templates[] = $slug . '.php';
 
-	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+    // Allow template parts to be filtered
+    $templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
 
-	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+    // Return the part that is found
+    return wpinv_locate_tmpl( $templates, $load, false );
 }
 
 function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
-	// No file found yet
-	$located = false;
+    // No file found yet
+    $located = false;
 
-	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+    // Try to find a template file
+    foreach ( (array)$template_names as $template_name ) {
 
-		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+        // Continue if template is empty
+        if ( empty( $template_name ) )
+            continue;
 
-		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+        // Trim off any slashes from the template name
+        $template_name = ltrim( $template_name, '/' );
 
-		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+        // try locating this template file by looping through the template paths
+        foreach( wpinv_get_theme_template_paths() as $template_path ) {
 
-			if( file_exists( $template_path . $template_name ) ) {
-				$located = $template_path . $template_name;
-				break;
-			}
-		}
+            if( file_exists( $template_path . $template_name ) ) {
+                $located = $template_path . $template_name;
+                break;
+            }
+        }
 
-		if( !empty( $located ) ) {
-			break;
-		}
-	}
+        if( !empty( $located ) ) {
+            break;
+        }
+    }
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+    if ( ( true == $load ) && ! empty( $located ) )
+        load_template( $located, $require_once );
 
-	return $located;
+    return $located;
 }
 
 function wpinv_get_theme_template_paths() {
-	$template_dir = wpinv_get_theme_template_dir_name();
+    $template_dir = wpinv_get_theme_template_dir_name();
 
-	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
-		100 => wpinv_get_templates_dir()
-	);
+    $file_paths = array(
+        1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
+        10 => trailingslashit( get_template_directory() ) . $template_dir,
+        100 => wpinv_get_templates_dir()
+    );
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+    $file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
 
-	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+    // sort the file paths based on priority
+    ksort( $file_paths, SORT_NUMERIC );
 
-	return array_map( 'trailingslashit', $file_paths );
+    return array_map( 'trailingslashit', $file_paths );
 }
 
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
+    return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
 }
 
 function wpinv_checkout_meta_tags() {
 
-	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
-	$pages[] = wpinv_get_option( 'invoice_subscription_page' );
+    $pages   = array();
+    $pages[] = wpinv_get_option( 'success_page' );
+    $pages[] = wpinv_get_option( 'failure_page' );
+    $pages[] = wpinv_get_option( 'invoice_history_page' );
+    $pages[] = wpinv_get_option( 'invoice_subscription_page' );
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
-		return;
-	}
+    if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+        return;
+    }
 
-	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
+    echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
 add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
 
 function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+    $classes = (array)$class;
 
-	if( wpinv_is_checkout() ) {
-		$classes[] = 'wpinv-checkout';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_checkout() ) {
+        $classes[] = 'wpinv-checkout';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_success_page() ) {
-		$classes[] = 'wpinv-success';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_success_page() ) {
+        $classes[] = 'wpinv-success';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_failed_transaction_page() ) {
-		$classes[] = 'wpinv-failed-transaction';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_failed_transaction_page() ) {
+        $classes[] = 'wpinv-failed-transaction';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_invoice_history_page() ) {
-		$classes[] = 'wpinv-history';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_invoice_history_page() ) {
+        $classes[] = 'wpinv-history';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_subscriptions_history_page() ) {
-		$classes[] = 'wpinv-subscription';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_subscriptions_history_page() ) {
+        $classes[] = 'wpinv-subscription';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_test_mode() ) {
-		$classes[] = 'wpinv-test-mode';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_test_mode() ) {
+        $classes[] = 'wpinv-test-mode';
+        $classes[] = 'wpinv-page';
+    }
 
-	return array_unique( $classes );
+    return array_unique( $classes );
 }
 add_filter( 'body_class', 'wpinv_add_body_classes' );
 
@@ -1408,7 +1408,7 @@ 
 add_action( 'wpinv_checkout_cart', 'wpinv_checkout_cart', 10 );
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+    return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
 }
 
 /**
@@ -1418,7 +1418,7 @@ 
  * @return void
  */
 function wpinv_empty_checkout_cart() {
-	echo wpinv_empty_cart_message();
+    echo wpinv_empty_cart_message();
 }
 add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
 

Braces +20 added lines, -14 removed lines

@@ -159,8 +159,9 @@ 
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
+	if ( isset( $name ) ) {
+			$templates[] = $slug . '-' . $name . '.php';
+	}
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
@@ -178,8 +179,9 @@ 
 	foreach ( (array)$template_names as $template_name ) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+		if ( empty( $template_name ) ) {
+					continue;
+		}
 
 		// Trim off any slashes from the template name
 		$template_name = ltrim( $template_name, '/' );
@@ -198,8 +200,9 @@ 
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ( ( true == $load ) && ! empty( $located ) ) {
+			load_template( $located, $require_once );
+	}
 
 	return $located;
 }
@@ -281,8 +284,9 @@ 
 function wpinv_html_dropdown( $name = 'wpinv_discounts', $selected = 0, $status = '' ) {
     $args = array( 'nopaging' => true );
 
-    if ( ! empty( $status ) )
-        $args['post_status'] = $status;
+    if ( ! empty( $status ) ) {
+            $args['post_status'] = $status;
+    }
 
     $discounts = wpinv_get_discounts( $args );
     $options   = array();
@@ -1423,17 +1427,19 @@ 
 add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
 
 function wpinv_save_cart_button() {
-    if ( wpinv_is_cart_saving_disabled() )
-        return;
-?>
+    if ( wpinv_is_cart_saving_disabled() ) {
+            return;
+    }
+    ?>
     <a class="wpinv-cart-saving-button wpinv-submit button" id="wpinv-save-cart-button" href="<?php echo esc_url( add_query_arg( 'wpi_action', 'save_cart' ) ); ?>"><?php _e( 'Save Cart', 'invoicing' ); ?></a>
 <?php
 }
 
 function wpinv_update_cart_button() {
-    if ( !wpinv_item_quantities_enabled() )
-        return;
-?>
+    if ( !wpinv_item_quantities_enabled() ) {
+            return;
+    }
+    ?>
     <input type="submit" name="wpinv_update_cart_submit" class="wpinv-submit wpinv-no-js button" value="<?php _e( 'Update Cart', 'invoicing' ); ?>"/>
     <input type="hidden" name="wpi_action" value="update_cart"/>
 <?php

Spacing +693 added lines, -693 removed lines

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

templates/wpinv-invoice-history.php

Indentation +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( !( $user_id = get_current_user_id() ) ) {
@@ -30,7 +30,7 @@ 
 
 		<tbody>
 			<?php foreach ( $user_invoices->invoices as $invoice ) {
-				?>
+                ?>
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
 					<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
 						<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
@@ -53,31 +53,31 @@ 
 
 							<?php elseif ( 'invoice-actions' === $column_id ) : ?>
 								<?php
-									$actions = array(
-										'pay'    => array(
-											'url'  => $invoice->get_checkout_payment_url(),
-											'name' => __( 'Pay Now', 'invoicing' ),
+                                    $actions = array(
+                                        'pay'    => array(
+                                            'url'  => $invoice->get_checkout_payment_url(),
+                                            'name' => __( 'Pay Now', 'invoicing' ),
                                             'class' => 'btn-success'
-										),
+                                        ),
                                         'print'   => array(
-											'url'  => $invoice->get_view_url(),
-											'name' => __( 'Print', 'invoicing' ),
+                                            'url'  => $invoice->get_view_url(),
+                                            'name' => __( 'Print', 'invoicing' ),
                                             'class' => 'btn-primary',
                                             'attrs' => 'target="_blank"'
-										)
-									);
+                                        )
+                                    );
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
-									}
+                                    if ( ! $invoice->needs_payment() ) {
+                                        unset( $actions['pay'] );
+                                    }
 
-									if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-										foreach ( $actions as $key => $action ) {
-											$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
+                                    if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
+                                        foreach ( $actions as $key => $action ) {
+                                            $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
                                             echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
-										}
-									}
-								?>
+                                        }
+                                    }
+                                ?>
 							<?php endif; ?>
 						</td>
 					<?php endforeach; ?>
@@ -91,22 +91,22 @@ 
 	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
 		<div class="invoicing-Pagination">
 			<?php
-			$big = 999999;
-
-			if (get_query_var('paged'))
-				$current_page = get_query_var('paged');
-			elseif (get_query_var('page'))
-				$current_page = get_query_var('page');
-			else
-				$current_page = 1;
-
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
-				'total'   => $user_invoices->max_num_pages,
-			) );
-			?>
+            $big = 999999;
+
+            if (get_query_var('paged'))
+                $current_page = get_query_var('paged');
+            elseif (get_query_var('page'))
+                $current_page = get_query_var('page');
+            else
+                $current_page = 1;
+
+            echo paginate_links( array(
+                'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                'format'  => '?paged=%#%',
+                'current' => max( 1, $current_page ),
+                'total'   => $user_invoices->max_num_pages,
+            ) );
+            ?>
 		</div>
 	<?php endif; ?>
 

Braces +7 added lines, -6 removed lines

@@ -93,12 +93,13 @@
 			<?php
 			$big = 999999;
 
-			if (get_query_var('paged'))
-				$current_page = get_query_var('paged');
-			elseif (get_query_var('page'))
-				$current_page = get_query_var('page');
-			else
-				$current_page = 1;
+			if (get_query_var('paged')) {
+							$current_page = get_query_var('paged');
+			} elseif (get_query_var('page')) {
+							$current_page = get_query_var('page');
+			} else {
+							$current_page = 1;
+			}
 
 			echo paginate_links( array(
 				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),

Spacing +43 added lines, -43 removed lines

@@ -1,83 +1,83 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( !( $user_id = get_current_user_id() ) ) {
+if (!($user_id = get_current_user_id())) {
     ?>
-    <div class="wpinv-empty alert alert-error"><?php _e( 'You are not allowed to access this section', 'invoicing' ) ;?></div>
+    <div class="wpinv-empty alert alert-error"><?php _e('You are not allowed to access this section', 'invoicing'); ?></div>
     <?php
     return;
 }
 
 global $current_page;
-$current_page   = empty( $current_page ) ? 1 : absint( $current_page );
-$query          = apply_filters( 'wpinv_user_invoices_query', array( 'user' => $user_id, 'page' => $current_page, 'paginate' => true, 'orderby' => 'invoice_date' ) );
-$user_invoices  = wpinv_get_invoices( $query );
+$current_page   = empty($current_page) ? 1 : absint($current_page);
+$query          = apply_filters('wpinv_user_invoices_query', array('user' => $user_id, 'page' => $current_page, 'paginate' => true, 'orderby' => 'invoice_date'));
+$user_invoices  = wpinv_get_invoices($query);
 $has_invoices   = 0 < $user_invoices->total;
     
-do_action( 'wpinv_before_user_invoices', $has_invoices ); ?>
+do_action('wpinv_before_user_invoices', $has_invoices); ?>
 
-<?php if ( $has_invoices ) { ?>
+<?php if ($has_invoices) { ?>
 	<table class="table table-bordered table-hover table-responsive wpi-user-invoices">
 		<thead>
 			<tr>
-				<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-					<th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th>
+				<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+					<th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th>
 				<?php endforeach; ?>
 			</tr>
 		</thead>
 
 		<tbody>
-			<?php foreach ( $user_invoices->invoices as $invoice ) {
+			<?php foreach ($user_invoices->invoices as $invoice) {
 				?>
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
-					<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-						<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
-							<?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?>
-								<?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?>
-
-							<?php elseif ( 'invoice-number' === $column_id ) : ?>
-								<a href="<?php echo esc_url( $invoice->get_view_url() ); ?>">
-									<?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?>
+					<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+						<td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>">
+							<?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?>
+								<?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?>
+
+							<?php elseif ('invoice-number' === $column_id) : ?>
+								<a href="<?php echo esc_url($invoice->get_view_url()); ?>">
+									<?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?>
 								</a>
 
-							<?php elseif ( 'created-date' === $column_id ) : $date = wpinv_get_date_created( $invoice->ID ); $dateYMD = wpinv_get_date_created( $invoice->ID, 'Y-m-d H:i:s' ); ?>
-								<time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+							<?php elseif ('created-date' === $column_id) : $date = wpinv_get_date_created($invoice->ID); $dateYMD = wpinv_get_date_created($invoice->ID, 'Y-m-d H:i:s'); ?>
+								<time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-							<?php elseif ( 'payment-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID, '', false ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s', false ); ?>
-								<time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+							<?php elseif ('payment-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID, '', false); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s', false); ?>
+								<time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-							<?php elseif ( 'invoice-status' === $column_id ) : ?>
-								<?php echo wpinv_invoice_status_label( $invoice_status, $invoice->get_status( true ) ) ; ?>
+							<?php elseif ('invoice-status' === $column_id) : ?>
+								<?php echo wpinv_invoice_status_label($invoice_status, $invoice->get_status(true)); ?>
 
-							<?php elseif ( 'invoice-total' === $column_id ) : ?>
-								<?php echo $invoice->get_total( true ); ?>
+							<?php elseif ('invoice-total' === $column_id) : ?>
+								<?php echo $invoice->get_total(true); ?>
 
-							<?php elseif ( 'invoice-actions' === $column_id ) : ?>
+							<?php elseif ('invoice-actions' === $column_id) : ?>
 								<?php
 									$actions = array(
 										'pay'    => array(
 											'url'  => $invoice->get_checkout_payment_url(),
-											'name' => __( 'Pay Now', 'invoicing' ),
+											'name' => __('Pay Now', 'invoicing'),
                                             'class' => 'btn-success'
 										),
                                         'print'   => array(
 											'url'  => $invoice->get_view_url(),
-											'name' => __( 'Print', 'invoicing' ),
+											'name' => __('Print', 'invoicing'),
                                             'class' => 'btn-primary',
                                             'attrs' => 'target="_blank"'
 										)
 									);
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
+									if (!$invoice->needs_payment()) {
+										unset($actions['pay']);
 									}
 
-									if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-										foreach ( $actions as $key => $action ) {
+									if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) {
+										foreach ($actions as $key => $action) {
 											$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-                                            echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                            echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
 										}
 									}
 								?>
@@ -89,9 +89,9 @@ 
 		</tbody>
 	</table>
 
-	<?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
+	<?php do_action('wpinv_before_user_invoices_pagination'); ?>
 
-	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
+	<?php if (1 < $user_invoices->max_num_pages) : ?>
 		<div class="invoicing-Pagination">
 			<?php
 			$big = 999999;
@@ -103,20 +103,20 @@ 
 			else
 				$current_page = 1;
 
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+			echo paginate_links(array(
+				'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
+				'current' => max(1, $current_page),
 				'total'   => $user_invoices->max_num_pages,
-			) );
+			));
 			?>
 		</div>
 	<?php endif; ?>
 
 <?php } else { ?>
 	<div class="wpinv-empty alert-info">
-		<?php _e( 'No invoice has been made yet.', 'invoicing' ); ?>
+		<?php _e('No invoice has been made yet.', 'invoicing'); ?>
 	</div>
 <?php } ?>
 
-<?php do_action( 'wpinv_after_user_invoices', $has_invoices ); ?>
+<?php do_action('wpinv_after_user_invoices', $has_invoices); ?>

templates/wpinv-invalid-access.php

Spacing +17 added lines, -17 removed lines

@@ -1,56 +1,56 @@
 <?php 
-if ( !defined('ABSPATH') ) {
+if (!defined('ABSPATH')) {
     exit;
 }
-do_action( 'wpinv_invalid_invoice_before_display' ); ?><!DOCTYPE html>
+do_action('wpinv_invalid_invoice_before_display'); ?><!DOCTYPE html>
 <html <?php language_attributes(); ?>>
 <head>
     <meta charset="UTF-8">
     <title><?php wp_title() ?></title>
-    <meta charset="<?php bloginfo( 'charset' ); ?>" />
+    <meta charset="<?php bloginfo('charset'); ?>" />
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="robots" content="noindex,nofollow">
-    <?php do_action( 'wpinv_invalid_invoice_head' ); ?>
+    <?php do_action('wpinv_invalid_invoice_head'); ?>
 </head>
 <body class="body wpinv wpinv-print wpinv-invalid-invoice">
-    <?php do_action( 'wpinv_invalid_invoice_body_start' ); ?>
+    <?php do_action('wpinv_invalid_invoice_body_start'); ?>
     <div class="container wpinv-wrap">
         <!-- ///// Start Header -->
         <htmlpageheader name="wpinv-pdf-header">
-            <?php do_action( 'wpinv_invalid_invoice_before_header' ); ?>
+            <?php do_action('wpinv_invalid_invoice_before_header'); ?>
             <div class="row wpinv-header">
                 <div class="col-xs-12 wpinv-business">
-                    <a target="_blank" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
-                        <?php if ( $logo = wpinv_get_business_logo() ) { ?>
-                        <img class="logo" src="<?php echo esc_url( $logo ); ?>">
+                    <a target="_blank" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
+                        <?php if ($logo = wpinv_get_business_logo()) { ?>
+                        <img class="logo" src="<?php echo esc_url($logo); ?>">
                         <?php } else { ?>
-                        <h1><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
+                        <h1><?php echo esc_html(wpinv_get_business_name()); ?></h1>
                         <?php } ?>
                     </a>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invalid_invoice_after_header' ); ?>
+            <?php do_action('wpinv_invalid_invoice_after_header'); ?>
         </htmlpageheader>
         <!-- End Header ///// -->
         
-        <?php do_action( 'wpinv_invalid_invoice_before_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_before_content'); ?>
 
-        <?php do_action( 'wpinv_invalid_invoice_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_content'); ?>
         
-        <?php do_action( 'wpinv_invalid_invoice_after_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_after_content'); ?>
         
         <!-- ///// Start Footer -->
         <htmlpagefooter name="wpinv-pdf-footer">
-            <?php do_action( 'wpinv_invalid_invoice_before_footer' ); ?>
+            <?php do_action('wpinv_invalid_invoice_before_footer'); ?>
             <div class="row wpinv-footer">
                 <div class="col-sm-12">
                     <div class="footer-text"><?php echo wpinv_get_business_footer(); ?></div>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invalid_invoice_after_footer' ); ?>
+            <?php do_action('wpinv_invalid_invoice_after_footer'); ?>
         </htmlpagefooter>
         <!-- End Footer ///// -->
     </div>
-    <?php do_action( 'wpinv_invalid_invoice_body_end' ); ?>
+    <?php do_action('wpinv_invalid_invoice_body_end'); ?>
 </body>
 </html>
\ No newline at end of file

includes/class-wpinv-subscriptions-db.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 /**
  * The Subscriptions DB Class

Spacing +154 added lines, -154 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * The Subscriptions DB Class
@@ -68,8 +68,8 @@ 
             'transaction_id'    => '',
             'parent_payment_id' => 0,
             'product_id'        => 0,
-            'created'           => date( 'Y-m-d H:i:s' ),
-            'expiration'        => date( 'Y-m-d H:i:s' ),
+            'created'           => date('Y-m-d H:i:s'),
+            'expiration'        => date('Y-m-d H:i:s'),
             'trial_period'      => '',
             'status'            => '',
             'profile_id'        => '',
@@ -82,11 +82,11 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function get_subscriptions( $args = array() ) {
+    public function get_subscriptions($args = array()) {
         global $wpdb;
 
         $defaults = array(
-            'number'       => get_option( 'posts_per_page' ),
+            'number'       => get_option('posts_per_page'),
             'offset'       => 0,
             'search'       => '',
             'customer_id'  => 0,
@@ -94,21 +94,21 @@ 
             'order'        => 'DESC'
         );
 
-        $args  = wp_parse_args( $args, $defaults );
+        $args = wp_parse_args($args, $defaults);
 
-        if( $args['number'] < 1 ) {
+        if ($args['number'] < 1) {
             $args['number'] = 999999999999;
         }
 
         $where = ' WHERE 1=1 ';
 
         // specific customers
-        if( ! empty( $args['id'] ) ) {
+        if (!empty($args['id'])) {
 
-            if( is_array( $args['id'] ) ) {
-                $ids = implode( ',', array_map('intval', $args['id'] ) );
+            if (is_array($args['id'])) {
+                $ids = implode(',', array_map('intval', $args['id']));
             } else {
-                $ids = intval( $args['id'] );
+                $ids = intval($args['id']);
             }
 
             $where .= " AND `id` IN( {$ids} ) ";
@@ -116,12 +116,12 @@ 
         }
 
         // Specific products
-        if( ! empty( $args['product_id'] ) ) {
+        if (!empty($args['product_id'])) {
 
-            if( is_array( $args['product_id'] ) ) {
-                $product_ids = implode( ',', array_map('intval', $args['product_id'] ) );
+            if (is_array($args['product_id'])) {
+                $product_ids = implode(',', array_map('intval', $args['product_id']));
             } else {
-                $product_ids = intval( $args['product_id'] );
+                $product_ids = intval($args['product_id']);
             }
 
             $where .= " AND `product_id` IN( {$product_ids} ) ";
@@ -129,12 +129,12 @@ 
         }
 
         // Specific parent payments
-        if( ! empty( $args['parent_payment_id'] ) ) {
+        if (!empty($args['parent_payment_id'])) {
 
-            if( is_array( $args['parent_payment_id'] ) ) {
-                $parent_payment_ids = implode( ',', array_map('intval', $args['parent_payment_id'] ) );
+            if (is_array($args['parent_payment_id'])) {
+                $parent_payment_ids = implode(',', array_map('intval', $args['parent_payment_id']));
             } else {
-                $parent_payment_ids = intval( $args['parent_payment_id'] );
+                $parent_payment_ids = intval($args['parent_payment_id']);
             }
 
             $where .= " AND `parent_payment_id` IN( {$parent_payment_ids} ) ";
@@ -142,12 +142,12 @@ 
         }
 
         // Specific transaction IDs
-        if( ! empty( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id'])) {
 
-            if( is_array( $args['transaction_id'] ) ) {
-                $transaction_ids = implode( "','", array_map('sanitize_text_field', $args['transaction_id'] ) );
+            if (is_array($args['transaction_id'])) {
+                $transaction_ids = implode("','", array_map('sanitize_text_field', $args['transaction_id']));
             } else {
-                $transaction_ids = sanitize_text_field( $args['transaction_id'] );
+                $transaction_ids = sanitize_text_field($args['transaction_id']);
             }
 
             $where .= " AND `transaction_id` IN ( '{$transaction_ids}' ) ";
@@ -155,12 +155,12 @@ 
         }
 
         // Subscriptoins for specific customers
-        if( ! empty( $args['customer_id'] ) ) {
+        if (!empty($args['customer_id'])) {
 
-            if( is_array( $args['customer_id'] ) ) {
-                $customer_ids = implode( ',', array_map('intval', $args['customer_id'] ) );
+            if (is_array($args['customer_id'])) {
+                $customer_ids = implode(',', array_map('intval', $args['customer_id']));
             } else {
-                $customer_ids = intval( $args['customer_id'] );
+                $customer_ids = intval($args['customer_id']);
             }
 
             $where .= " AND `customer_id` IN( {$customer_ids} ) ";
@@ -168,12 +168,12 @@ 
         }
 
         // Subscriptions for specific profile IDs
-        if( ! empty( $args['profile_id'] ) ) {
+        if (!empty($args['profile_id'])) {
 
-            if( is_array( $args['profile_id'] ) ) {
-                $profile_ids = implode( "','", array_map('sanitize_text_field', $args['profile_id'] ) );
+            if (is_array($args['profile_id'])) {
+                $profile_ids = implode("','", array_map('sanitize_text_field', $args['profile_id']));
             } else {
-                $profile_ids = sanitize_text_field( $args['profile_id'] );
+                $profile_ids = sanitize_text_field($args['profile_id']);
             }
 
             $where .= " AND `profile_id` IN( '{$profile_ids}' ) ";
@@ -181,12 +181,12 @@ 
         }
 
         // Subscriptions for specific statuses
-        if( ! empty( $args['status'] ) ) {
+        if (!empty($args['status'])) {
 
-            if( is_array( $args['status'] ) ) {
-                $statuses = implode( "','", array_map( 'sanitize_text_field', $args['status'] ) );
+            if (is_array($args['status'])) {
+                $statuses = implode("','", array_map('sanitize_text_field', $args['status']));
             } else {
-                $statuses = sanitize_text_field( $args['status'] );
+                $statuses = sanitize_text_field($args['status']);
             }
 
             $where .= " AND `status` IN( '{$statuses}' ) ";
@@ -194,21 +194,21 @@ 
         }
 
         // Subscriptions created for a specific date or in a date range
-        if( ! empty( $args['date'] ) ) {
+        if (!empty($args['date'])) {
 
-            if( is_array( $args['date'] ) ) {
+            if (is_array($args['date'])) {
 
-                if( ! empty( $args['date']['start'] ) ) {
+                if (!empty($args['date']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
 
                     $where .= " AND `created` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['date']['end'] ) ) {
+                if (!empty($args['date']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
                     $where .= " AND `created` <= '{$end}'";
 
@@ -216,9 +216,9 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['date'] ) );
-                $month = date( 'm', strtotime( $args['date'] ) );
-                $day   = date( 'd', strtotime( $args['date'] ) );
+                $year  = date('Y', strtotime($args['date']));
+                $month = date('m', strtotime($args['date']));
+                $day   = date('d', strtotime($args['date']));
 
                 $where .= " AND $year = YEAR ( created ) AND $month = MONTH ( created ) AND $day = DAY ( created )";
             }
@@ -226,21 +226,21 @@ 
         }
 
         // Subscriptions with a specific expiration date or in an expiration date range
-        if( ! empty( $args['expiration'] ) ) {
+        if (!empty($args['expiration'])) {
 
-            if( is_array( $args['expiration'] ) ) {
+            if (is_array($args['expiration'])) {
 
-                if( ! empty( $args['expiration']['start'] ) ) {
+                if (!empty($args['expiration']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['expiration']['start']));
 
                     $where .= " AND `expiration` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['expiration']['end'] ) ) {
+                if (!empty($args['expiration']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['expiration']['end']));
 
                     $where .= " AND `expiration` <= '{$end}'";
 
@@ -248,73 +248,73 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['expiration'] ) );
-                $month = date( 'm', strtotime( $args['expiration'] ) );
-                $day   = date( 'd', strtotime( $args['expiration'] ) );
+                $year  = date('Y', strtotime($args['expiration']));
+                $month = date('m', strtotime($args['expiration']));
+                $day   = date('d', strtotime($args['expiration']));
 
                 $where .= " AND $year = YEAR ( expiration ) AND $month = MONTH ( expiration ) AND $day = DAY ( expiration )";
             }
 
         }
 
-        if ( ! empty( $args['search'] ) ) {
+        if (!empty($args['search'])) {
 
-            if( false !== strpos( 'id:', $args['search'] ) ) {
+            if (false !== strpos('id:', $args['search'])) {
 
-                $args['search'] = trim( str_replace( 'id:', '', $args['search'] ) );
-                $where .= " AND `id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('id:', '', $args['search']));
+                $where .= " AND `id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'txn:' ) ) {
+            } else if (false !== strpos($args['search'], 'txn:')) {
 
-                $args['search'] = trim( str_replace( 'txn:', '', $args['search'] ) );
-                $where .= " AND `transaction_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('txn:', '', $args['search']));
+                $where .= " AND `transaction_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'profile_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'profile_id:')) {
 
-                $args['search'] = trim( str_replace( 'profile_id:', '', $args['search'] ) );
-                $where .= " AND `profile_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('profile_id:', '', $args['search']));
+                $where .= " AND `profile_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'product_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'product_id:')) {
 
-                $args['search'] = trim( str_replace( 'product_id:', '', $args['search'] ) );
-                $where .= " AND `product_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('product_id:', '', $args['search']));
+                $where .= " AND `product_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'customer_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'customer_id:')) {
 
-                $args['search'] = trim( str_replace( 'customer_id:', '', $args['search'] ) );
-                $where .= " AND `customer_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('customer_id:', '', $args['search']));
+                $where .= " AND `customer_id` = '" . esc_sql($args['search']) . "'";
 
             } else {
 
-                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `profile_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `transaction_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `product_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `id` = '" . esc_sql( $args['search'] ) . "' )";
+                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `profile_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `transaction_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `product_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `id` = '" . esc_sql($args['search']) . "' )";
 
             }
 
         }
 
-        $args['orderby'] = ! array_key_exists( $args['orderby'], $this->get_columns() ) ? 'id' : $args['orderby'];
+        $args['orderby'] = !array_key_exists($args['orderby'], $this->get_columns()) ? 'id' : $args['orderby'];
 
-        if( 'amount' == $args['orderby'] ) {
+        if ('amount' == $args['orderby']) {
             $args['orderby'] = 'amount+0';
         }
 
-        $cache_key = md5( 'wpinv_subscriptions_' . serialize( $args ) );
+        $cache_key = md5('wpinv_subscriptions_' . serialize($args));
 
-        $subscriptions = wp_cache_get( $cache_key, 'subscriptions' );
+        $subscriptions = wp_cache_get($cache_key, 'subscriptions');
 
-        $args['orderby'] = esc_sql( $args['orderby'] );
-        $args['order']   = esc_sql( $args['order'] );
+        $args['orderby'] = esc_sql($args['orderby']);
+        $args['order']   = esc_sql($args['order']);
 
-        if( $subscriptions === false ) {
-            $subscriptions = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint( $args['offset'] ), absint( $args['number'] ) ), OBJECT );
+        if ($subscriptions === false) {
+            $subscriptions = $wpdb->get_results($wpdb->prepare("SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint($args['offset']), absint($args['number'])), OBJECT);
 
-            if( ! empty( $subscriptions ) ) {
+            if (!empty($subscriptions)) {
 
-                foreach( $subscriptions as $key => $subscription ) {
-                    $subscriptions[ $key ] = new WPInv_Subscription( $subscription );
+                foreach ($subscriptions as $key => $subscription) {
+                    $subscriptions[$key] = new WPInv_Subscription($subscription);
                 }
 
-                wp_cache_set( $cache_key, $subscriptions, 'subscriptions', 3600 );
+                wp_cache_set($cache_key, $subscriptions, 'subscriptions', 3600);
 
             }
 
@@ -329,19 +329,19 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function count( $args = array() ) {
+    public function count($args = array()) {
 
         global $wpdb;
 
         $where = ' WHERE 1=1 ';
 
         // specific customers
-        if( ! empty( $args['id'] ) ) {
+        if (!empty($args['id'])) {
 
-            if( is_array( $args['id'] ) ) {
-                $ids = implode( ',', array_map('intval', $args['id'] ) );
+            if (is_array($args['id'])) {
+                $ids = implode(',', array_map('intval', $args['id']));
             } else {
-                $ids = intval( $args['id'] );
+                $ids = intval($args['id']);
             }
 
             $where .= " AND `id` IN( {$ids} ) ";
@@ -349,12 +349,12 @@ 
         }
 
         // Specific products
-        if( ! empty( $args['product_id'] ) ) {
+        if (!empty($args['product_id'])) {
 
-            if( is_array( $args['product_id'] ) ) {
-                $product_ids = implode( ',', array_map('intval', $args['product_id'] ) );
+            if (is_array($args['product_id'])) {
+                $product_ids = implode(',', array_map('intval', $args['product_id']));
             } else {
-                $product_ids = intval( $args['product_id'] );
+                $product_ids = intval($args['product_id']);
             }
 
             $where .= " AND `product_id` IN( {$product_ids} ) ";
@@ -362,12 +362,12 @@ 
         }
 
         // Specific parent payments
-        if( ! empty( $args['parent_payment_id'] ) ) {
+        if (!empty($args['parent_payment_id'])) {
 
-            if( is_array( $args['parent_payment_id'] ) ) {
-                $parent_payment_ids = implode( ',', array_map('intval', $args['parent_payment_id'] ) );
+            if (is_array($args['parent_payment_id'])) {
+                $parent_payment_ids = implode(',', array_map('intval', $args['parent_payment_id']));
             } else {
-                $parent_payment_ids = intval( $args['parent_payment_id'] );
+                $parent_payment_ids = intval($args['parent_payment_id']);
             }
 
             $where .= " AND `parent_payment_id` IN( {$parent_payment_ids} ) ";
@@ -375,12 +375,12 @@ 
         }
 
         // Subscriptoins for specific customers
-        if( ! empty( $args['customer_id'] ) ) {
+        if (!empty($args['customer_id'])) {
 
-            if( is_array( $args['customer_id'] ) ) {
-                $customer_ids = implode( ',', array_map('intval', $args['customer_id'] ) );
+            if (is_array($args['customer_id'])) {
+                $customer_ids = implode(',', array_map('intval', $args['customer_id']));
             } else {
-                $customer_ids = intval( $args['customer_id'] );
+                $customer_ids = intval($args['customer_id']);
             }
 
             $where .= " AND `customer_id` IN( {$customer_ids} ) ";
@@ -388,12 +388,12 @@ 
         }
 
         // Subscriptions for specific profile IDs
-        if( ! empty( $args['profile_id'] ) ) {
+        if (!empty($args['profile_id'])) {
 
-            if( is_array( $args['profile_id'] ) ) {
-                $profile_ids = implode( ',', array_map('intval', $args['profile_id'] ) );
+            if (is_array($args['profile_id'])) {
+                $profile_ids = implode(',', array_map('intval', $args['profile_id']));
             } else {
-                $profile_ids = intval( $args['profile_id'] );
+                $profile_ids = intval($args['profile_id']);
             }
 
             $where .= " AND `profile_id` IN( {$profile_ids} ) ";
@@ -401,12 +401,12 @@ 
         }
 
         // Specific transaction IDs
-        if( ! empty( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id'])) {
 
-            if( is_array( $args['transaction_id'] ) ) {
-                $transaction_ids = implode( ',', array_map('sanitize_text_field', $args['transaction_id'] ) );
+            if (is_array($args['transaction_id'])) {
+                $transaction_ids = implode(',', array_map('sanitize_text_field', $args['transaction_id']));
             } else {
-                $transaction_ids = sanitize_text_field( $args['transaction_id'] );
+                $transaction_ids = sanitize_text_field($args['transaction_id']);
             }
 
             $where .= " AND `transaction_id` IN( {$transaction_ids} ) ";
@@ -414,10 +414,10 @@ 
         }
 
         // Subscriptions for specific statuses
-        if( ! empty( $args['status'] ) ) {
+        if (!empty($args['status'])) {
 
-            if( is_array( $args['status'] ) ) {
-                $statuses = implode( ',', $args['status'] );
+            if (is_array($args['status'])) {
+                $statuses = implode(',', $args['status']);
                 $where  .= " AND `status` IN( {$statuses} ) ";
             } else {
                 $statuses = $args['status'];
@@ -429,21 +429,21 @@ 
         }
 
         // Subscriptions created for a specific date or in a date range
-        if( ! empty( $args['date'] ) ) {
+        if (!empty($args['date'])) {
 
-            if( is_array( $args['date'] ) ) {
+            if (is_array($args['date'])) {
 
-                if( ! empty( $args['date']['start'] ) ) {
+                if (!empty($args['date']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
 
                     $where .= " AND `created` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['date']['end'] ) ) {
+                if (!empty($args['date']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
                     $where .= " AND `created` <= '{$end}'";
 
@@ -451,9 +451,9 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['date'] ) );
-                $month = date( 'm', strtotime( $args['date'] ) );
-                $day   = date( 'd', strtotime( $args['date'] ) );
+                $year  = date('Y', strtotime($args['date']));
+                $month = date('m', strtotime($args['date']));
+                $day   = date('d', strtotime($args['date']));
 
                 $where .= " AND $year = YEAR ( created ) AND $month = MONTH ( created ) AND $day = DAY ( created )";
             }
@@ -461,21 +461,21 @@ 
         }
 
         // Subscriptions with a specific expiration date or in an expiration date range
-        if( ! empty( $args['expiration'] ) ) {
+        if (!empty($args['expiration'])) {
 
-            if( is_array( $args['expiration'] ) ) {
+            if (is_array($args['expiration'])) {
 
-                if( ! empty( $args['expiration']['start'] ) ) {
+                if (!empty($args['expiration']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['expiration']['start']));
 
                     $where .= " AND `expiration` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['expiration']['end'] ) ) {
+                if (!empty($args['expiration']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['expiration']['end']));
 
                     $where .= " AND `expiration` <= '{$end}'";
 
@@ -483,64 +483,64 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['expiration'] ) );
-                $month = date( 'm', strtotime( $args['expiration'] ) );
-                $day   = date( 'd', strtotime( $args['expiration'] ) );
+                $year  = date('Y', strtotime($args['expiration']));
+                $month = date('m', strtotime($args['expiration']));
+                $day   = date('d', strtotime($args['expiration']));
 
                 $where .= " AND $year = YEAR ( expiration ) AND $month = MONTH ( expiration ) AND $day = DAY ( expiration )";
             }
 
         }
 
-        if ( ! empty( $args['search'] ) ) {
+        if (!empty($args['search'])) {
 
-            if( false !== strpos( 'id:', $args['search'] ) ) {
+            if (false !== strpos('id:', $args['search'])) {
 
-                $args['search'] = trim( str_replace( 'id:', '', $args['search'] ) );
-                $where .= " AND `id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('id:', '', $args['search']));
+                $where .= " AND `id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'txn:' ) ) {
+            } else if (false !== strpos($args['search'], 'txn:')) {
 
-                $args['search'] = trim( str_replace( 'txn:', '', $args['search'] ) );
-                $where .= " AND `transaction_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('txn:', '', $args['search']));
+                $where .= " AND `transaction_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'profile_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'profile_id:')) {
 
-                $args['search'] = trim( str_replace( 'profile_id:', '', $args['search'] ) );
-                $where .= " AND `profile_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('profile_id:', '', $args['search']));
+                $where .= " AND `profile_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'product_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'product_id:')) {
 
-                $args['search'] = trim( str_replace( 'product_id:', '', $args['search'] ) );
-                $where .= " AND `product_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('product_id:', '', $args['search']));
+                $where .= " AND `product_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'customer_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'customer_id:')) {
 
-                $args['search'] = trim( str_replace( 'customer_id:', '', $args['search'] ) );
-                $where .= " AND `customer_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('customer_id:', '', $args['search']));
+                $where .= " AND `customer_id` = '" . esc_sql($args['search']) . "'";
 
             } else {
 
-                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `profile_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `transaction_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `product_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `id` = '" . esc_sql( $args['search'] ) . "' )";
+                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `profile_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `transaction_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `product_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `id` = '" . esc_sql($args['search']) . "' )";
 
             }
 
         }
 
-        $cache_key = md5( 'wpinv_subscriptions_count' . serialize( $args ) );
+        $cache_key = md5('wpinv_subscriptions_count' . serialize($args));
 
-        $count = wp_cache_get( $cache_key, 'subscriptions' );
+        $count = wp_cache_get($cache_key, 'subscriptions');
 
-        if( $count === false ) {
+        if ($count === false) {
 
             $sql   = "SELECT COUNT($this->primary_key) FROM " . $this->table_name . "{$where};";
-            $count = $wpdb->get_var( $sql );
+            $count = $wpdb->get_var($sql);
 
-            wp_cache_set( $cache_key, $count, 'subscriptions', 3600 );
+            wp_cache_set($cache_key, $count, 'subscriptions', 3600);
 
         }
 
-        return absint( $count );
+        return absint($count);
 
     }
 
@@ -553,7 +553,7 @@ 
     public function create_table() {
         global $wpdb;
 
-        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
         $sql = "CREATE TABLE " . $this->table_name . " (
         id bigint(20) NOT NULL AUTO_INCREMENT,
@@ -578,9 +578,9 @@ 
         KEY customer_and_status ( customer_id, status)
         ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-        dbDelta( $sql );
+        dbDelta($sql);
 
-        update_option( $this->table_name . '_db_version', $this->version );
+        update_option($this->table_name . '_db_version', $this->version);
     }
 
 }
\ No newline at end of file

includes/class-wpinv-db.php

Indentation +232 added lines, -232 removed lines

@@ -5,237 +5,237 @@
 
 abstract class Wpinv_DB {
 
-	/**
-	 * The name of our database table
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $table_name;
-
-	/**
-	 * The version of our database table
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $version;
-
-	/**
-	 * The name of the primary column
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $primary_key;
-
-	/**
-	 * Get things started
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public function __construct() {}
-
-	/**
-	 * Whitelist of columns
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  array
-	 */
-	public function get_columns() {
-		return array();
-	}
-
-	/**
-	 * Default column values
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  array
-	 */
-	public function get_column_defaults() {
-		return array();
-	}
-
-	/**
-	 * Retrieve a row by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  object
-	 */
-	public function get( $row_id ) {
-		global $wpdb;
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a row by a specific column / value
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  object
-	 */
-	public function get_by( $column, $row_id ) {
-		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a specific column's value by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  string
-	 */
-	public function get_column( $column, $row_id ) {
-		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a specific column's value by the the specified column / value
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  string
-	 */
-	public function get_column_by( $column, $column_where, $column_value ) {
-		global $wpdb;
-		$column_where = esc_sql( $column_where );
-		$column       = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
-	}
-
-	/**
-	 * Insert a new row
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  int
-	 */
-	public function insert( $data, $type = '' ) {
-		global $wpdb;
-
-		// Set default values
-		$data = wp_parse_args( $data, $this->get_column_defaults() );
-
-		do_action( 'wpinv_pre_insert_' . $type, $data );
-
-		// Initialise column format array
-		$column_formats = $this->get_columns();
-
-		// Force fields to lower case
-		$data = array_change_key_case( $data );
-
-		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
-
-		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
-
-		$wpdb->insert( $this->table_name, $data, $column_formats );
-		$wpdb_insert_id = $wpdb->insert_id;
-
-		do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
-
-		return $wpdb_insert_id;
-	}
-
-	/**
-	 * Update a row
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  bool
-	 */
-	public function update( $row_id, $data = array(), $where = '' ) {
-
-		global $wpdb;
-
-		// Row ID must be positive integer
-		$row_id = absint( $row_id );
-
-		if( empty( $row_id ) ) {
-			return false;
-		}
-
-		if( empty( $where ) ) {
-			$where = $this->primary_key;
-		}
-
-		// Initialise column format array
-		$column_formats = $this->get_columns();
-
-		// Force fields to lower case
-		$data = array_change_key_case( $data );
-
-		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
-
-		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
-
-		if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Delete a row identified by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  bool
-	 */
-	public function delete( $row_id = 0 ) {
-
-		global $wpdb;
-
-		// Row ID must be positive integer
-		$row_id = absint( $row_id );
-
-		if( empty( $row_id ) ) {
-			return false;
-		}
-
-		if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if the given table exists
-	 *
-	 * @since  2.4
-	 * @param  string $table The table name
-	 * @return bool          If the table name exists
-	 */
-	public function table_exists( $table ) {
-		global $wpdb;
-		$table = sanitize_text_field( $table );
-
-		return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
-	}
-
-	/**
-	 * Check if the table was ever installed
-	 *
-	 * @since  2.4
-	 * @return bool Returns if the customers table was installed and upgrade routine run
-	 */
-	public function installed() {
-		return $this->table_exists( $this->table_name );
-	}
+    /**
+     * The name of our database table
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $table_name;
+
+    /**
+     * The version of our database table
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $version;
+
+    /**
+     * The name of the primary column
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $primary_key;
+
+    /**
+     * Get things started
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public function __construct() {}
+
+    /**
+     * Whitelist of columns
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  array
+     */
+    public function get_columns() {
+        return array();
+    }
+
+    /**
+     * Default column values
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  array
+     */
+    public function get_column_defaults() {
+        return array();
+    }
+
+    /**
+     * Retrieve a row by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  object
+     */
+    public function get( $row_id ) {
+        global $wpdb;
+        return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a row by a specific column / value
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  object
+     */
+    public function get_by( $column, $row_id ) {
+        global $wpdb;
+        $column = esc_sql( $column );
+        return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a specific column's value by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  string
+     */
+    public function get_column( $column, $row_id ) {
+        global $wpdb;
+        $column = esc_sql( $column );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a specific column's value by the the specified column / value
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  string
+     */
+    public function get_column_by( $column, $column_where, $column_value ) {
+        global $wpdb;
+        $column_where = esc_sql( $column_where );
+        $column       = esc_sql( $column );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
+    }
+
+    /**
+     * Insert a new row
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  int
+     */
+    public function insert( $data, $type = '' ) {
+        global $wpdb;
+
+        // Set default values
+        $data = wp_parse_args( $data, $this->get_column_defaults() );
+
+        do_action( 'wpinv_pre_insert_' . $type, $data );
+
+        // Initialise column format array
+        $column_formats = $this->get_columns();
+
+        // Force fields to lower case
+        $data = array_change_key_case( $data );
+
+        // White list columns
+        $data = array_intersect_key( $data, $column_formats );
+
+        // Reorder $column_formats to match the order of columns given in $data
+        $data_keys = array_keys( $data );
+        $column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+
+        $wpdb->insert( $this->table_name, $data, $column_formats );
+        $wpdb_insert_id = $wpdb->insert_id;
+
+        do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
+
+        return $wpdb_insert_id;
+    }
+
+    /**
+     * Update a row
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  bool
+     */
+    public function update( $row_id, $data = array(), $where = '' ) {
+
+        global $wpdb;
+
+        // Row ID must be positive integer
+        $row_id = absint( $row_id );
+
+        if( empty( $row_id ) ) {
+            return false;
+        }
+
+        if( empty( $where ) ) {
+            $where = $this->primary_key;
+        }
+
+        // Initialise column format array
+        $column_formats = $this->get_columns();
+
+        // Force fields to lower case
+        $data = array_change_key_case( $data );
+
+        // White list columns
+        $data = array_intersect_key( $data, $column_formats );
+
+        // Reorder $column_formats to match the order of columns given in $data
+        $data_keys = array_keys( $data );
+        $column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+
+        if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete a row identified by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  bool
+     */
+    public function delete( $row_id = 0 ) {
+
+        global $wpdb;
+
+        // Row ID must be positive integer
+        $row_id = absint( $row_id );
+
+        if( empty( $row_id ) ) {
+            return false;
+        }
+
+        if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if the given table exists
+     *
+     * @since  2.4
+     * @param  string $table The table name
+     * @return bool          If the table name exists
+     */
+    public function table_exists( $table ) {
+        global $wpdb;
+        $table = sanitize_text_field( $table );
+
+        return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
+    }
+
+    /**
+     * Check if the table was ever installed
+     *
+     * @since  2.4
+     * @return bool Returns if the customers table was installed and upgrade routine run
+     */
+    public function installed() {
+        return $this->table_exists( $this->table_name );
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 abstract class Wpinv_DB {
 
@@ -66,9 +66,9 @@ 
 	 * @since   1.0.0
 	 * @return  object
 	 */
-	public function get( $row_id ) {
+	public function get($row_id) {
 		global $wpdb;
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -78,10 +78,10 @@ 
 	 * @since   1.0.0
 	 * @return  object
 	 */
-	public function get_by( $column, $row_id ) {
+	public function get_by($column, $row_id) {
 		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
+		$column = esc_sql($column);
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -91,10 +91,10 @@ 
 	 * @since   1.0.0
 	 * @return  string
 	 */
-	public function get_column( $column, $row_id ) {
+	public function get_column($column, $row_id) {
 		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+		$column = esc_sql($column);
+		return $wpdb->get_var($wpdb->prepare("SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -104,11 +104,11 @@ 
 	 * @since   1.0.0
 	 * @return  string
 	 */
-	public function get_column_by( $column, $column_where, $column_value ) {
+	public function get_column_by($column, $column_where, $column_value) {
 		global $wpdb;
-		$column_where = esc_sql( $column_where );
-		$column       = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
+		$column_where = esc_sql($column_where);
+		$column       = esc_sql($column);
+		return $wpdb->get_var($wpdb->prepare("SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value));
 	}
 
 	/**
@@ -118,31 +118,31 @@ 
 	 * @since   1.0.0
 	 * @return  int
 	 */
-	public function insert( $data, $type = '' ) {
+	public function insert($data, $type = '') {
 		global $wpdb;
 
 		// Set default values
-		$data = wp_parse_args( $data, $this->get_column_defaults() );
+		$data = wp_parse_args($data, $this->get_column_defaults());
 
-		do_action( 'wpinv_pre_insert_' . $type, $data );
+		do_action('wpinv_pre_insert_' . $type, $data);
 
 		// Initialise column format array
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		$wpdb->insert( $this->table_name, $data, $column_formats );
+		$wpdb->insert($this->table_name, $data, $column_formats);
 		$wpdb_insert_id = $wpdb->insert_id;
 
-		do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
+		do_action('wpinv_post_insert_' . $type, $wpdb_insert_id, $data);
 
 		return $wpdb_insert_id;
 	}
@@ -154,18 +154,18 @@ 
 	 * @since   1.0.0
 	 * @return  bool
 	 */
-	public function update( $row_id, $data = array(), $where = '' ) {
+	public function update($row_id, $data = array(), $where = '') {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if( empty( $where ) ) {
+		if (empty($where)) {
 			$where = $this->primary_key;
 		}
 
@@ -173,16 +173,16 @@ 
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
+		if (false === $wpdb->update($this->table_name, $data, array($where => $row_id), $column_formats)) {
 			return false;
 		}
 
@@ -196,18 +196,18 @@ 
 	 * @since   1.0.0
 	 * @return  bool
 	 */
-	public function delete( $row_id = 0 ) {
+	public function delete($row_id = 0) {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
+		if (false === $wpdb->query($wpdb->prepare("DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id))) {
 			return false;
 		}
 
@@ -221,11 +221,11 @@ 
 	 * @param  string $table The table name
 	 * @return bool          If the table name exists
 	 */
-	public function table_exists( $table ) {
+	public function table_exists($table) {
 		global $wpdb;
-		$table = sanitize_text_field( $table );
+		$table = sanitize_text_field($table);
 
-		return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
+		return $wpdb->get_var($wpdb->prepare("SHOW TABLES LIKE '%s'", $table)) === $table;
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 * @return bool Returns if the customers table was installed and upgrade routine run
 	 */
 	public function installed() {
-		return $this->table_exists( $this->table_name );
+		return $this->table_exists($this->table_name);
 	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 abstract class Wpinv_DB {
 

includes/admin/class-wpinv-subscriptions-list-table.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 
 // Load WP_List_Table if not loaded

Indentation +349 added lines, -349 removed lines

@@ -13,7 +13,7 @@ 
 
 // Load WP_List_Table if not loaded
 if( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,102 +23,102 @@ 
  */
 class WPInv_Subscription_Reports_Table extends WP_List_Table {
 
-	/**
-	 * Number of results to show per page
-	 *
-	 * @since       1.0.0
-	 */
-
-	public $per_page        = 20;
-	public $total_count     = 0;
-	public $active_count    = 0;
-	public $pending_count   = 0;
-	public $expired_count   = 0;
-	public $completed_count = 0;
-	public $trialling_count  = 0;
-	public $cancelled_count = 0;
-	public $failing_count   = 0;
-
-	/**
-	 * Get things started
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      void
-	 */
-	function __construct(){
-		global $status, $page;
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular'  => 'subscription',
-			'plural'    => 'subscriptions',
-			'ajax'      => false
-		) );
-
-		$this->get_subscription_counts();
-
-	}
-
-	/**
-	 * Retrieve the view types
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return array $views All the views available
-	 */
-	public function get_views() {
-
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
-		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
-		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
-		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
-
-		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
-		);
-
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
-	}
-
-	/**
-	 * Show the search field
-	 *
-	 * @since 2.5
-	 * @access public
-	 *
-	 * @param string $text Label for the search box
-	 * @param string $input_id ID of the search box
-	 *
-	 * @return void
-	 */
-	public function search_box( $text, $input_id ) {
-
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
-			return;
-		}
-
-		$input_id = $input_id . '-search-input';
-
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		}
-
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		}
+    /**
+     * Number of results to show per page
+     *
+     * @since       1.0.0
+     */
+
+    public $per_page        = 20;
+    public $total_count     = 0;
+    public $active_count    = 0;
+    public $pending_count   = 0;
+    public $expired_count   = 0;
+    public $completed_count = 0;
+    public $trialling_count  = 0;
+    public $cancelled_count = 0;
+    public $failing_count   = 0;
+
+    /**
+     * Get things started
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      void
+     */
+    function __construct(){
+        global $status, $page;
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular'  => 'subscription',
+            'plural'    => 'subscriptions',
+            'ajax'      => false
+        ) );
+
+        $this->get_subscription_counts();
+
+    }
+
+    /**
+     * Retrieve the view types
+     *
+     * @access public
+     * @since 1.0.0
+     * @return array $views All the views available
+     */
+    public function get_views() {
+
+        $current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
+        $total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+        $active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
+        $pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
+        $expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+        $completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
+        $trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
+        $cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
+        $failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+
+        $views = array(
+            'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
+            'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
+            'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
+            'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
+            'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
+            'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
+            'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
+            'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+        );
+
+        return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+    }
+
+    /**
+     * Show the search field
+     *
+     * @since 2.5
+     * @access public
+     *
+     * @param string $text Label for the search box
+     * @param string $input_id ID of the search box
+     *
+     * @return void
+     */
+    public function search_box( $text, $input_id ) {
+
+        if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+            return;
+        }
+
+        $input_id = $input_id . '-search-input';
+
+        if ( ! empty( $_REQUEST['orderby'] ) ) {
+            echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+        }
+
+        if ( ! empty( $_REQUEST['order'] ) ) {
+            echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+        }
 ?>
 		<p class="search-box">
 			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
@@ -127,18 +127,18 @@ 
 			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
 		</p>
 <?php
-	}
-
-	/**
-	 * Render most columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_default( $item, $column_name ) {
-		return $item->$column_name;
-	}
+    }
+
+    /**
+     * Render most columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_default( $item, $column_name ) {
+        return $item->$column_name;
+    }
 
     /**
      * Subscription id column
@@ -151,244 +151,244 @@ 
         return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
     }
 
-	/**
-	 * Customer column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
-
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
-	}
-
-	/**
-	 * Status column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_status( $item ) {
-		return $item->get_status_label();
-	}
-
-	/**
-	 * Period column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_period( $item ) {
-
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
-
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
-	}
-
-	/**
-	 * Billing Times column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
-	}
-
-	/**
-	 * Initial Amount column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
-	}
-
-	/**
-	 * Renewal date column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
-	}
-
-	/**
-	 * Payment column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
-	}
-
-	/**
-	 * Product ID column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
-	}
-
-	/**
-	 * Render the edit column
-	 *
-	 * @access      private
-	 * @since       2.0
-	 * @return      string
-	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
-	}
-
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      array
-	 */
-
-	function get_columns(){
-		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      int
-	 */
-	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Retrieve the subscription counts
-	 *
-	 * @access public
-	 * @since 1.4
-	 * @return void
-	 */
-	public function get_subscription_counts() {
-
-		global $wp_query;
-
-		$db = new WPInv_Subscriptions_DB;
-
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-
-		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @uses        $this->_column_headers
-	 * @uses        $this->items
-	 * @uses        $this->get_columns()
-	 * @uses        $this->get_sortable_columns()
-	 * @uses        $this->get_pagenum()
-	 * @uses        $this->set_pagination_args()
-	 * @return      array
-	 */
-	function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
-		$sortable = $this->get_sortable_columns();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$current_page = $this->get_pagenum();
-
-		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-		$args   = array(
-			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
-			'search' => $search
-		);
-
-		if ( 'any' !== $status ) {
-			$args['status'] = $status;
-		}
-
-		$this->items = $db->get_subscriptions( $args );
-
-		switch ( $status ) {
-			case 'active':
-				$total_items = $this->active_count;
-				break;
-			case 'pending':
-				$total_items = $this->pending_count;
-				break;
-			case 'expired':
-				$total_items = $this->expired_count;
-				break;
-			case 'cancelled':
-				$total_items = $this->cancelled_count;
-				break;
-			case 'failing':
-				$total_items = $this->failing_count;
-				break;
-			case 'trialling':
-				$total_items = $this->trialling_count;
-				break;
-			case 'completed':
-				$total_items = $this->completed_count;
-				break;
-			case 'any':
-			default:
-				$total_items = $this->total_count;
-				break;
-		}
-
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,
-			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
-	}
+    /**
+     * Customer column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_customer_id( $item ) {
+        $subscriber = get_userdata( $item->customer_id );
+        $customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+
+        return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+    }
+
+    /**
+     * Status column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_status( $item ) {
+        return $item->get_status_label();
+    }
+
+    /**
+     * Period column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_period( $item ) {
+
+        $period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+
+        return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+    }
+
+    /**
+     * Billing Times column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_bill_times( $item ) {
+        return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
+    }
+
+    /**
+     * Initial Amount column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_initial_amount( $item ) {
+        return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+    }
+
+    /**
+     * Renewal date column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_renewal_date( $item ) {
+        return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+    }
+
+    /**
+     * Payment column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_parent_payment_id( $item ) {
+        return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
+    }
+
+    /**
+     * Product ID column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_product_id( $item ) {
+        return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+    }
+
+    /**
+     * Render the edit column
+     *
+     * @access      private
+     * @since       2.0
+     * @return      string
+     */
+    function column_actions( $item ) {
+        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+    }
+
+
+    /**
+     * Retrieve the table columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      array
+     */
+
+    function get_columns(){
+        $columns = array(
+            'sub_id'            => __( 'ID', 'invoicing' ),
+            'customer_id'       => __( 'Customer', 'invoicing' ),
+            'status'            => __( 'Status', 'invoicing' ),
+            'period'            => __( 'Billing Cycle', 'invoicing' ),
+            'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
+            'bill_times'        => __( 'Times Billed', 'invoicing' ),
+            'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
+            'parent_payment_id' => __( 'Invoice', 'invoicing' ),
+            'product_id'        => __( 'Item', 'invoicing' ),
+            'actions'           => __( 'Actions', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpinv_report_subscription_columns', $columns );
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      int
+     */
+    function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Retrieve the subscription counts
+     *
+     * @access public
+     * @since 1.4
+     * @return void
+     */
+    public function get_subscription_counts() {
+
+        global $wp_query;
+
+        $db = new WPInv_Subscriptions_DB;
+
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+
+        $this->total_count     = $db->count();
+        $this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
+        $this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
+        $this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
+        $this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
+        $this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
+        $this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
+        $this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @access      private
+     * @since       1.0.0
+     * @uses        $this->_column_headers
+     * @uses        $this->items
+     * @uses        $this->get_columns()
+     * @uses        $this->get_sortable_columns()
+     * @uses        $this->get_pagenum()
+     * @uses        $this->set_pagination_args()
+     * @return      array
+     */
+    function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array(); // No hidden columns
+        $status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+        $sortable = $this->get_sortable_columns();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $current_page = $this->get_pagenum();
+
+        $db     = new WPInv_Subscriptions_DB;
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+        $args   = array(
+            'number' => $this->per_page,
+            'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+            'search' => $search
+        );
+
+        if ( 'any' !== $status ) {
+            $args['status'] = $status;
+        }
+
+        $this->items = $db->get_subscriptions( $args );
+
+        switch ( $status ) {
+            case 'active':
+                $total_items = $this->active_count;
+                break;
+            case 'pending':
+                $total_items = $this->pending_count;
+                break;
+            case 'expired':
+                $total_items = $this->expired_count;
+                break;
+            case 'cancelled':
+                $total_items = $this->cancelled_count;
+                break;
+            case 'failing':
+                $total_items = $this->failing_count;
+                break;
+            case 'trialling':
+                $total_items = $this->trialling_count;
+                break;
+            case 'completed':
+                $total_items = $this->completed_count;
+                break;
+            case 'any':
+            default:
+                $total_items = $this->total_count;
+                break;
+        }
+
+        $this->set_pagination_args( array(
+            'total_items' => $total_items,
+            'per_page'    => $this->per_page,
+            'total_pages' => ceil( $total_items / $this->per_page )
+        ) );
+    }
 }

Spacing +83 added lines, -83 removed lines

@@ -8,11 +8,11 @@ 
 
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 
 // Load WP_List_Table if not loaded
-if( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -35,7 +35,7 @@ 
 	public $pending_count   = 0;
 	public $expired_count   = 0;
 	public $completed_count = 0;
-	public $trialling_count  = 0;
+	public $trialling_count = 0;
 	public $cancelled_count = 0;
 	public $failing_count   = 0;
 
@@ -46,15 +46,15 @@ 
 	 * @since       1.0.0
 	 * @return      void
 	 */
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular'  => 'subscription',
 			'plural'    => 'subscriptions',
 			'ajax'      => false
-		) );
+		));
 
 		$this->get_subscription_counts();
 
@@ -69,28 +69,28 @@ 
 	 */
 	public function get_views() {
 
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+		$current         = isset($_GET['status']) ? $_GET['status'] : '';
+		$total_count     = '&nbsp;<span class="count">(' . $this->total_count . ')</span>';
 		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
 		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count . ')</span>';
 		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+		$trialling_count = '&nbsp;<span class="count">(' . $this->trialling_count . ')</span>';
+		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count . ')</span>';
+		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count . ')</span>';
 
 		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+			'all'       => sprintf('<a href="%s"%s>%s</a>', remove_query_arg(array('status', 'paged')), $current === 'all' || $current == '' ? ' class="current"' : '', __('All', 'invoicing') . $total_count),
+			'active'    => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'active', 'paged' => FALSE)), $current === 'active' ? ' class="current"' : '', __('Active', 'invoicing') . $active_count),
+			'pending'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'pending', 'paged' => FALSE)), $current === 'pending' ? ' class="current"' : '', __('Pending', 'invoicing') . $pending_count),
+			'expired'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'expired', 'paged' => FALSE)), $current === 'expired' ? ' class="current"' : '', __('Expired', 'invoicing') . $expired_count),
+			'completed' => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'completed', 'paged' => FALSE)), $current === 'completed' ? ' class="current"' : '', __('Completed', 'invoicing') . $completed_count),
+			'trialling'  => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'trialling', 'paged' => FALSE)), $current === 'trialling' ? ' class="current"' : '', __('Trialling', 'invoicing') . $trialling_count),
+			'cancelled' => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'cancelled', 'paged' => FALSE)), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled', 'invoicing') . $cancelled_count),
+			'failing'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'failing', 'paged' => FALSE)), $current === 'failing' ? ' class="current"' : '', __('Failing', 'invoicing') . $failing_count),
 		);
 
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+		return apply_filters('wpinv_recurring_subscriptions_table_views', $views);
 	}
 
 	/**
@@ -104,27 +104,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
+	public function search_box($text, $input_id) {
 
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+		if (empty($_REQUEST['s']) && !$this->has_items()) {
 			return;
 		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if (!empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="' . esc_attr($_REQUEST['orderby']) . '" />';
 		}
 
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if (!empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="' . esc_attr($_REQUEST['order']) . '" />';
 		}
 ?>
 		<p class="search-box">
-			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
+			<?php do_action('wpinv_recurring_subscription_search_box'); ?>
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?><br/>
 		</p>
 <?php
 	}
@@ -136,7 +136,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_default( $item, $column_name ) {
+	function column_default($item, $column_name) {
 		return $item->$column_name;
 	}
 
@@ -147,8 +147,8 @@ 
      * @since       1.0.0
      * @return      string
      */
-    function column_sub_id( $item ) {
-        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
+    function column_sub_id($item) {
+        return '<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $item->id)) . '" target="_blank">' . $item->id . '</a>';
     }
 
 	/**
@@ -158,11 +158,11 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+	function column_customer_id($item) {
+		$subscriber = get_userdata($item->customer_id);
+		$customer   = !empty($subscriber->display_name) ? $subscriber->display_name : $subscriber->user_email;
 
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+		return '<a href="' . esc_url(get_edit_user_link($item->customer_id)) . '" target="_blank">' . $customer . '</a>';
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_status( $item ) {
+	function column_status($item) {
 		return $item->get_status_label();
 	}
 
@@ -183,11 +183,11 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_period( $item ) {
+	function column_period($item) {
 
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($item->period, $item->frequency);
 
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+		return wpinv_price(wpinv_format_amount($item->recurring_amount), wpinv_get_invoice_currency_code($item->parent_payment_id)) . ' / ' . $period;
 	}
 
 	/**
@@ -197,8 +197,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
+	function column_bill_times($item) {
+		return $item->get_times_billed() . ' / ' . (($item->bill_times == 0) ? 'Until Cancelled' : $item->bill_times);
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+	function column_initial_amount($item) {
+		return wpinv_price(wpinv_format_amount($item->initial_amount), wpinv_get_invoice_currency_code($item->parent_payment_id));
 	}
 
 	/**
@@ -219,8 +219,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+	function column_renewal_date($item) {
+		return $renewal_date = !empty($item->expiration) ? date_i18n(get_option('date_format'), strtotime($item->expiration)) : __('N/A', 'invoicing');
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
+	function column_parent_payment_id($item) {
+		return '<a href="' . get_edit_post_link($item->parent_payment_id) . '" target="_blank">' . wpinv_get_invoice_number($item->parent_payment_id) . '</a>';
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+	function column_product_id($item) {
+		return '<a href="' . esc_url(admin_url('post.php?action=edit&post=' . $item->product_id)) . '" target="_blank">' . get_the_title($item->product_id) . '</a>';
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	 * @since       2.0
 	 * @return      string
 	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+	function column_actions($item) {
+		return '<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $item->id)) . '" title="' . esc_attr(__('View or edit subscription', 'invoicing')) . '" target="_blank">' . __('View', 'invoicing') . '</a>';
 	}
 
 
@@ -265,21 +265,21 @@ 
 	 * @return      array
 	 */
 
-	function get_columns(){
+	function get_columns() {
 		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
+			'sub_id'            => __('ID', 'invoicing'),
+			'customer_id'       => __('Customer', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
+			'period'            => __('Billing Cycle', 'invoicing'),
+			'initial_amount'    => __('Initial Amount', 'invoicing'),
+			'bill_times'        => __('Times Billed', 'invoicing'),
+			'renewal_date'      => __('Renewal Date', 'invoicing'),
+			'parent_payment_id' => __('Invoice', 'invoicing'),
+			'product_id'        => __('Item', 'invoicing'),
+			'actions'           => __('Actions', 'invoicing'),
 		);
 
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
+		return apply_filters('wpinv_report_subscription_columns', $columns);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 	 * @return      int
 	 */
 	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -306,16 +306,16 @@ 
 
 		$db = new WPInv_Subscriptions_DB;
 
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+		$search = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
 
 		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+		$this->active_count    = $db->count(array('status' => 'active', 'search' => $search));
+		$this->pending_count   = $db->count(array('status' => 'pending', 'search' => $search));
+		$this->expired_count   = $db->count(array('status' => 'expired', 'search' => $search));
+		$this->trialling_count = $db->count(array('status' => 'trialling', 'search' => $search));
+		$this->cancelled_count = $db->count(array('status' => 'cancelled', 'search' => $search));
+		$this->completed_count = $db->count(array('status' => 'completed', 'search' => $search));
+		$this->failing_count   = $db->count(array('status' => 'failing', 'search' => $search));
 
 	}
 
@@ -336,28 +336,28 @@ 
 
 		$columns  = $this->get_columns();
 		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+		$status   = isset($_GET['status']) ? $_GET['status'] : 'any';
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$current_page = $this->get_pagenum();
 
 		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+		$search = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
 		$args   = array(
 			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+			'offset' => $this->per_page * ($this->get_paged() - 1),
 			'search' => $search
 		);
 
-		if ( 'any' !== $status ) {
+		if ('any' !== $status) {
 			$args['status'] = $status;
 		}
 
-		$this->items = $db->get_subscriptions( $args );
+		$this->items = $db->get_subscriptions($args);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'active':
 				$total_items = $this->active_count;
 				break;
@@ -385,10 +385,10 @@ 
 				break;
 		}
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
+			'total_pages' => ceil($total_items / $this->per_page)
+		));
 	}
 }

includes/class-wpinv-subscriptions.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 function wpinv_subscription_init() {
     return WPInv_Subscriptions::instance();

Spacing +63 added lines, -63 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 function wpinv_subscription_init() {
     return WPInv_Subscriptions::instance();
 }
-add_action( 'plugins_loaded', 'wpinv_subscription_init', 100 );
+add_action('plugins_loaded', 'wpinv_subscription_init', 100);
 
 /**
  * WPInv_Subscriptions Class.
@@ -20,7 +20,7 @@ 
      * Main WPInv_Subscriptions Instance
      */
     public static function instance() {
-        if ( ! isset( self::$instance ) ) {
+        if (!isset(self::$instance)) {
             self::$instance = new WPInv_Subscriptions;
 
             self::$instance->init();
@@ -34,7 +34,7 @@ 
      *
      * @since 1.0.0
      */
-    private function __construct(){
+    private function __construct() {
 
     }
 
@@ -63,8 +63,8 @@ 
     private function setup_constants() {
 
         // Make sure CAL_GREGORIAN is defined.
-        if ( ! defined( 'CAL_GREGORIAN' ) ) {
-            define( 'CAL_GREGORIAN', 1 );
+        if (!defined('CAL_GREGORIAN')) {
+            define('CAL_GREGORIAN', 1);
         }
     }
 
@@ -76,13 +76,13 @@ 
      */
     private function actions() {
 
-        add_action( 'admin_menu', array( $this, 'wpinv_subscriptions_list' ), 10 );
-        add_action( 'admin_notices', array( $this, 'notices' ) );
-        add_action( 'init', array( $this, 'wpinv_post_actions' ) );
-        add_action( 'init', array( $this, 'wpinv_get_actions' ) );
-        add_action( 'wpinv_cancel_subscription', array( $this, 'wpinv_process_cancellation' ) );
-        add_action( 'wpinv_checkout_before_send_to_gateway', array( $this, 'wpinv_checkout_add_subscription' ), -999, 2 );
-        add_action( 'wpinv_subscriptions_front_notices', array( $this, 'notices' ) );
+        add_action('admin_menu', array($this, 'wpinv_subscriptions_list'), 10);
+        add_action('admin_notices', array($this, 'notices'));
+        add_action('init', array($this, 'wpinv_post_actions'));
+        add_action('init', array($this, 'wpinv_get_actions'));
+        add_action('wpinv_cancel_subscription', array($this, 'wpinv_process_cancellation'));
+        add_action('wpinv_checkout_before_send_to_gateway', array($this, 'wpinv_checkout_add_subscription'), -999, 2);
+        add_action('wpinv_subscriptions_front_notices', array($this, 'notices'));
     }
 
     /**
@@ -104,8 +104,8 @@ 
     public function wpinv_subscriptions_list() {
         add_submenu_page(
             'wpinv',
-            __( 'Subscriptions', 'invoicing' ),
-            __( 'Subscriptions', 'invoicing' ),
+            __('Subscriptions', 'invoicing'),
+            __('Subscriptions', 'invoicing'),
             'manage_invoicing',
             'wpinv-subscriptions',
             'wpinv_subscriptions_page'
@@ -114,37 +114,37 @@ 
 
     public function notices() {
 
-        if( empty( $_GET['wpinv-message'] ) ) {
+        if (empty($_GET['wpinv-message'])) {
             return;
         }
 
         $type    = 'updated';
         $message = '';
 
-        switch( strtolower( $_GET['wpinv-message'] ) ) {
+        switch (strtolower($_GET['wpinv-message'])) {
 
             case 'updated' :
 
-                $message = __( 'Subscription updated successfully.', 'invoicing' );
+                $message = __('Subscription updated successfully.', 'invoicing');
 
                 break;
 
             case 'deleted' :
 
-                $message = __( 'Subscription deleted successfully.', 'invoicing' );
+                $message = __('Subscription deleted successfully.', 'invoicing');
 
                 break;
 
             case 'cancelled' :
 
-                $message = __( 'Subscription cancelled successfully.', 'invoicing' );
+                $message = __('Subscription cancelled successfully.', 'invoicing');
 
                 break;
 
         }
 
-        if ( ! empty( $message ) ) {
-            echo '<div class="' . esc_attr( $type ) . '"><p>' . $message . '</p></div>';
+        if (!empty($message)) {
+            echo '<div class="' . esc_attr($type) . '"><p>' . $message . '</p></div>';
         }
 
     }
@@ -157,8 +157,8 @@ 
      * @return void
      */
     function wpinv_get_actions() {
-        if ( isset( $_GET['wpinv_action'] ) ) {
-            do_action( 'wpinv_' . $_GET['wpinv_action'], $_GET );
+        if (isset($_GET['wpinv_action'])) {
+            do_action('wpinv_' . $_GET['wpinv_action'], $_GET);
         }
     }
 
@@ -170,8 +170,8 @@ 
      * @return void
      */
     function wpinv_post_actions() {
-        if ( isset( $_POST['wpinv_action'] ) ) {
-            do_action( 'wpinv_' . $_POST['wpinv_action'], $_POST );
+        if (isset($_POST['wpinv_action'])) {
+            do_action('wpinv_' . $_POST['wpinv_action'], $_POST);
         }
     }
 
@@ -182,24 +182,24 @@ 
      * @param int $frequency_count The frequency of the period.
      * @return mixed|string|void
      */
-    public static function wpinv_get_pretty_subscription_frequency( $period, $frequency_count = 1) {
+    public static function wpinv_get_pretty_subscription_frequency($period, $frequency_count = 1) {
         $frequency = '';
         //Format period details
-        switch ( $period ) {
+        switch ($period) {
             case 'day' :
-                $frequency = sprintf( _n('%d Day', '%d Days', $frequency_count, 'invoicing'), $frequency_count);
+                $frequency = sprintf(_n('%d Day', '%d Days', $frequency_count, 'invoicing'), $frequency_count);
                 break;
             case 'week' :
-                $frequency = sprintf( _n('%d Week', '%d Weeks', $frequency_count, 'invoicing'), $frequency_count);
+                $frequency = sprintf(_n('%d Week', '%d Weeks', $frequency_count, 'invoicing'), $frequency_count);
                 break;
             case 'month' :
-                $frequency = sprintf( _n('%d Month', '%d Months', $frequency_count, 'invoicing'), $frequency_count);
+                $frequency = sprintf(_n('%d Month', '%d Months', $frequency_count, 'invoicing'), $frequency_count);
                 break;
             case 'year' :
-                $frequency = sprintf( _n('%d Year', '%d Years', $frequency_count, 'invoicing'), $frequency_count);
+                $frequency = sprintf(_n('%d Year', '%d Years', $frequency_count, 'invoicing'), $frequency_count);
                 break;
             default :
-                $frequency = apply_filters( 'wpinv_recurring_subscription_frequency', $frequency, $period, $frequency_count );
+                $frequency = apply_filters('wpinv_recurring_subscription_frequency', $frequency, $period, $frequency_count);
                 break;
         }
 
@@ -214,50 +214,50 @@ 
      * @since       1.0.0
      * @return      void
      */
-    public function wpinv_process_cancellation( $data ) {
+    public function wpinv_process_cancellation($data) {
 
 
-        if( empty( $data['sub_id'] ) ) {
+        if (empty($data['sub_id'])) {
             return;
         }
 
-        if( ! is_user_logged_in() ) {
+        if (!is_user_logged_in()) {
             return;
         }
 
-        if( ! wp_verify_nonce( $data['_wpnonce'], 'wpinv-recurring-cancel' ) ) {
-            wp_die( __( 'Error', 'invoicing' ), __( 'Nonce verification failed', 'invoicing' ), array( 'response' => 403 ) );
+        if (!wp_verify_nonce($data['_wpnonce'], 'wpinv-recurring-cancel')) {
+            wp_die(__('Error', 'invoicing'), __('Nonce verification failed', 'invoicing'), array('response' => 403));
         }
 
-        $data['sub_id'] = absint( $data['sub_id'] );
-        $subscription   = new WPInv_Subscription( $data['sub_id'] );
+        $data['sub_id'] = absint($data['sub_id']);
+        $subscription   = new WPInv_Subscription($data['sub_id']);
 
-        if( ! $subscription->can_cancel() ) {
-            wp_die( __( 'Error', 'invoicing' ), __( 'This subscription cannot be cancelled', 'invoicing' ), array( 'response' => 403 ) );
+        if (!$subscription->can_cancel()) {
+            wp_die(__('Error', 'invoicing'), __('This subscription cannot be cancelled', 'invoicing'), array('response' => 403));
         }
 
         try {
 
-            do_action( 'wpinv_recurring_cancel_' . $subscription->gateway . '_subscription', $subscription, true );
+            do_action('wpinv_recurring_cancel_' . $subscription->gateway . '_subscription', $subscription, true);
 
             $subscription->cancel();
 
-            if( is_admin() ) {
+            if (is_admin()) {
 
-                wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=cancelled&id=' . $subscription->id ) );
+                wp_redirect(admin_url('admin.php?page=wpinv-subscriptions&wpinv-message=cancelled&id=' . $subscription->id));
                 exit;
 
             } else {
 
-                $redirect = remove_query_arg( array( '_wpnonce', 'wpinv_action', 'sub_id' ), add_query_arg( array( 'wpinv-message' => 'cancelled' ) ) );
-                $redirect = apply_filters( 'wpinv_recurring_cancellation_redirect', $redirect, $subscription );
-                wp_safe_redirect( $redirect );
+                $redirect = remove_query_arg(array('_wpnonce', 'wpinv_action', 'sub_id'), add_query_arg(array('wpinv-message' => 'cancelled')));
+                $redirect = apply_filters('wpinv_recurring_cancellation_redirect', $redirect, $subscription);
+                wp_safe_redirect($redirect);
                 exit;
 
             }
 
-        } catch ( Exception $e ) {
-            wp_die( __( 'Error', 'invoicing' ), $e->getMessage(), array( 'response' => 403 ) );
+        } catch (Exception $e) {
+            wp_die(__('Error', 'invoicing'), $e->getMessage(), array('response' => 403));
         }
 
     }
@@ -269,35 +269,35 @@ 
      * @since       1.0.0
      * @return      void
      */
-    public function wpinv_checkout_add_subscription( $invoice, $invoice_data ) {
-        if ( ! ( ! empty( $invoice->ID ) && $invoice->is_recurring() ) ) {
+    public function wpinv_checkout_add_subscription($invoice, $invoice_data) {
+        if (!(!empty($invoice->ID) && $invoice->is_recurring())) {
             return;
         }
         
-        $item               = $invoice->get_recurring( true );
-        if ( empty( $item ) ) {
+        $item = $invoice->get_recurring(true);
+        if (empty($item)) {
             return;
         }
 
-        $invoice_date       = $invoice->get_invoice_date( false );
+        $invoice_date       = $invoice->get_invoice_date(false);
         $status             = 'pending';
 
-        $period             = $item->get_recurring_period( true );
+        $period             = $item->get_recurring_period(true);
         $interval           = $item->get_recurring_interval();
         $bill_times         = (int)$item->get_recurring_limit();
         $add_period         = $interval . ' ' . $period;
         $trial_period       = '';
 
-        if ( $invoice->is_free_trial() ) {
+        if ($invoice->is_free_trial()) {
             $status         = 'trialling';
-            $trial_period   = $item->get_trial_period( true );
+            $trial_period   = $item->get_trial_period(true);
             $free_interval  = $item->get_trial_interval();
             $trial_period   = $free_interval . ' ' . $trial_period;
 
             $add_period     = $trial_period;
         }
 
-        $expiration         = date_i18n( 'Y-m-d H:i:s', strtotime( '+' . $add_period  . ' 23:59:59', strtotime( $invoice_date ) ) );
+        $expiration         = date_i18n('Y-m-d H:i:s', strtotime('+' . $add_period . ' 23:59:59', strtotime($invoice_date)));
 
         $args = array(
             'product_id'        => $item->ID,
@@ -307,7 +307,7 @@ 
             'frequency'         => $interval,
             'period'            => $period,
             'initial_amount'    => $invoice->get_total(),
-            'recurring_amount'  => $invoice->get_recurring_details( 'total' ),
+            'recurring_amount'  => $invoice->get_recurring_details('total'),
             'bill_times'        => $bill_times,
             'created'           => $invoice_date,
             'expiration'        => $expiration,
@@ -316,11 +316,11 @@ 
             'transaction_id'    => '',
         );
 
-        $subscription = wpinv_get_subscription( $invoice );
+        $subscription = wpinv_get_subscription($invoice);
 
-        if ( empty( $subscription ) ) {
+        if (empty($subscription)) {
             $subscription = new WPInv_Subscription();
-            $subscription->create( $args );
+            $subscription->create($args);
         }
         
         return $subscription;

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', 'invoice_subscription_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', 'invoice_subscription_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();